[Pkg-cli-apps-commits] r5163 - in /packages/gnome-do/trunk/debian: changelog patches/02_use_cli_for_wrapper.dpatch patches/11_fix_autostart_when_directory_does_not_exist.dpatch

[raof-guest at users.alioth.debian.org]

Author: raof-guest
Date: Wed Dec  9 01:13:29 2009
New Revision: 5163

URL: http://svn.debian.org/wsvn/pkg-cli-apps/?sc=1&rev=5163
Log:
Update patches for new upstream

Removed:
    packages/gnome-do/trunk/debian/patches/11_fix_autostart_when_directory_does_not_exist.dpatch
Modified:
    packages/gnome-do/trunk/debian/changelog
    packages/gnome-do/trunk/debian/patches/02_use_cli_for_wrapper.dpatch

Modified: packages/gnome-do/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/gnome-do/trunk/debian/changelog?rev=5163&op=diff
==============================================================================
--- packages/gnome-do/trunk/debian/changelog (original)
+++ packages/gnome-do/trunk/debian/changelog Wed Dec  9 01:13:29 2009
@@ -10,6 +10,10 @@
       (LP: #475871, #448094)
     + Fixes startup problems when run by users with usernames > 9 characters
       long.  (LP: #439949)
+  * debian/patches/02_use_cli_for_wrapper:
+    + Refresh for new upstream changes
+  * debian/patches/11_fix_autostart_when_directory_does_not_exist:
+    + Drop; included upstream.
   * debian/control
     + Add Breaks on gnome-do-plugins < 0.8.2.  Do now handles plugins
       slightly differently.  This prevents users being surprised about

Modified: packages/gnome-do/trunk/debian/patches/02_use_cli_for_wrapper.dpatch
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/gnome-do/trunk/debian/patches/02_use_cli_for_wrapper.dpatch?rev=5163&op=diff
==============================================================================
--- packages/gnome-do/trunk/debian/patches/02_use_cli_for_wrapper.dpatch (original)
+++ packages/gnome-do/trunk/debian/patches/02_use_cli_for_wrapper.dpatch Wed Dec  9 01:13:29 2009
@@ -7,13 +7,13 @@
 ## DP: For cli policy conformance.
 
 @DPATCH@
-diff -urNad gnome-do-0.8.0~/Do/gnome-do.in gnome-do-0.8.0/Do/gnome-do.in
---- gnome-do-0.8.0~/Do/gnome-do.in	2009-02-04 12:34:22.000000000 +1100
-+++ gnome-do-0.8.0/Do/gnome-do.in	2009-02-04 12:34:52.917069743 +1100
+diff -urNad gnome-do-0.8.3.1+dfsg~/Do/gnome-do.in gnome-do-0.8.3.1+dfsg/Do/gnome-do.in
+--- gnome-do-0.8.3.1+dfsg~/Do/gnome-do.in	2009-12-08 16:21:50.000000000 +1100
++++ gnome-do-0.8.3.1+dfsg/Do/gnome-do.in	2009-12-09 12:01:25.200827672 +1100
 @@ -18,8 +18,8 @@
  
  # If Do is not running, run it.
- if pgrep -u "`id -un`" '^gnome-do$' >/dev/null; then
+ if pgrep -u "`id -u`" '^gnome-do$' >/dev/null; then
 -	mono "$GNOME_DO_EXE" "$@"
 +	/usr/bin/cli "$GNOME_DO_EXE" "$@"
  fi