r11734 - in /packages/experimental/update-notifier/debian: changelog patches/04_fix_gksu_usage.diff patches/05_call_updatem_synaptic_with_gksu.diff

[kov at users.alioth.debian.org]

Author: kov
Date: Sat Jun 30 16:15:07 2007
New Revision: 11734

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=11734
Log:
replacing the previous patch with a more general and
correct one which fixes the data structure to tell it
that callin gksu is needed, and also fixes the way
gksu is to be called

Added:
    packages/experimental/update-notifier/debian/patches/04_fix_gksu_usage.diff
Removed:
    packages/experimental/update-notifier/debian/patches/05_call_updatem_synaptic_with_gksu.diff
Modified:
    packages/experimental/update-notifier/debian/changelog

Modified: packages/experimental/update-notifier/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/update-notifier/debian/changelog?rev=11734&op=diff
==============================================================================
--- packages/experimental/update-notifier/debian/changelog (original)
+++ packages/experimental/update-notifier/debian/changelog Sat Jun 30 16:15:07 2007
@@ -3,8 +3,6 @@
   [ Alan Baghumian ]
   * New upstream release (Closes: #422507).
   * Merged with the previous changelog entry.
-  * Added 05_call_updatem_synaptic_with_gksu.diff, calls
-    update manager and synaptic with gksu
   * Removed 001_all_linguas.diff, merged upstream
   * Updated changelog.ubuntu
   * Updated 002_i18n_update.diff, 03_detect_debian_cd.diff
@@ -21,11 +19,13 @@
   [ Gustavo Noronha Silva ]
   * debian/patches/03_detect_debian_cd.diff:
   - reupdated for 0.57.3 (Alan had updated this for 0.57.1)
-  * debian/patches/05_call_updatem_synaptic_with_gksu.diff:
+  * debian/patches/04_fix_gksu_usage.diff:
   - do not use full path for update-manager when calling it;
     the path for update-manager has changed from /usr/sbin
     in earlier releases, and if we change the path to that here
-    we'll have to bump deps, which may not be desired
+    we'll have to bump deps, which may not be desired; same
+    goes for software-properties
+  - tell the code that update-manager needs gksu
 
  -- Gustavo Noronha Silva <kov at debian.org>  Wed, 27 Jun 2007 21:19:35 -0300
 

Added: packages/experimental/update-notifier/debian/patches/04_fix_gksu_usage.diff
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/update-notifier/debian/patches/04_fix_gksu_usage.diff?rev=11734&op=file
==============================================================================
--- packages/experimental/update-notifier/debian/patches/04_fix_gksu_usage.diff (added)
+++ packages/experimental/update-notifier/debian/patches/04_fix_gksu_usage.diff Sat Jun 30 16:15:07 2007
@@ -1,0 +1,43 @@
+diff -urN update-notifier-0.57.3.old/src/update.c update-notifier-0.57.3/src/update.c
+--- update-notifier-0.57.3.old/src/update.c	2007-06-26 08:00:12.000000000 -0300
++++ update-notifier-0.57.3/src/update.c	2007-06-30 13:11:43.000000000 -0300
+@@ -13,8 +13,8 @@
+ 
+ // command, description, desktopfile, needs_gksu
+ char* actions[][4] = {
+-   { "/usr/bin/update-manager", N_("Show updates"), 
+-     "/usr/share/applications/update-manager.desktop", FALSE },
++   { "update-manager", N_("Show updates"), 
++     "/usr/share/applications/update-manager.desktop", TRUE },
+ 
+    { "/usr/sbin/synaptic --dist-upgrade-mode --non-interactive --hide-main-window -o Synaptic::AskRelated=true",
+      N_("Install all updates"), "/usr/share/applications/synaptic.desktop", TRUE
+@@ -146,7 +146,7 @@
+ void 
+ cb_preferences(GObject *self, void *user_data)
+ {
+-   invoke_with_gksu("/usr/bin/software-properties-gtk",
++   invoke_with_gksu("software-properties-gtk",
+ 		    "/usr/share/applications/software-properties.desktop",
+ 		    FALSE);    
+ }
+diff -urN update-notifier-0.57.3.old/src/update-notifier.c update-notifier-0.57.3/src/update-notifier.c
+--- update-notifier-0.57.3.old/src/update-notifier.c	2007-06-26 08:00:12.000000000 -0300
++++ update-notifier-0.57.3/src/update-notifier.c	2007-06-30 13:11:11.000000000 -0300
+@@ -70,12 +70,13 @@
+ invoke_with_gksu(gchar *cmd, gchar *descr, gboolean whole_message)
+ {
+         //g_print("invoke_update_manager ()\n");
+-	gchar *argv[5];
++	gchar *argv[6];
+ 	argv[0] = "/usr/bin/gksu";
+ 	argv[1] = whole_message ? "--message" : "--desktop";
+ 	argv[2] = descr;
+-	argv[3] = cmd;
+-	argv[4] = NULL;
++	argv[3] = "--";
++	argv[4] = cmd;
++	argv[5] = NULL;
+ 
+ 	g_spawn_async (NULL, argv, NULL, 0, NULL, NULL, NULL, NULL);
+ }