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

[corsac at alioth.debian.org]

Author: corsac
Date: 2008-01-11 12:50:34 +0000 (Fri, 11 Jan 2008)
New Revision: 1531

Added:
   desktop/trunk/xfce4-utils/debian/patches/
   desktop/trunk/xfce4-utils/debian/patches/01_xflock4-test-running-screensaver.patch
   desktop/trunk/xfce4-utils/debian/patches/series
Modified:
   desktop/trunk/xfce4-utils/debian/changelog
   desktop/trunk/xfce4-utils/debian/control
   desktop/trunk/xfce4-utils/debian/rules
Log:
add patch to test running screensaver instead of installed ones


Modified: desktop/trunk/xfce4-utils/debian/changelog
===================================================================
--- desktop/trunk/xfce4-utils/debian/changelog	2008-01-09 13:25:20 UTC (rev 1530)
+++ desktop/trunk/xfce4-utils/debian/changelog	2008-01-11 12:50:34 UTC (rev 1531)
@@ -1,8 +1,13 @@
 xfce4-utils (4.4.2-4) UNRELEASED; urgency=low
 
   * debian/Debian: changed email address for About Box.
+  * debian/patches:
+    - 01_xflock4-test-running-screensaver added, test the running screensaver
+      instead of the installed ones.
+  * debian/rules: include quilt patch system.
+  * debian/control: build-dep on quilt.
 
- -- Yves-Alexis Perez <corsac at debian.org>  Wed, 12 Dec 2007 14:57:40 +0100
+ -- Yves-Alexis Perez <corsac at debian.org>  Fri, 11 Jan 2008 12:26:11 +0100
 
 xfce4-utils (4.4.2-3) unstable; urgency=low
 

Modified: desktop/trunk/xfce4-utils/debian/control
===================================================================
--- desktop/trunk/xfce4-utils/debian/control	2008-01-09 13:25:20 UTC (rev 1530)
+++ desktop/trunk/xfce4-utils/debian/control	2008-01-11 12:50:34 UTC (rev 1531)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Xfce Maintainers <pkg-xfce-devel at lists.alioth.debian.org>
 Uploaders: Martin Loschwitz <madkiss at debian.org>, Emanuele Rocca <ema at debian.org>, Simon Huggins <huggie at earth.li>, Yves-Alexis Perez <corsac at debian.org>
-Build-Depends: debhelper (>= 4.1.26), libgtk2.0-dev (>= 2.10.6), libxft-dev, xfce4-mcs-manager-dev (>= 4.4.2), chrpath
+Build-Depends: debhelper (>= 4.1.26), libgtk2.0-dev (>= 2.10.6), libxft-dev, xfce4-mcs-manager-dev (>= 4.4.2), chrpath, quilt
 Standards-Version: 3.7.3
 Homepage: http://www.xfce.org/
 Vcs-Svn: svn://svn.debian.org/pkg-xfce/desktop/trunk/xfce4-utils/

Added: desktop/trunk/xfce4-utils/debian/patches/01_xflock4-test-running-screensaver.patch
===================================================================
--- desktop/trunk/xfce4-utils/debian/patches/01_xflock4-test-running-screensaver.patch	                        (rev 0)
+++ desktop/trunk/xfce4-utils/debian/patches/01_xflock4-test-running-screensaver.patch	2008-01-11 12:50:34 UTC (rev 1531)
@@ -0,0 +1,14 @@
+--- xfce4-utils-4.4.2/scripts/xflock4.orig	2007-11-17 20:31:32.000000000 +0100
++++ xfce4-utils-4.4.2/scripts/xflock4	2008-01-08 23:49:22.000000000 +0100
+@@ -19,9 +19,9 @@
+ #  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ #
+ 
+-if test x"`which xscreensaver-command 2>/dev/null`" != x""; then
++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
+     gnome-screensaver-command --lock
+ else
+     xlock $*

Added: desktop/trunk/xfce4-utils/debian/patches/series
===================================================================
--- desktop/trunk/xfce4-utils/debian/patches/series	                        (rev 0)
+++ desktop/trunk/xfce4-utils/debian/patches/series	2008-01-11 12:50:34 UTC (rev 1531)
@@ -0,0 +1 @@
+01_xflock4-test-running-screensaver.patch

Modified: desktop/trunk/xfce4-utils/debian/rules
===================================================================
--- desktop/trunk/xfce4-utils/debian/rules	2008-01-09 13:25:20 UTC (rev 1530)
+++ desktop/trunk/xfce4-utils/debian/rules	2008-01-11 12:50:34 UTC (rev 1531)
@@ -11,10 +11,10 @@
 	CFLAGS += -O2
 endif
 
-# dpatch stuff
-#include /usr/share/dpatch/dpatch.make
+# quilt stuff
+include /usr/share/quilt/quilt.make
 
-config.status: configure
+config.status: patch configure
 	
 	dh_testdir
 	./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --sysconfdir=/etc  --with-browser=sensible-browser --enable-final --with-vendor-info=Debian