[Pkg-xfce-commits] r5202 - desktop/trunk/xfdesktop4/debian
Yves-Alexis Perez
corsac at alioth.debian.org
Thu Mar 31 01:21:11 UTC 2011
Author: corsac
Date: 2011-03-31 13:21:07 +0000 (Thu, 31 Mar 2011)
New Revision: 5202
Modified:
desktop/trunk/xfdesktop4/debian/changelog
desktop/trunk/xfdesktop4/debian/control
desktop/trunk/xfdesktop4/debian/copyright
desktop/trunk/xfdesktop4/debian/rules
desktop/trunk/xfdesktop4/debian/xfdesktop4-data.install
desktop/trunk/xfdesktop4/debian/xfdesktop4.install
Log:
merge 4.8 branch from experimental
Modified: desktop/trunk/xfdesktop4/debian/changelog
===================================================================
--- desktop/trunk/xfdesktop4/debian/changelog 2011-03-31 13:06:16 UTC (rev 5201)
+++ desktop/trunk/xfdesktop4/debian/changelog 2011-03-31 13:21:07 UTC (rev 5202)
@@ -1,17 +1,48 @@
-xfdesktop4 (4.6.2-2) UNRELEASED; urgency=low
+xfdesktop4 (4.8.1-2) UNRELEASED; urgency=low
- * debian/patches:
- - 01_add-education-icon-in-menu added, fix education category icon.
- * Switch to 3.0 (quilt) source format.
+ [ Yves-Alexis Perez ]
* debian/control:
+ - drop gamin recommends.
+
+ [ Lionel Le Folgoc ]
+ * debian/control: explicitly build-depends on libxfce4util-dev (>= 4.8.0).
+ Closes: #617415
+
+ -- Yves-Alexis Perez <corsac at debian.org> Sun, 20 Feb 2011 23:51:46 +0100
+
+xfdesktop4 (4.8.1-1) experimental; urgency=low
+
+ [ Yves-Alexis Perez ]
+ * New upstream development release.
+ * debian/control:
- update standards version to 3.9.1.
- - add versionned exo-utils dependency since exo-mount is gone in exo 0.5.
+ - refresh build-deps for Xfce 4.7.
+ - add build dep on libxfce4ui-1-dev.
+ - drop xfce4-panel build-dep since we don't build any plugin anymore.
+ - add build-dep on hardening-includes.
+ * Switch to 3.0 (quilt) source format.
* debian/rules:
- - strip unknown options from configure call.
- - add .pc stuff to POTFILES.skip to not confuse intltool.
+ - pick {C,LD}FLAGS from dpkg-buildflags.
+ - drop --libexecdir, --disable-rpath and --enable-final from configure args.
+ - drop usr/lib from chrpath call, it doesn't exist anymore.
+ - don't rename generic terminal .desktop file, it's gone too.
+ - pass docdir to configure.
+ - add hardening flags to {C,LD}FLAGS
+ * debian/xfdesktop4-data.install:
+ - drop usr/share/desktop-directories from install file.
+ * debian/xfdesktop4.install:
+ - drop etc/ no menu is installed anymore.
+ - drop usr/ too, no more desktop menu module nor panel plugin.
+ * debian/copyright updated for new upstream release.
- -- Yves-Alexis Perez <corsac at debian.org> Sat, 14 Aug 2010 11:18:24 +0200
+ [ Lionel Le Folgoc ]
+ * New upstream bugfix release.
+ * debian/control: clean up build-deps since xfdesktop has been ported to gio,
+ exo-1 and garcon.
+ * Refresh build-deps for Xfce 4.8.0.
+ -- Yves-Alexis Perez <corsac at debian.org> Mon, 07 Feb 2011 00:17:47 +0100
+
xfdesktop4 (4.6.2-1) unstable; urgency=low
[ Yves-Alexis Perez ]
Modified: desktop/trunk/xfdesktop4/debian/control
===================================================================
--- desktop/trunk/xfdesktop4/debian/control 2011-03-31 13:06:16 UTC (rev 5201)
+++ desktop/trunk/xfdesktop4/debian/control 2011-03-31 13:21:07 UTC (rev 5202)
@@ -4,10 +4,11 @@
Maintainer: Debian Xfce Maintainers <pkg-xfce-devel at lists.alioth.debian.org>
Uploaders: Emanuele Rocca <ema at debian.org>, Simon Huggins <huggie at earth.li>,
Yves-Alexis Perez <corsac at debian.org>, Lionel Le Folgoc <mrpouit at gmail.com>
-Build-Depends: debhelper (>= 7.0.50~), libgtk2.0-dev (>= 2.10.1), libxft-dev,
- libxml2-dev, xfce4-panel-dev (>= 4.6.0), libexo-0.3-dev (>= 0.3.100),
- libthunar-vfs-1-dev (>= 1.0.0), chrpath, libwnck-dev, libxfconf-0-dev,
- libglade2-dev, libxfce4menu-0.1-dev, intltool, libdbus-glib-1-dev
+Build-Depends: debhelper (>= 7.0.50~), libglib2.0-dev (>= 2.18.0),
+ libgtk2.0-dev (>= 2.14.0), libxfce4util-dev (>= 4.8.0), libxfce4ui-1-dev (>= 4.8.0),
+ libwnck-dev (>= 2.22), libxfconf-0-dev (>= 4.8.0), intltool, libdbus-glib-1-dev,
+ libthunarx-2-dev (>= 1.2.0), libexo-1-dev (>= 0.6.0), libgarcon-1-0-dev (>= 0.1.2),
+ libnotify-dev, chrpath, hardening-includes
Standards-Version: 3.9.1
Homepage: http://www.xfce.org/
Vcs-Svn: svn://svn.debian.org/pkg-xfce/desktop/trunk/xfdesktop4/
@@ -23,17 +24,17 @@
Package: xfdesktop4
Section: xfce
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends},
- xfdesktop4-data (= ${source:Version}), exo-utils (<< 0.5)
+Depends: ${shlibs:Depends}, ${misc:Depends}, xfdesktop4-data (= ${source:Version}),
+ exo-utils
Replaces: xfdesktop4-data (<< 4.5.92)
-Recommends: dbus-x11, librsvg2-common, xdg-user-dirs, gamin, xfce4-utils
+Recommends: dbus-x11, librsvg2-common, xdg-user-dirs, xfce4-utils
Suggests: menu
Description: xfce desktop background, icons and root menu manager
xfdesktop4 sets the background image, provides a right-click menu to
launch applications and can optionally show files (including application
launchers) or iconified windows. It includes gradient support for
background color, saturation support for background image, real multiscreen
- and xinerama support.
+ and xinerama support.
Package: xfdesktop4-dbg
Section: debug
Modified: desktop/trunk/xfdesktop4/debian/copyright
===================================================================
--- desktop/trunk/xfdesktop4/debian/copyright 2011-03-31 13:06:16 UTC (rev 5201)
+++ desktop/trunk/xfdesktop4/debian/copyright 2011-03-31 13:21:07 UTC (rev 5202)
@@ -8,75 +8,104 @@
Jasper Huijsmans <huysmans at users.sourceforge.net>
Brian Tarricone <bjt23 at cornell.edu>
-Files: common/desktop-menu-stub.c
-Copyright: © 2004 Brian Tarricone <bjt23 at cornell.edu>
+Files: src/xfce-backdrop.h
+ src/xfce-desktop.h
+ src/xfdesktop-file-icon-manager.h
+ src/xfdesktop-file-icon.c
+ src/xfdesktop-file-icon.h
+ src/xfdesktop-file-properties-dialog.c
+ src/xfdesktop-file-properties-dialog.h
+ src/xfdesktop-file-utils.c
+ src/xfdesktop-file-utils.h
+ src/xfdesktop-icon-view-manager.c
+ src/xfdesktop-icon-view-manager.h
+ src/xfdesktop-icon-view.c
+ src/xfdesktop-icon-view.h
+ src/xfdesktop-icon.c
+ src/xfdesktop-icon.h
+ src/xfdesktop-regular-file-icon.h
+ src/xfdesktop-special-file-icon.h
+ src/xfdesktop-volume-icon.h
+ src/xfdesktop-window-icon-manager.c
+ src/xfdesktop-window-icon-manager.h
+ src/xfdesktop-window-icon.c
+ src/xfdesktop-window-icon.h
+Copyright: 2004, Brian Tarricone, <bjt23 at cornell.edu>
+ 2004-2007, Brian Tarricone, <bjt23 at cornell.edu>
+ 2006, Brian Tarricone, <bjt23 at cornell.edu>
+ 2006-2007, Brian Tarricone, <bjt23 at cornell.edu>
+ 2006-2009, Brian Tarricone, <bjt23 at cornell.edu>
License: GPL-2+
-Files: common/desktop-menu-utils.{c,h}
-Copyright: © 2004-2007 Brian Tarricone <bjt23 at cornell.edu>
-Copyright: © 2003 Benedikt Meurer (benedikt.meurer at unix-ag.uni-siegen.de)
-Copyright: © 2002 Jasper Huijsmans (huysmans at users.sourceforge.net)
+
+Files: common/xfdesktop-common.h
+ src/menu.h
+ src/windowlist.h
+ src/xfce-backdrop.c
+ src/xfce-desktop.c
+Copyright: 2002-2003, Jasper Huijsmans (huysmans at users.sourceforge.net)
+ 2003, Benedikt Meurer <benedikt.meurer at unix-ag.uni-siegen.de>
+ 2004, Brian Tarricone, <bjt23 at cornell.edu>
+ 2004-2007, Brian Tarricone, <bjt23 at cornell.edu>
License: GPL-2+
-Files: modules/menu/*
-Copyright: © 2002-2003 Jasper Huijsmans (huysmans at users.sourceforge.net)
-Copyright: © 2003 Biju Chacko (botsie at users.sourceforge.net)
-Copyright: © 2004 Danny Milosavljevic <danny.milo at gmx.net>
-Copyright: © 2004-2008 Brian Tarricone <bjt23 at cornell.edu>
+
+Files: src/xfdesktop-file-icon-manager.c
+ src/xfdesktop-regular-file-icon.c
+ src/xfdesktop-special-file-icon.c
+ src/xfdesktop-volume-icon.c
+Copyright: 2006, Benedikt Meurer, <benny at xfce.org>
+ 2006, Brian Tarricone, <bjt23 at cornell.edu>
License: GPL-2+
-Files: panel-plugin/*
-Copyright: © 2004 Brian Tarricone, <bjt23 at cornell.edu>
+
+Files: src/xfdesktop-clipboard-manager.c
+ src/xfdesktop-clipboard-manager.h
+Copyright: 2005, Benedikt Meurer <benny at xfce.org>
+ 2005-2006, Benedikt Meurer <benny at xfce.org>
License: GPL-2+
-Files: settings/*
-Copyright: © 2008 Stephan Arts <stephan at xfce.org>
-Copyright: © 2008 Brian Tarricone <bjt23 at cornell.edu>
-Copyright: © 2008 Jérôme Guelfucci <jerome.guelfucci at gmail.com>
+
+Files: src/xfdesktop-app-menu-item.c
+ src/xfdesktop-app-menu-item.h
+Copyright: 2004,2009, Brian Tarricone <bjt23 at cornell.edu>
+ 2004-2007,2009, Brian Tarricone <bjt23 at cornell.edu>
+License: LGPL-2+
+
+Files: src/xfce-desktop-menu.h
+Copyright: Nick Schermer <nick at xfce.org>
License: GPL-2+
-Files: src/*
-Copyright: © 2006 Brian Tarricone, <bjt23 at cornell.edu>
+
+Files: common/xfdesktop-common.c
+Copyright: 2002, Jasper Huijsmans (huysmans at users.sourceforge.net)
+ 2003, Benedikt Meurer (benedikt.meurer at unix-ag.uni-siegen.de)
+ 2004-2007, Brian Tarricone <bjt23 at cornell.edu>
License: GPL-2+
-Files: src/main.c
-Copyright: © 2004-2008 Brian Tarricone, <bjt23 at cornell.edu>
-Copyright: © 2003 Benedikt Meurer <benedikt.meurer at unix-ag.uni-siegen.de>
-Copyright: © 2004 Nils Rennebarth
+
+Files: src/menu.c
+Copyright: 2002-2003, Jasper Huijsmans (huysmans at users.sourceforge.net)
+ 2003, Benedikt Meurer <benedikt.meurer at unix-ag.uni-siegen.de>
+ 2004-2008, Brian J. Tarricone <bjt23 at cornell.edu>
License: GPL-2+
-Files: src/menu.{c,h}
-Copyright: © 2004-2008 Brian Tarricone, <bjt23 at cornell.edu>
-Copyright: © 2002-2003 Jasper Huijsmans (huysmans at users.sourceforge.net)
-Copyright: © 2003 Benedikt Meurer <benedikt.meurer at unix-ag.uni-siegen.de>
+
+Files: src/windowlist.c
+Copyright: 2002-2003, Jasper Huijsmans (huysmans at users.sourceforge.net)
+ 2003, Benedikt Meurer <benedikt.meurer at unix-ag.uni-siegen.de>
+ 2004-2008, Brian Tarricone <bjt23 at cornell.edu>
License: GPL-2+
-Files: src/windowlist.{c,h}
-Copyright: © 2004-2008 Brian Tarricone, <bjt23 at cornell.edu>
-Copyright: © 2002-2003 Jasper Huijsmans (huysmans at users.sourceforge.net)
-Copyright: © 2003 Benedikt Meurer <benedikt.meurer at unix-ag.uni-siegen.de>
+
+Files: src/main.c
+Copyright: 2002-2003, Jasper Huijsmans (huysmans at users.sourceforge.net)
+ 2003, Benedikt Meurer <benedikt.meurer at unix-ag.uni-siegen.de>
+ 2004, Nils Rennebarth
+ 2004-2009, Brian Tarricone, <bjt23 at cornell.edu>
License: GPL-2+
-Files: src/xfce-backdrop.{c,h}
-Copyright: © 2004 Brian Tarricone, <bjt23 at cornell.edu>
-Copyright: © 2002-2003 Jasper Huijsmans (huysmans at users.sourceforge.net)
-Copyright: © 2003 Benedikt Meurer <benedikt.meurer at unix-ag.uni-siegen.de>
+
+Files: settings/main.c
+Copyright: 2008, Brian Tarricone <bjt23 at cornell.edu>
+ 2008, JÃrôme Guelfucci <jerome.guelfucci at gmail.com>
+ 2008, Stephan Arts <stephan at xfce.org>
License: GPL-2+
-Files: src/xfce-desktop.{c,h}
-Copyright: © 2004-2007 Brian Tarricone, <bjt23 at cornell.edu>
-Copyright: © 2002-2003 Jasper Huijsmans (huysmans at users.sourceforge.net)
-Copyright: © 2003 Benedikt Meurer <benedikt.meurer at unix-ag.uni-siegen.de>
+
+Files: src/xfce-desktop-menu.c
+Copyright: 2002-2003, Jasper Huijsmans (huysmans at users.sourceforge.net)
License: GPL-2+
-Files: src/xfdesktop-clipboard-manager.{c,h}
-Copyright: © 2005-2006 Benedikt Meurer <benedikt.meurer at unix-ag.uni-siegen.de>
-License: GPL-2+
-Files: src/xfdesktop-dbus-bindings-{filemanager,trash}.xml
-Copyright: © 2006 Benedikt Meurer <benedikt.meurer at unix-ag.uni-siegen.de>
-License: GPL-2+
-Files: src/xfdesktop-file-icon-manager.c
-Copyright: © 2006 Benedikt Meurer <benedikt.meurer at unix-ag.uni-siegen.de>
-License: GPL-2+
-Files: src/xfdesktop-icon.c
-Copyright: © 2006-2007 Brian Tarricone, <bjt23 at cornell.edu>
-License: GPL-2+
-Files: src/xfdesktop-icon-view.c
-Copyright: © 2006-2008 Brian Tarricone, <bjt23 at cornell.edu>
-Copyright: © 2000 Eazel, Inc. (copied from Nautilus)
-License: GPL-2+
-Files: src/xfdesktop-{regular-file,special-file,volume}-icon.c
-Copyright: © 2006 Benedikt Meurer, <benny at xfce.org>
-License: GPL-2+
src/xfdesktop-icon-view.c contains code from Nautilus: © 2000 Eazel, Inc
settings/appearance-settings.c has code from gnome theme-switcher applet
Modified: desktop/trunk/xfdesktop4/debian/rules
===================================================================
--- desktop/trunk/xfdesktop4/debian/rules 2011-03-31 13:06:16 UTC (rev 5201)
+++ desktop/trunk/xfdesktop4/debian/rules 2011-03-31 13:21:07 UTC (rev 5202)
@@ -1,35 +1,22 @@
#!/usr/bin/make -f
-LDFLAGS+=-Wl,-z,defs -Wl,--as-needed
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
- CFLAGS += -O0
-else
- CFLAGS += -O2
-endif
+include /usr/share/hardening-includes/hardening.make
-override_dh_auto_configure:
- dh_auto_configure -- --libexecdir=\$${prefix}/lib \
- --enable-thunarx --enable-exo --enable-desktop-menu-dir-monitor
- cp po/POTFILES.skip po/POTFILES.skip.orig
- find .pc -type f -name '*.c' -o -name '*.in' -exec echo '{}' >> po/POTFILES.skip \;
+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)
-override_dh_auto_clean:
- mv po/POTFILES.skip.orig po/POTFILES.skip || true
- dh_auto_clean
+export CFLAGS LDFLAGS
+override_dh_auto_configure:
+ dh_auto_configure -- --enable-thunarx --enable-exo \
+ --docdir=\$${prefix}/share/doc/xfdesktop4-data
+ --enable-desktop-menu-dir-monitor
+
override_dh_install:
- rm -f $(CURDIR)/debian/tmp/usr/lib/xfce4/modules/*.la
- rm -f $(CURDIR)/debian/tmp/usr/lib/xfce4/modules/*.a
+ chrpath -d -k $(CURDIR)/debian/tmp/usr/bin/*
- chrpath -d -k $(CURDIR)/debian/tmp/usr/bin/* \
- $(CURDIR)/debian/tmp/usr/lib/xfce4/*/*
-
- # rename the generic terminal file
- mv $(CURDIR)/debian/tmp/usr/share/applications/xfce4-terminal.desktop \
- $(CURDIR)/debian/tmp/usr/share/applications/xfce4-term.desktop
- sed -i 's/xfce4-terminal/xfce4-term/' \
- $(CURDIR)/debian/tmp/etc/xdg/menus/xfce-applications.menu
-
dh_install --sourcedir=debian/tmp --fail-missing
# why oh why is this necessary?
rm -rf $(CURDIR)/debian/xfdesktop4-data/usr/share/man
Modified: desktop/trunk/xfdesktop4/debian/xfdesktop4-data.install
===================================================================
--- desktop/trunk/xfdesktop4/debian/xfdesktop4-data.install 2011-03-31 13:06:16 UTC (rev 5201)
+++ desktop/trunk/xfdesktop4/debian/xfdesktop4-data.install 2011-03-31 13:21:07 UTC (rev 5202)
@@ -3,4 +3,4 @@
usr/share/man
usr/share/pixmaps
usr/share/xfce4
-usr/share/desktop-directories
+usr/share/doc/xfdesktop4-data
Modified: desktop/trunk/xfdesktop4/debian/xfdesktop4.install
===================================================================
--- desktop/trunk/xfdesktop4/debian/xfdesktop4.install 2011-03-31 13:06:16 UTC (rev 5201)
+++ desktop/trunk/xfdesktop4/debian/xfdesktop4.install 2011-03-31 13:21:07 UTC (rev 5202)
@@ -1,4 +1,2 @@
-etc
usr/bin
-usr/lib
usr/share/applications
More information about the Pkg-xfce-commits
mailing list