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

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

Author: raof-guest
Date: Wed Feb  4 04:31:20 2009
New Revision: 4509

URL: http://svn.debian.org/wsvn/pkg-cli-apps/?sc=1&rev=4509
Log:
* debian/patches/02_use_cli_for_wrapper
  + Update for new upstream
  + Add dpatch comments

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=4509&op=diff
==============================================================================
--- packages/gnome-do/trunk/debian/changelog (original)
+++ packages/gnome-do/trunk/debian/changelog Wed Feb  4 04:31:20 2009
@@ -14,8 +14,11 @@
   * debian/patches/05_fix_localised_theme_setting
   * debian/patches/06_expand_homedir_in_open
     + Drop; fixed in new upstream  
+  * debian/patches/02_use_cli_for_wrapper
+    + Update for new upstream
+    + Add dpatch comments
 
- -- Christopher James Halse Rogers <raof at ubuntu.com>  Wed, 04 Feb 2009 11:43:24 +1100
+ -- Christopher James Halse Rogers <raof at ubuntu.com>  Wed, 04 Feb 2009 15:30:25 +1100
 
 gnome-do (0.6.1.0-1) experimental; urgency=low
 

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=4509&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 Feb  4 04:31:20 2009
@@ -2,16 +2,22 @@
 ## 02_use_cli_for_wrapper.dpatch by Christopher James Halse Rogers <raof at ubuntu.com>
 ##
 ## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
+## DP: Use /usr/bin/cli for the wrapper script instead of calling mono
+## DP: directly.
+## DP: For cli policy conformance.
 
 @DPATCH@
-diff -urNad gnome-do-0.4.2.0~/Do/gnome-do.in gnome-do-0.4.2.0/Do/gnome-do.in
---- gnome-do-0.4.2.0~/Do/gnome-do.in	2008-03-14 19:26:18.000000000 +1100
-+++ gnome-do-0.4.2.0/Do/gnome-do.in	2008-05-03 11:05:44.000000000 +1000
-@@ -18,5 +18,5 @@
+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
+@@ -18,8 +18,8 @@
  
  # If Do is not running, run it.
  if pgrep -u "`id -un`" '^gnome-do$' >/dev/null; then
--	exec mono "$GNOME_DO_EXE" "$@"
-+	exec /usr/bin/cli "$GNOME_DO_EXE" "$@"
+-	mono "$GNOME_DO_EXE" "$@"
++	/usr/bin/cli "$GNOME_DO_EXE" "$@"
  fi
+ while [ "$?" -eq "20" ]; do
+-	mono "$GNOME_DO_EXE" "$@"
++	/usr/bin/cli "$GNOME_DO_EXE" "$@"
+ done