[Pkg-xfce-commits] r5178 - in desktop/trunk/xfce4-utils/debian: . patches

Yves-Alexis Perez corsac at alioth.debian.org
Wed Mar 30 09:30:02 UTC 2011


Author: corsac
Date: 2011-03-30 21:29:51 +0000 (Wed, 30 Mar 2011)
New Revision: 5178

Added:
   desktop/trunk/xfce4-utils/debian/patches/02_xfhelp-rename-module.patch
Removed:
   desktop/trunk/xfce4-utils/debian/patches/02_use-Xsessions.options-for-ssh-agent-handling.patch
Modified:
   desktop/trunk/xfce4-utils/debian/Debian
   desktop/trunk/xfce4-utils/debian/changelog
   desktop/trunk/xfce4-utils/debian/control
   desktop/trunk/xfce4-utils/debian/copyright
   desktop/trunk/xfce4-utils/debian/patches/01_xflock4-test-running-screensaver.patch
   desktop/trunk/xfce4-utils/debian/patches/series
   desktop/trunk/xfce4-utils/debian/rules
Log:
merge 4.8 branch from experimental


Modified: desktop/trunk/xfce4-utils/debian/Debian
===================================================================
--- desktop/trunk/xfce4-utils/debian/Debian	2011-03-30 21:05:27 UTC (rev 5177)
+++ desktop/trunk/xfce4-utils/debian/Debian	2011-03-30 21:29:51 UTC (rev 5178)
@@ -2,9 +2,8 @@
 
 Co maintainers are:
 
-Simon Huggins <huggie at earth.li>
 Yves-Alexis Perez <corsac at debian.org>
-Emanuele Rocca <ema at debian.org>
+Lionel Le Folgoc <mrpouit at gmail.com>
 
 Bugs should be reported to Debian BTS at: http://bugs.debian.org or using
 reportbug.

Modified: desktop/trunk/xfce4-utils/debian/changelog
===================================================================
--- desktop/trunk/xfce4-utils/debian/changelog	2011-03-30 21:05:27 UTC (rev 5177)
+++ desktop/trunk/xfce4-utils/debian/changelog	2011-03-30 21:29:51 UTC (rev 5178)
@@ -1,12 +1,43 @@
-xfce4-utils (4.6.2-2) UNRELEASED; urgency=low
+xfce4-utils (4.8.1-2) UNRELEASED; urgency=low
 
+  * debian/Debian: update maintainers.
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Sat, 19 Feb 2011 23:25:24 +0100
+
+xfce4-utils (4.8.1-1) experimental; urgency=low
+
+  [ Yves-Alexis Perez ]
+  * New upstream development release.
+    - fix annoying messages in .xsession-errors    lp: #539247, Closes: #567300
+    - fix spelling error in xfhelp4 script                      Closes: #534850
+  * debian/control:
+    - refresh build-deps for Xfce 4.7
+    - bump standards version to 3.9.1
+    - add build-dep on hardening-includes
+    - add back build-dep on libdbus-glib-1-dev for xfrun dbus support which
+      was dropped in 4.6 for no good reason.
+    - add build-dep on xfce4-dev-tools and libtool
   * debian/patches:
-    - 05_fix-comment-char-in-xrdb-file added, patch by Mike Massonnet to fix
-      wrong comments character in xrdb file and warnings output to
-      .xsession-errors.                                         closes: #605802
+    - 01_xflock4-test-running-screensaver refreshed.
+    - 02_use-Xsessions.options-for-ssh-agent-handling dropped, Xfce has an
+      internal parameter so it can now be disabled there.
+    - 02_xfhelp-rename-module added, since xfce-utils is called xfce4-utils on
+      Debian, rename it in the script.
+  * debian/rules:
+    - pick {C,LD}FLAGS from dpkg-buildflags.
+    - add hardening flags to {C,LD}FLAGS
+    - create /usr/share/xfce4 folder before installing vendor info.
+    - run xdt-autogen after applying patch touching configure.in.
+  * debian/copyright updated for new release.
 
- -- Yves-Alexis Perez <corsac at debian.org>  Fri, 27 Aug 2010 10:07:59 +0200
+  [ Lionel Le Folgoc ]
+  * New upstream bugfix release.
+  * debian/rules: force $docdir to /usr/share/doc/xfce4-utils, and drop
+    $libexecdir, unneeded.
+  * debian/control: add myself to Uploaders.
 
