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

[Yves-Alexis Perez]

Author: corsac
Date: 2011-06-21 08:02:13 +0000 (Tue, 21 Jun 2011)
New Revision: 5830

Modified:
   desktop/trunk/xfce4-utils/debian/changelog
   desktop/trunk/xfce4-utils/debian/control
   desktop/trunk/xfce4-utils/debian/patches/01_xflock4-test-running-screensaver.patch
Log:
* debian/patches:
  - 01_xflock4-test-running-screensaver edited, use pgrep since the []
    trick doesn't work with dash.
* debian/control:
  - add depends on procps.

Modified: desktop/trunk/xfce4-utils/debian/changelog
===================================================================
--- desktop/trunk/xfce4-utils/debian/changelog	2011-06-21 05:56:04 UTC (rev 5829)
+++ desktop/trunk/xfce4-utils/debian/changelog	2011-06-21 08:02:13 UTC (rev 5830)
@@ -1,3 +1,13 @@
+xfce4-utils (4.8.2-3) UNRELEASED; urgency=low
+
+  * debian/patches:
+    - 01_xflock4-test-running-screensaver edited, use pgrep since the []
+      trick doesn't work with dash.
+  * debian/control:
+    - add depends on procps.
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Tue, 21 Jun 2011 10:02:03 +0200
+
 xfce4-utils (4.8.2-2) unstable; urgency=low
 
   * debian/rules: set a different vendor in the about dialog if dpkg-vendor

Modified: desktop/trunk/xfce4-utils/debian/control
===================================================================
--- desktop/trunk/xfce4-utils/debian/control	2011-06-21 05:56:04 UTC (rev 5829)
+++ desktop/trunk/xfce4-utils/debian/control	2011-06-21 08:02:13 UTC (rev 5830)
@@ -17,7 +17,7 @@
 Section: xfce
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, xterm|x-terminal-emulator, 
- x11-xserver-utils, xinit, exo-utils
+ x11-xserver-utils, xinit, exo-utils, procps
 Recommends: xfwm4, xfce4-panel, thunar, xscreensaver | xlockmore |
  xlockmore-gl, dbus-x11, xinput, xdg-user-dirs
 Suggests: xfce4-session

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-06-21 05:56:04 UTC (rev 5829)
+++ desktop/trunk/xfce4-utils/debian/patches/01_xflock4-test-running-screensaver.patch	2011-06-21 08:02:13 UTC (rev 5830)
@@ -7,10 +7,10 @@
  #
  
 -if test x"`which xscreensaver-command 2>/dev/null`" != x""; then
-+if ps aux | grep x[s]creensaver > /dev/null 2>&1; then
++if pgrep xscreensaver > /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 2>/dev/null; then
++elif pgrep gnome-screensaver 2>/dev/null; then
      gnome-screensaver-command --lock
  elif test x"`which slock 2>/dev/null`" != x""; then
     slock