Browse Source

merge 4.8 xfce4-panel from experimental

git-svn-id: svn://anonscm.debian.org/pkg-xfce/desktop/trunk/xfce4-panel@5170 0c9b3bff-18ee-0310-b944-d1aa2700132f
suites/jessie
corsac 10 years ago
parent
commit
81c00a6c40
6 changed files with 252 additions and 94 deletions
  1. +50
    -0
      debian/changelog
  2. +12
    -8
      debian/control
  3. +154
    -61
      debian/copyright
  4. +8
    -24
      debian/rules
  5. +4
    -1
      debian/xfce4-panel.install
  6. +24
    -0
      debian/xfce4-panel.postrm

+ 50
- 0
debian/changelog View File

@@ -1,3 +1,53 @@
xfce4-panel (4.8.2-1) experimental; urgency=low

* New upstream bugfix release.

-- Yves-Alexis Perez <corsac@debian.org> Sun, 27 Feb 2011 00:55:05 +0100

xfce4-panel (4.8.1-1) experimental; urgency=low

[ Lionel Le Folgoc ]
* New upstream bugfix release.
* debian/control:
- refreshed (b-)deps for this new major release
- add myself to Uploaders
- bump Standards-Version to 3.9.1.
* debian/NEWS: dropped, unneeded.
* debian/xfce4-panel.shlibs: refreshed, bump to (>= 4.7.2).
* debian/xfce4-panel.lintian-overrides: refreshed, new lib name.
* debian/xfce4-panel.preinst: added, handles removal of old conffiles.
* debian/xfce4-panel.postinst: explicitly set -e.
* debian/*.install: refreshed.
* debian/rules:
- call dpkg-buildflags
- dropped rc files mangling as they don't exist anymore
- updated removal of *.{l,}a files.
- drop overrides for dh_auto_{configure,clean}, obsolete.
* debian/xfce4-panel.{preinst,postinst,prerm}: use dpkg-maintscript-helper
to remove pre-xfconf config files.
* Bugs fixed by 4.7.x/4.8.x series:
- rgba support lp: #586012
- disappearing menus lp: #53897
- xrandr support lp: #176174, Closes: #432914
- Fails to reap children, creating zombies lp: #420187
- DND of desktop-files on the panel to create new launchers Closes: #480380
* Bumped shlibs to >= 4.7.7, abi break for external plugins.

[ Yves-Alexis Perez ]
* New upstream development release
* debian/xfce4-panel.install:
- install wrapper and migrate tools in xfce4-panel package
- update plugins paths
* debian/rules:
- update path when removing .a/.la files for plugins.
- add hardening flags to {C,LD}FLAGS
* debian/control:
- add build-dep on hardening-includes
- update build-dep on garcon to 0.1.4.
* debian/copyright updated for new release.

-- Yves-Alexis Perez <corsac@debian.org> Sun, 06 Feb 2011 18:10:07 +0100

xfce4-panel (4.6.4-1) unstable; urgency=low

[Stefan Ott]


+ 12
- 8
debian/control View File

@@ -2,12 +2,15 @@ Source: xfce4-panel
Section: xfce
Priority: optional
Maintainer: Debian Xfce Maintainers <pkg-xfce-devel@lists.alioth.debian.org>
Uploaders: Emanuele Rocca <ema@debian.org>, Simon Huggins <huggie@earth.li>, Yves-Alexis Perez <corsac@debian.org>
Build-Depends: debhelper (>= 7.0.50~), libgtk2.0-dev (>= 2.10.6), bison,
libxft-dev, libxml2-dev, chrpath, libxfce4util-dev (>= 4.6.0),
libxfcegui4-dev (>= 4.6.0), libexo-0.3-dev (>= 0.3.100), libwnck-dev,
libxml-parser-perl, intltool
Standards-Version: 3.8.4
Uploaders: Emanuele Rocca <ema@debian.org>, Simon Huggins <huggie@earth.li>,
Yves-Alexis Perez <corsac@debian.org>, Lionel Le Folgoc <mrpouit@gmail.com>
Build-Depends: debhelper (>= 7.0.50~), libxfce4util-dev (>= 4.8.0),
libgarcon-1-0-dev (>= 0.1.4), libxfce4ui-1-dev (>= 4.8.0),
libxfconf-0-dev (>= 4.8.0), libexo-1-dev (>= 0.6.0),
libgtk2.0-dev (>= 2.14.0), libglib2.0-dev (>= 2.18.0),
libdbus-glib-1-dev (>= 0.73), libcairo2-dev (>= 1.0.0),
libwnck-dev (>= 2.22), libxml-parser-perl, intltool, hardening-includes
Standards-Version: 3.9.1
Homepage: http://www.xfce.org/
Vcs-Svn: svn://svn.debian.org/pkg-xfce/desktop/trunk/xfce4-panel/
Vcs-Browser: http://svn.debian.org/wsvn/pkg-xfce/desktop/trunk/xfce4-panel/
@@ -25,8 +28,9 @@ Description: The Xfce4 desktop environment panel
Package: xfce4-panel-dev
Section: xfce
Architecture: any
Depends: ${misc:Depends}, xfce4-panel (= ${binary:Version}), libxml2-dev,
pkg-config, libxfce4util-dev (>= 4.6.0), libxfcegui4-dev (>= 4.6.0)
Depends: ${misc:Depends}, xfce4-panel (= ${binary:Version}), pkg-config,
libxfce4util-dev (>= 4.6.0), libglib2.0-dev (>= 2.18.0),
libgtk2.0-dev (>= 2.14.0)
Description: The Xfce4 panel development files
In this package, you can find the development files distributed with the
Xfce4 panel, the main panel of Xfce4 desktop environment. The files in this


+ 154
- 61
debian/copyright View File

@@ -9,71 +9,164 @@ Jasper Huijsmans <jasper@xfce.org>
Nick Schermer <nick@xfce.org>
clock plugin is written by Jasper Huijsmans and Jannis Pohlmann

Files: libxfce4panel/*
License: LGPL-2+
Copyright: © 2005-2007 Jasper Huijsmans <jasper@xfce.org>
Files: libxfce4panel/libxfce4panel.h
Copyright: © 2008 Nick Schermer <nick@xfce.org>
Files: libxfce4panel/libxfce4panel.symbols
Copyright: © 2007 Nick Schermer <nick@xfce.org>
Files: libxfce4panel/make-libxfce4panel-alias.pl
Copyright: © 2007 Nick Schermer <nick@xfce.org>
Copyright: © 2004 The GLib Development Team.
Files: libxfce4panel/xfce-arrow-button.{c,h}
Copyright: © 2004-2007 Nick Schermer <nick@xfce.org>
Files: libxfce4panel/xfce-hvbox.{c,h}
Copyright: © 2002 Red Hat Inc. based on GtkHBox
Copyright: © 2006 Jani Monoses <jani@ubuntu.com>
Copyright: © 2006-2007 Jasper Huijsmans <jasper@xfce.org>
Files: libxfce4panel/xfce-itembar.{c,h}
Copyright: © 2004-2007 Jasper Huijsmans <jasper@xfce.org>
Copyright: © 1997-200 The GTK+ Team
Files: libxfce4panel/xfce-panel-convenience.{c,h}
Copyright: © 2006-2007 Jasper Huijsmans <jasper@xfce.org>
Files: libxfce4panel/xfce4-panel-macros.{c,h}
Copyright: © 2006-2007 2006-2007 Nick Schermer <nick@xfce.org>
Files: libxfce4panel/xfce-panel-window.{c,h}
Copyright: © 2004-2007 Jasper Huijsmans <jasper@xfce.org>
Files: common/panel-debug.c
common/panel-private.h
common/panel-utils.c
common/panel-xfconf.c
libxfce4panel/xfce-panel-image.c
libxfce4panel/xfce-panel-image.h
migrate/main.c
migrate/migrate-46.c
migrate/migrate-46.h
migrate/migrate-default.c
migrate/migrate-default.h
panel/main.c
panel/panel-application.c
panel/panel-application.h
panel/panel-base-window.c
panel/panel-base-window.h
panel/panel-dbus-client.c
panel/panel-dbus-client.h
panel/panel-dbus-service.c
panel/panel-dbus-service.h
panel/panel-dialogs.c
panel/panel-dialogs.h
panel/panel-item-dialog.c
panel/panel-item-dialog.h
panel/panel-itembar.c
panel/panel-itembar.h
panel/panel-module-factory.c
panel/panel-module-factory.h
panel/panel-module.c
panel/panel-module.h
panel/panel-plugin-external-46.c
panel/panel-plugin-external-46.h
panel/panel-plugin-external-wrapper.c
panel/panel-plugin-external-wrapper.h
panel/panel-plugin-external.c
panel/panel-plugin-external.h
panel/panel-preferences-dialog.c
panel/panel-preferences-dialog.h
panel/panel-tic-tac-toe.c
panel/panel-tic-tac-toe.h
panel/panel-window.c
panel/panel-window.h
plugins/actions/actions.c
plugins/actions/actions.h
plugins/applicationsmenu/applicationsmenu.c
plugins/applicationsmenu/applicationsmenu.h
plugins/applicationsmenu/xfce4-popup-applicationsmenu.sh
plugins/clock/clock-analog.c
plugins/clock/clock-analog.h
plugins/clock/clock-binary.c
plugins/clock/clock-binary.h
plugins/clock/clock-digital.c
plugins/clock/clock-digital.h
plugins/clock/clock-fuzzy.c
plugins/clock/clock-fuzzy.h
plugins/clock/clock-lcd.c
plugins/clock/clock-lcd.h
plugins/clock/clock.c
plugins/clock/clock.h
plugins/directorymenu/directorymenu.c
plugins/directorymenu/directorymenu.h
plugins/directorymenu/xfce4-popup-directorymenu.sh
plugins/launcher/launcher-dialog.c
plugins/launcher/launcher-dialog.h
plugins/launcher/launcher.c
plugins/launcher/launcher.h
plugins/pager/pager-buttons.c
plugins/pager/pager-buttons.h
plugins/pager/pager.h
plugins/showdesktop/showdesktop.h
plugins/systray/systray-box.c
plugins/systray/systray-box.h
plugins/systray/systray.h
plugins/tasklist/tasklist-widget.c
plugins/tasklist/tasklist-widget.h
plugins/tasklist/tasklist.c
plugins/windowmenu/windowmenu.c
plugins/windowmenu/windowmenu.h
plugins/windowmenu/xfce4-popup-windowmenu.sh
wrapper/main.c
wrapper/wrapper-module.c
wrapper/wrapper-module.h
wrapper/wrapper-plug.c
wrapper/wrapper-plug.h
Copyright: 2007-2010, Nick Schermer <nick@xfce.org>
2008-2009, Nick Schermer <nick@xfce.org>
2008-2010, Nick Schermer <nick@xfce.org>
2009, Nick Schermer <nick@xfce.org>
2009-2010, Nick Schermer <nick@xfce.org>
2010, Nick Schermer <nick@xfce.org>
2010-2011, Nick Schermer <nick@xfce.org>
License: GPL-2+

Files: common/panel-dbus.h
common/panel-debug.h
common/panel-utils.h
common/panel-xfconf.h
libxfce4panel/libxfce4panel-config.c
libxfce4panel/libxfce4panel.h
libxfce4panel/xfce-panel-macros-46.h
libxfce4panel/xfce-panel-macros.h
libxfce4panel/xfce-panel-plugin-provider.c
libxfce4panel/xfce-panel-plugin-provider.h
libxfce4panel/xfce-panel-plugin.c
libxfce4panel/xfce-panel-plugin.h
Copyright: 2008-2010, Nick Schermer <nick@xfce.org>
2009-2010, Nick Schermer <nick@xfce.org>
2010, Nick Schermer <nick@xfce.org>
License: LGPL-2.1+

Files: plugins/pager/pager.c
plugins/separator/separator.c
plugins/separator/separator.h
plugins/showdesktop/showdesktop.c
plugins/systray/systray.c
Copyright: 2005-2007, Jasper Huijsmans <jasper@xfce.org>
2007-2010, Nick Schermer <nick@xfce.org>
License: GPL-2+

Files: libxfce4panel/libxfce4panel-enums.h
libxfce4panel/xfce-arrow-button.c
libxfce4panel/xfce-arrow-button.h
libxfce4panel/xfce-panel-convenience.c
libxfce4panel/xfce-panel-convenience.h
Copyright: 2006-2007, Jasper Huijsmans <jasper@xfce.org>
2008-2010, Nick Schermer <nick@xfce.org>
License: LGPL-2.1+

Files: plugins/systray/systray-manager.c
plugins/systray/systray-manager.h
Copyright: 2002, Anders Carlsson <andersca@gnu.org>
2003-2004, Benedikt Meurer <benny@xfce.org>
2003-2004, Olivier Fourdan <fourdan@xfce.org>
2003-2006, Vincent Untz
2007-2010, Nick Schermer <nick@xfce.org>
License: GPL-2+

Files: panel/*
Files: plugins/systray/systray-socket.c
plugins/systray/systray-socket.h
Copyright: 2002, Anders Carlsson <andersca@gnu.org>
2003-2006, Vincent Untz
2008, Red Hat, Inc
2009-2010, Nick Schermer <nick@xfce.org>
License: GPL-2+
Copyright: © 2005 Jasper Huijsmans <jasper@xfce.org>
Files: panel/frap-icon-entry.{c,h}
Copyright: © 2004-2006 Benedikt Meurer <benny@xfce.org>
Files: panel/panel-dialogs.c
Copyright: © 2005-2007 Jasper Huijsmans <jasper@xfce.org>
Copyright: © 2006 Benedikt Meurer <benny@xfce.org>
Files: panel/panel-dnd.c
Copyright: © 2005 Jasper Huijsmans <jasper@xfce.org>
Copyright: © 2005 Ryan McDougall

dz and gl translations are © 2006 Canonical Ltd, and Rosetta Contributors
Files: libxfce4panel/abicheck.sh
libxfce4panel/make-libxfce4panel-alias.pl
Copyright: 2004, The GLib Development Team
2005, Benedikt Meurer <benny@xfce.org>
License: LGPL-2.1+

Files: plugins/{action,iconbox,pager,separator}/*
Copyright: © 2005 Jasper Huijsmans
Files: plugins/clock
Copyright: © 2007 Nick Schermer <nick@xfce.org>
Files: plugins/launcher
Copyright: © 2005-2007 Jasper Huijsmans
Copyright: © 2006-2007 Nick Schermer <nick@xfce.org>
Copyright: © 2005-2008 Benedikt Meurer <benny@xfce.org>
Files: plugins/showdesktop
Copyright: © 2005 Jasper Huijsmans
Copyright: © 2006 Jani Monoses
Files: plugins/systray
Copyright: © 2007 Nick Schermer <nick@xfce.org>
Copyright: © 2002 Anders Carlsson <andersca@gnu.org>
Copyright: © 2003-2004 Benedikt Meurer <benny@xfce.org>
Copyright: © 2003-2006 Vincent Untz
Copyright: © 2003-2004 Olivier Fourdan <fourdan@xfce.org>
Files: plugins/tasklist
Copyright: © 2005-2007 Jasper Huijsmans
Files: plugins/windowlist
Copyright: © 2003 Andre Lerche <a.lerche@gmx.net>
Copyright: © 2003 Benedikt Meurer <benny@xfce.org>
Copyright: © 2006 Jani Monoses <jani@ubuntu.com>
Copyright: © 2006 Jasper Huijsmans <jasper@xfce.org>
Copyright: © 2006 Nick Schermer <nick@xfce.org>
Files: libxfce4panel/xfce-hvbox.c
libxfce4panel/xfce-hvbox.h
Copyright: 2002, Red Hat Inc. based on GtkHBox
2006, Jani Monoses <jani@ubuntu.com>
2006-2007, Jasper Huijsmans <jasper@xfce.org>
2007-2010, Nick Schermer <nick@xfce.org>
License: LGPL-2.1+

On Debian systems, the complete text of the GNU General
Public License can be found in `/usr/share/common-licenses/GPL'.


+ 8
- 24
debian/rules View File

@@ -1,33 +1,17 @@
#!/usr/bin/make -f

#include /usr/share/quilt/quilt.make
include /usr/share/hardening-includes/hardening.make

CFLAGS=$(shell dpkg-buildflags --get CFLAGS)
LDFLAGS=$(shell dpkg-buildflags --get LDFLAGS)
LDFLAGS+=$(HARDENING_LDFLAGS) -Wl,-z,defs -Wl,--as-needed -Wl,-O1
CFLAGS+=$(HARDENING_CFLAGS)

LDFLAGS+=-Wl,-z,defs -Wl,--as-needed

ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
CFLAGS += -O0
else
CFLAGS += -O2
endif
export CFLAGS LDFLAGS

override_dh_install:
perl -i -pe 's/Exec=Terminal/Exec=exo-open --launch TerminalEmulator/' $(CURDIR)/debian/tmp/etc/xdg/xfce4/panel/launcher*
rm -f $(CURDIR)/debian/tmp/etc/xdg/xfce4/panel/launcher-8.rc
sed -i '/<item name=\"launcher\" id=\"8\"\/>/d' $(CURDIR)/debian/tmp/etc/xdg/xfce4/panel/panels.xml

rm -f $(CURDIR)/debian/tmp/usr/lib/xfce4/panel-plugins/*.la
rm -f $(CURDIR)/debian/tmp/usr/lib/xfce4/panel-plugins/*.a
rm -f $(CURDIR)/debian/tmp/usr/lib/xfce4/mcs-plugins/*.la
rm -f $(CURDIR)/debian/tmp/usr/lib/xfce4/mcs-plugins/*.a
rm -f $(CURDIR)/debian/tmp/usr/lib/libxfce4panel.la

chrpath -d -k $(CURDIR)/debian/tmp/usr/bin/xfce4-panel \
$(CURDIR)/debian/tmp/usr/bin/xfce4-popup-windowlist \
$(CURDIR)/debian/tmp/usr/lib/xfce4/*/* \
$(CURDIR)/debian/tmp/usr/lib/libxfce4panel.so.*1