+ -- Yves-Alexis Perez <corsac at debian.org>  Sun, 06 Feb 2011 18:10:22 +0100
+
 xfce4-utils (4.6.2-1) unstable; urgency=low
 
   [ Stefan Ott ]
@@ -27,7 +58,7 @@
     - 04_debianize-scripts added, add iceweasel to browser list, use Thunar
       instead of xftree as filemanager.
 
- -- Yves-Alexis Perez <corsac at debian.org>  Sun, 23 May 2010 13:48:43 +0200
+ -- Yves-Alexis Perez <corsac at debian.org>  Sat, 22 May 2010 17:31:09 +0200
 
 xfce4-utils (4.6.1-2) unstable; urgency=low
 

Modified: desktop/trunk/xfce4-utils/debian/control
===================================================================
--- desktop/trunk/xfce4-utils/debian/control	2011-03-30 21:05:27 UTC (rev 5177)
+++ desktop/trunk/xfce4-utils/debian/control	2011-03-30 21:29:51 UTC (rev 5178)
@@ -2,11 +2,13 @@
 Section: xfce
 Priority: optional
 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>
-Build-Depends: debhelper (>= 7.0.50~), libxfce4util-dev (>= 4.6.0),
- libxfcegui4-dev (>= 4.6.0), chrpath, intltool, 
-  libgtk2.0-dev (>= 2.10.0)
-Standards-Version: 3.8.4
+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~), libxfce4util-dev (>= 4.8.0),
+ libxfce4ui-1-dev (>= 4.8.0), chrpath, intltool, 
+ libgtk2.0-dev (>= 2.10.0), hardening-includes, libdbus-glib-1-dev (>= 0.33),
+ xfce4-dev-tools, libtool
+Standards-Version: 3.9.1
 Homepage: http://www.xfce.org/
 Vcs-Svn: svn://svn.debian.org/pkg-xfce/desktop/trunk/xfce4-utils/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-xfce/desktop/trunk/xfce4-utils/

Modified: desktop/trunk/xfce4-utils/debian/copyright
===================================================================
--- desktop/trunk/xfce4-utils/debian/copyright	2011-03-30 21:05:27 UTC (rev 5177)
+++ desktop/trunk/xfce4-utils/debian/copyright	2011-03-30 21:29:51 UTC (rev 5178)
@@ -10,44 +10,22 @@
 Xavier Maillard <zedek at fxgsproject.org>
 Brian J. Tarricone <bjt23 at cornell.edu>
 
