[Pkg-xfce-commits] r4250 - in desktop/branches/experimental/xfce4-utils/debian: . patches

[Yves-Alexis Perez]

Author: corsac
Date: 2010-09-05 13:20:45 +0000 (Sun, 05 Sep 2010)
New Revision: 4250

Removed:
   desktop/branches/experimental/xfce4-utils/debian/patches/02_use-Xsessions.options-for-ssh-agent-handling.patch
Modified:
   desktop/branches/experimental/xfce4-utils/debian/changelog
   desktop/branches/experimental/xfce4-utils/debian/control
   desktop/branches/experimental/xfce4-utils/debian/patches/01_xflock4-test-running-screensaver.patch
   desktop/branches/experimental/xfce4-utils/debian/patches/series
Log:
* New upstream development release.
* debian/control:
  - refresh build-deps for Xfce 4.7
  - bump standards version to 3.9.1
* debian/patches:
  - 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.

Modified: desktop/branches/experimental/xfce4-utils/debian/changelog
===================================================================
--- desktop/branches/experimental/xfce4-utils/debian/changelog	2010-09-05 13:01:23 UTC (rev 4249)
+++ desktop/branches/experimental/xfce4-utils/debian/changelog	2010-09-05 13:20:45 UTC (rev 4250)
@@ -1,5 +1,18 @@
-xfce4-utils (4.6.2-1) UNRELEASED; urgency=low
+xfce4-utils (4.7.0-1) UNRELEASED; urgency=low
 
+  * New upstream development release.
+  * debian/control:
+    - refresh build-deps for Xfce 4.7
+    - bump standards version to 3.9.1
+  * debian/patches:
+    - 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.
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Sun, 05 Sep 2010 15:11:46 +0200
+
+xfce4-utils (4.6.2-1) unstable; urgency=low
+
   [ Stefan Ott ]
   * debian/watch edited to track Xfce archive reorganisation.
 

Modified: desktop/branches/experimental/xfce4-utils/debian/control
===================================================================
--- desktop/branches/experimental/xfce4-utils/debian/control	2010-09-05 13:01:23 UTC (rev 4249)
+++ desktop/branches/experimental/xfce4-utils/debian/control	2010-09-05 13:20:45 UTC (rev 4250)
@@ -3,10 +3,10 @@
 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, 
+Build-Depends: debhelper (>= 7.0.50~), libxfce4util-dev (>= 4.7.0),
+ libxfce4ui-1-dev (>= 4.7.0), chrpath, intltool, 
   libgtk2.0-dev (>= 2.10.0)
-Standards-Version: 3.8.4
+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/branches/experimental/xfce4-utils/debian/patches/01_xflock4-test-running-screensaver.patch
===================================================================
--- desktop/branches/experimental/xfce4-utils/debian/patches/01_xflock4-test-running-screensaver.patch	2010-09-05 13:01:23 UTC (rev 4249)
+++ desktop/branches/experimental/xfce4-utils/debian/patches/01_xflock4-test-running-screensaver.patch	2010-09-05 13:20:45 UTC (rev 4250)
@@ -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/branches/experimental/xfce4-utils/debian/patches/02_use-Xsessions.options-for-ssh-agent-handling.patch
===================================================================
--- desktop/branches/experimental/xfce4-utils/debian/patches/02_use-Xsessions.options-for-ssh-agent-handling.patch	2010-09-05 13:01:23 UTC (rev 4249)
+++ desktop/branches/experimental/xfce4-utils/debian/patches/02_use-Xsessions.options-for-ssh-agent-handling.patch	2010-09-05 13:20:45 UTC (rev 4250)
@@ -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

Modified: desktop/branches/experimental/xfce4-utils/debian/patches/series
===================================================================
--- desktop/branches/experimental/xfce4-utils/debian/patches/series	2010-09-05 13:01:23 UTC (rev 4249)
+++ desktop/branches/experimental/xfce4-utils/debian/patches/series	2010-09-05 13:20:45 UTC (rev 4250)
@@ -1,4 +1,3 @@
 01_xflock4-test-running-screensaver.patch
-02_use-Xsessions.options-for-ssh-agent-handling.patch
 03_xfterm4-bug.patch
 04_debianize-scripts.patch