dh_install --fail-missing --sourcedir=debian/tmp
rm -f $(CURDIR)/debian/tmp/usr/lib/xfce4/panel/plugins/*.a
dh_install --fail-missing --sourcedir=debian/tmp -X .la

override_dh_strip:
dh_strip --dbg-package=xfce4-panel-dbg


+ 4
- 1
debian/xfce4-panel.install View File

@@ -1,8 +1,11 @@
usr/bin/
usr/lib/lib*.so.*
usr/lib/xfce4/
usr/lib/xfce4/panel/migrate
usr/lib/xfce4/panel/wrapper
usr/lib/xfce4/panel/plugins/*.so
etc/
usr/share/applications/
usr/share/doc/xfce4-panel/
usr/share/icons/hicolor/
usr/share/locale/
usr/share/xfce4/

+ 24
- 0
debian/xfce4-panel.postrm View File

@@ -0,0 +1,24 @@
#!/bin/sh

set -e

LASTVER="4.7.0"

if dpkg-maintscript-helper supports rm_conffile; then
dpkg-maintscript-helper rm_conffile \
/etc/xdg/xfce4/panel/clock-14.rc "$LASTVER" -- "$@"
dpkg-maintscript-helper rm_conffile \
/etc/xdg/xfce4/panel/launcher-10.rc "$LASTVER" -- "$@"
dpkg-maintscript-helper rm_conffile \
/etc/xdg/xfce4/panel/launcher-7.rc "$LASTVER" -- "$@"
dpkg-maintscript-helper rm_conffile \
/etc/xdg/xfce4/panel/launcher-9.rc "$LASTVER" -- "$@"
dpkg-maintscript-helper rm_conffile \
/etc/xdg/xfce4/panel/panels.xml "$LASTVER" -- "$@"
dpkg-maintscript-helper rm_conffile \
/etc/xdg/xfce4/panel/systray-4.rc "$LASTVER" -- "$@"
dpkg-maintscript-helper rm_conffile \
/etc/xdg/xfce4/panel/xfce4-menu-5.rc "$LASTVER" -- "$@"
fi

#DEBHELPER#

Loading…
Cancel
Save