-Copyright holders:
-Files: xfrun/*  
-Copyright: © 2006 Brian J. Tarricone <bjt23 at cornell.edu>
+Files: xfrun/xfrun-dbus.c
+ xfrun/xfrun-dialog.h
+ xfrun/xfrun.c
+Copyright: 2006, Brian J. Tarricone <bjt23 at cornell.edu>
 License: GPL-2+
-Files: xfrun/xfrun-dialog.c
-Copyright: © 2006 Brian J. Tarricone <bjt23 at cornell.edu>
-Copyright: © 2008 Stefan Stuhr <xfce4devlist at sstuhr.dk>
 
-File: xfce4-about/*
-Copyright: © 1999 Olivier Fourdan (fourdan at xfce.org)
-Copyright: © 2002 Xavier MAILLARD (zedek at fxgsproject.org)
-Copyright: © 2003 Jasper Huijsmans (huysmans at users.sourceforge.net)
-Copyright: © 2003,2006 Benedikt Meurer (benny at xfce.org)
-Copyright: © 2005,2006 Jean-François Wauthy (pollux at xfce.org)
+Files: xfce4-about/contributors.h
+ xfce4-about/main.c
+ xfce4-about/translators.h
+Copyright: 2010, Xfce Development Team
 License: GPL-2+
 
-Files: scripts/startxfce4*
-Copyright: © 1996-2003 Olivier Fourdan (fourdan at xfce.org)
+Files: xfrun/xfrun-dialog.c
+Copyright: 2006, Brian J. Tarricone <bjt23 at cornell.edu>
+ 2008, Stefan Stuhr <xfce4devlist at sstuhr.dk>
 License: GPL-2+
-Files: scripts/xfhelp4*
-Copyright: © 1999 Olivier Fourdan (fourdan at xfce.org)
-Copyright: © 2003 Jasper Huijsmans (jasper at xfce.org)
-License: GPL-2+
-Files: scripts/xflock4
-Copyright: © 1999, 2003 Olivier Fourdan (fourdan at xfce.org)
-Files: scripts/xfmountdev4
-Copyright: © 1999 Olivier Fourdan (fourdan at xfce.org)
-License: GPL-2+
-Files: scripts/xfconf-migration-4.6.pl*
-Copyright: © 2008 Brian Tarricone <bjt23 at cornell.edu>
-License: GPL-2
 
-Files: doc/xfce4-user-guide/*
-Copyright: © 2006 Jasper Huijsmans
-License: GPL-2+
-
-
 On Debian systems, the complete text of the GNU General Public 
 License can be found in `/usr/share/common-licenses/GPL'.
-The text of the GNU General Public License version 2 can be found in
-`/usr/share/common-licenses/GPL-2'.

Modified: desktop/trunk/xfce4-utils/debian/patches/01_xflock4-test-running-screensaver.patch
===================================================================
--- desktop/trunk/xfce4-utils/debian/patches/01_xflock4-test-running-screensaver.patch	2011-03-30 21:05:27 UTC (rev 5177)
+++ desktop/trunk/xfce4-utils/debian/patches/01_xflock4-test-running-screensaver.patch	2011-03-30 21:29:51 UTC (rev 5178)
@@ -1,8 +1,8 @@
 diff --git a/scripts/xflock4 b/scripts/xflock4
-index 369ec33..a59d89b 100644
+index fcf3323..c61b8e1 100644
 --- a/scripts/xflock4
 +++ b/scripts/xflock4
-@@ -19,11 +19,11 @@
+@@ -19,9 +19,9 @@
  #  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  #
  
@@ -10,10 +10,7 @@
 +if ps aux | grep x[s]creensaver > /dev/null 2>&1; then
      xscreensaver-command -lock 
 -elif test x"`which gnome-screensaver-command 2>/dev/null`" != x""; then
-+elif ps aux | grep gnome-[s]creensaver > /dev/null 2>&1; then
++elif ps aux | grep gnome-[s]creensaver 2>/dev/null; then
      gnome-screensaver-command --lock
- else
--    xlock $*
-+    xlock -mode blank $*
- fi
- exit 0
+ elif test x"`which slock 2>/dev/null`" != x""; then
+    slock

Deleted: desktop/trunk/xfce4-utils/debian/patches/02_use-Xsessions.options-for-ssh-agent-handling.patch
===================================================================
--- desktop/trunk/xfce4-utils/debian/patches/02_use-Xsessions.options-for-ssh-agent-handling.patch	2011-03-30 21:05:27 UTC (rev 5177)
+++ desktop/trunk/xfce4-utils/debian/patches/02_use-Xsessions.options-for-ssh-agent-handling.patch	2011-03-30 21:29:51 UTC (rev 5178)
@@ -1,20 +0,0 @@
-diff --git a/scripts/xinitrc.in b/scripts/xinitrc.in
-index 1a00294..b99fb8e 100755
---- a/scripts/xinitrc.in.in
-+++ b/scripts/xinitrc.in.in
-@@ -64,12 +64,15 @@ fi
- 
- # Use ssh-agent if installed and not already running.  Run it separately
- # so it populates the environment here, so we can clean it up later.
-+# Don't use ssh-agent if it has been disabled in Xsession.options
-+if grep -qs ^use-ssh-agent "/etc/X11/Xsession.options"; then
- sshagent=`which ssh-agent`
- kill_sshagent=0
- if test -z "$SSH_AGENT_PID" -a "$sshagent" -a "x$sshagent" != "xno"; then
- 	eval `$sshagent -s`
- 	kill_sshagent=1
- fi
-+fi
- 
- # Use dbus-launch if installed.
- if test x"$DBUS_SESSION_BUS_ADDRESS" = x""; then

Copied: desktop/trunk/xfce4-utils/debian/patches/02_xfhelp-rename-module.patch (from rev 5177, desktop/branches/experimental/xfce4-utils/debian/patches/02_xfhelp-rename-module.patch)
===================================================================
--- desktop/trunk/xfce4-utils/debian/patches/02_xfhelp-rename-module.patch	                        (rev 0)
+++ desktop/trunk/xfce4-utils/debian/patches/02_xfhelp-rename-module.patch	2011-03-30 21:29:51 UTC (rev 5178)
@@ -0,0 +1,22 @@
+diff --git a/scripts/xfhelp4.in b/scripts/xfhelp4.in
+index 57fe9a0..ebb124e 100644
+--- a/scripts/xfhelp4.in
++++ b/scripts/xfhelp4.in
+@@ -25,7 +25,7 @@ HELP_DIR="@_datadir_@/doc"
+ if [ ! x"$1" = x"" ]; then
+     MODULE="${1%.html}"
+ else
+-    MODULE="xfce-utils"
++    MODULE="xfce4-utils"
+ fi
+ 
+ # Check for translated documentation
+@@ -49,7 +49,7 @@ elif [ -r "$HELP_DIR/$MODULE/html/C/index.html" ]
+ then
+   URL="$HELP_DIR/$MODULE/html/C/index.html"
+ else
+-  URL="$HELP_DIR/xfce-utils/html/C/index.html"
++  URL="$HELP_DIR/xfce4-utils/html/C/index.html"
+ fi
+ 
+ xfbrowser4 $URL

Modified: desktop/trunk/xfce4-utils/debian/patches/series
===================================================================
--- desktop/trunk/xfce4-utils/debian/patches/series	2011-03-30 21:05:27 UTC (rev 5177)
+++ desktop/trunk/xfce4-utils/debian/patches/series	2011-03-30 21:29:51 UTC (rev 5178)
@@ -1,5 +1,5 @@
 01_xflock4-test-running-screensaver.patch
-02_use-Xsessions.options-for-ssh-agent-handling.patch
+02_xfhelp-rename-module.patch
 03_xfterm4-bug.patch
 04_debianize-scripts.patch
 05_fix-comment-char-in-xrdb-file.patch

Modified: desktop/trunk/xfce4-utils/debian/rules
===================================================================
--- desktop/trunk/xfce4-utils/debian/rules	2011-03-30 21:05:27 UTC (rev 5177)
+++ desktop/trunk/xfce4-utils/debian/rules	2011-03-30 21:29:51 UTC (rev 5178)
@@ -2,31 +2,35 @@
 
 export PWD=$(shell pwd)
 
-DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+include /usr/share/hardening-includes/hardening.make
 
-LDFLAGS+=-Wl,-z,defs -Wl,--as-needed
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -O0
-else
-	CFLAGS += -O2
-endif
+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)
 
+export CFLAGS LDFLAGS
+
 override_dh_auto_configure:
+	find .pc -type f -exec echo '{}' \; >> po/POTFILES.skip
+	NOCONFIGURE=1 xdt-autogen
 	dh_auto_configure -- --with-vendor-info=Debian --with-x \
-		--with-browser=midori --libexecdir=\$${prefix}/lib
-	
+		--with-browser=midori --docdir=\$${prefix}/share/doc/xfce4-utils
 
 override_dh_install:
 	rm -f `pwd`/debian/xfce4-utils/usr/lib/xfce4/mcs-plugins/*.la
 	rm -f `pwd`/debian/xfce4-utils/usr/lib/xfce4/mcs-plugins/*.a
 
-	install -m 644 `pwd`/debian/Debian \
-		`pwd`/debian/xfce4-utils/usr/share/xfce4/
+	install -D -m 644 `pwd`/debian/Debian \
+		`pwd`/debian/xfce4-utils/usr/share/xfce4/Debian
 
 	chrpath -d -k `pwd`/debian/xfce4-utils/usr/bin/xfrun4 \
 		`pwd`/debian/xfce4-utils/usr/bin/xfce4-about
 	chmod +x `pwd`/debian/xfce4-utils/etc/xdg/xfce4/xinitrc
 
+override_dh_auto_clean:
+	rm -f po/POTFILES.skip
+	dh_auto_clean
+
 %:
 	dh $@




More information about the Pkg-xfce-commits mailing list