[Pkg-galago-commit] r463 - in packages/unstable/gnome-main-menu/debian: . patches

Riccardo Setti giskard at alioth.debian.org
Tue Dec 12 21:32:41 CET 2006


Author: giskard
Date: 2006-12-12 21:32:41 +0100 (Tue, 12 Dec 2006)
New Revision: 463

Removed:
   packages/unstable/gnome-main-menu/debian/gnome-main-menu.dirs
Modified:
   packages/unstable/gnome-main-menu/debian/changelog
   packages/unstable/gnome-main-menu/debian/control
   packages/unstable/gnome-main-menu/debian/gnome-main-menu.install
   packages/unstable/gnome-main-menu/debian/patches/01_fix_menu_path.patch
   packages/unstable/gnome-main-menu/debian/patches/03_fix_upgrade_packages.patch
   packages/unstable/gnome-main-menu/debian/patches/08_add_place_menu.patch
   packages/unstable/gnome-main-menu/debian/patches/11_fix_control_center.patch
   packages/unstable/gnome-main-menu/debian/patches/series
Log:
* Renamed the source package as the cvs module is changed.
* New upstream snapshot
* Updated patches:
  - 01_fix_menu_path.patch
  - 03_fix_upgrade_packages.patch
  - 11_fix_control_center.patch

Modified: packages/unstable/gnome-main-menu/debian/changelog
===================================================================
--- packages/unstable/gnome-main-menu/debian/changelog	2006-12-12 16:44:25 UTC (rev 462)
+++ packages/unstable/gnome-main-menu/debian/changelog	2006-12-12 20:32:41 UTC (rev 463)
@@ -1,3 +1,14 @@
+gnome-main-menu (0.6.3.cvs.20061212-1) unstable; urgency=low
+
+  * Renamed the source package as the cvs module is changed.
+  * New upstream snapshot
+  * Updated patches:
+    - 01_fix_menu_path.patch
+    - 03_fix_upgrade_packages.patch
+    - 11_fix_control_center.patch
+
+ -- Riccardo Setti <giskard at debian.org>  Tue, 12 Dec 2006 18:32:43 +0100
+
 slab (0.0.cvs.20061028-1) unstable; urgency=low
 
   * New upstream snapshot

Modified: packages/unstable/gnome-main-menu/debian/control
===================================================================
--- packages/unstable/gnome-main-menu/debian/control	2006-12-12 16:44:25 UTC (rev 462)
+++ packages/unstable/gnome-main-menu/debian/control	2006-12-12 20:32:41 UTC (rev 463)
@@ -1,4 +1,4 @@
-Source: slab
+Source: gnome-main-menu
 Section: gnome
 Priority: optional
 Maintainer: Riccardo Setti <giskard at debian.org>
@@ -19,3 +19,36 @@
  from the start menu. It provides shortcuts for common system
  administration actions and integrates with network-manager for network
  status reporting.
+
+Package: libslab0
+Architecture: any
+Section: libs
+Depends: ${shlibs:Depends}
+Description: beautification app library file
+  This applet provides a "start menu" for the GNOME desktop.
+ .
+ It features a list of favorite applications, and recently used documents.
+ .
+ It also integrates with the Beagle search tool to provide search facilities
+ from the start menu. It provides shortcuts for common system
+ administration actions and integrates with network-manager for network
+ status reporting.
+ .
+ This package contains shared libraries.
+
+Package: libslab-dev
+Architecture: any
+Section: libdevel
+Depends: libslab (= ${Source-Version}), libglib2.0-dev, libgtk2.0-dev, libgnome-desktop-dev, librsvg2-dev, libgnome-menu-dev, libpango1.0-dev
+Description: development file for libslab0
+  This applet provides a "start menu" for the GNOME desktop.
+ .
+ It features a list of favorite applications, and recently used documents.
+ .
+ It also integrates with the Beagle search tool to provide search facilities
+ from the start menu. It provides shortcuts for common system
+ administration actions and integrates with network-manager for network
+ status reporting.
+ .
+ This package contains header and development files.
+

Deleted: packages/unstable/gnome-main-menu/debian/gnome-main-menu.dirs
===================================================================
--- packages/unstable/gnome-main-menu/debian/gnome-main-menu.dirs	2006-12-12 16:44:25 UTC (rev 462)
+++ packages/unstable/gnome-main-menu/debian/gnome-main-menu.dirs	2006-12-12 20:32:41 UTC (rev 463)
@@ -1,5 +0,0 @@
-usr/share/locale
-usr/share/gnome-2.0/ui
-usr/share/gconf/schemas
-usr/lib/gnome-main-menu
-usr/share/gnome-main-menu

Modified: packages/unstable/gnome-main-menu/debian/gnome-main-menu.install
===================================================================
--- packages/unstable/gnome-main-menu/debian/gnome-main-menu.install	2006-12-12 16:44:25 UTC (rev 462)
+++ packages/unstable/gnome-main-menu/debian/gnome-main-menu.install	2006-12-12 20:32:41 UTC (rev 463)
@@ -1 +1,6 @@
-debian/gnome-main-menu/usr/share/applications/* /usr/share/gnome-main-menu
+debian/tmp/usr/share/applications/*
+debian/tmp/usr/lib/bonobo
+debian/tmp/usr/lib/gnome-main-menu
+debian/tmp/usr/share/gconf
+debian/tmp/usr/share/gnome-2.0
+debian/tmp/usr/share/locale

Modified: packages/unstable/gnome-main-menu/debian/patches/01_fix_menu_path.patch
===================================================================
--- packages/unstable/gnome-main-menu/debian/patches/01_fix_menu_path.patch	2006-12-12 16:44:25 UTC (rev 462)
+++ packages/unstable/gnome-main-menu/debian/patches/01_fix_menu_path.patch	2006-12-12 20:32:41 UTC (rev 463)
@@ -1,13 +1,11 @@
-Index: slab/application-browser/src/application-browser.c
-===================================================================
---- slab.orig/application-browser/src/application-browser.c	2006-06-26 16:11:48.000000000 +0200
-+++ slab/application-browser/src/application-browser.c	2006-10-28 16:07:40.000000000 +0200
-@@ -104,7 +104,7 @@
+--- gnome-main-menu-0.6.3.cvs.20061212.orig/application-browser/src/application-browser.c	2006-12-12 18:19:51.000000000 +0100
++++ gnome-main-menu-0.6.3.cvs.20061212/application-browser/src/application-browser.c	2006-12-12 18:20:35.000000000 +0100
+@@ -84,7 +84,7 @@
  	config->max_items = get_slab_gconf_int (NEW_APPS_MAX_ITEMS);
  	config->name = _("New Applications");
- 	AppShellData *app_data =
--		appshelldata_new ("applications.menu", config,
-+		appshelldata_new ("gnome-applications.menu", config,
- 				  APPLICATION_BROWSER_PREFIX,
- 				  GTK_ICON_SIZE_DND);
+ 	AppShellData *app_data = appshelldata_new (
+-		"applications.menu", config, APPLICATION_BROWSER_PREFIX, GTK_ICON_SIZE_DND);
++		"gnome-applications.menu", config, APPLICATION_BROWSER_PREFIX, GTK_ICON_SIZE_DND);
  	generate_categories (app_data);
+ 
+ 	layout_shell (app_data, _("Filter"), _("Groups"), _("Application Actions"), NULL, NULL);

Modified: packages/unstable/gnome-main-menu/debian/patches/03_fix_upgrade_packages.patch
===================================================================
--- packages/unstable/gnome-main-menu/debian/patches/03_fix_upgrade_packages.patch	2006-12-12 16:44:25 UTC (rev 462)
+++ packages/unstable/gnome-main-menu/debian/patches/03_fix_upgrade_packages.patch	2006-12-12 20:32:41 UTC (rev 463)
@@ -11,34 +11,4 @@
  			<locale name="C">
  				<short>package manager item .desktop file</short>
  				<long>package manager item .desktop file</long>
-Index: slab/libtile/application-tile.c
-===================================================================
---- slab.orig/libtile/application-tile.c	2006-06-26 16:11:53.000000000 +0200
-+++ slab/libtile/application-tile.c	2006-10-28 16:09:04.000000000 +0200
-@@ -417,7 +417,7 @@
- 		gtk_container_add (GTK_CONTAINER (context_menu), menu_item);
- 	}
  
--/* make upgrade action */
-+/* make upgrade action
- 
- 	action = tile_action_new (TILE (this), upgrade_trigger, _("Upgrade"),
- 				  0);
-@@ -425,7 +425,7 @@
- 	menu_item = GTK_WIDGET (tile_action_get_menu_item (action));
- 	gtk_container_add (menu_ctnr, menu_item);
- 
--/* make uninstall action */
-+ make uninstall action 
- 
- 	action = tile_action_new (TILE (this), uninstall_trigger,
- 				  _("Uninstall"), 0);
-@@ -445,7 +445,7 @@
- 
- 		g_error_free (error);
- 	}
--
-+*/
- 	gtk_widget_show_all (GTK_WIDGET (TILE (this)->context_menu));
- }
- 

Modified: packages/unstable/gnome-main-menu/debian/patches/08_add_place_menu.patch
===================================================================
--- packages/unstable/gnome-main-menu/debian/patches/08_add_place_menu.patch	2006-12-12 16:44:25 UTC (rev 462)
+++ packages/unstable/gnome-main-menu/debian/patches/08_add_place_menu.patch	2006-12-12 20:32:41 UTC (rev 463)
@@ -1,8 +1,7 @@
-Index: slab/main-menu/src/file-area-widget.c
-===================================================================
---- slab.orig/main-menu/src/file-area-widget.c	2006-06-26 16:13:03.000000000 +0200
-+++ slab/main-menu/src/file-area-widget.c	2006-10-28 16:13:19.000000000 +0200
-@@ -44,6 +44,7 @@
+diff -urNad gnome-main-menu-0.6.3.cvs.20061212.orig/main-menu/src/file-area-widget.c gnome-main-menu-0.6.3.cvs.20061212/main-menu/src/file-area-widget.c
+--- gnome-main-menu-0.6.3.cvs.20061212.orig/main-menu/src/file-area-widget.c	2006-12-12 18:19:51.000000000 +0100
++++ gnome-main-menu-0.6.3.cvs.20061212/main-menu/src/file-area-widget.c	2006-12-12 18:50:53.000000000 +0100
+@@ -43,6 +43,7 @@
  #define FILE_CLASS_GCONF_KEY       FILE_AREA_GCONF_DIR "/file_class"
  #define USER_SPEC_APPS_GCONF_KEY   FILE_AREA_GCONF_DIR "/user_specified_apps"
  #define ITEM_LIMIT_GCONF_KEY       FILE_AREA_GCONF_DIR "/item_limit"
@@ -10,49 +9,36 @@
  #define AB_LINK_VISIBLE_GCONF_KEY  LOCK_DOWN_GCONF_DIR "/application_browser_link_visible"
  #define SHOWABLE_TYPES_GCONF_KEY   LOCK_DOWN_GCONF_DIR "/showable_file_types"
  #define DISABLE_TERMINAL_GCONF_KEY "/desktop/gnome/lockdown/disable_command_line"
-@@ -109,6 +110,9 @@
- 					  TileTableURIAddedEvent *, gpointer);
-      static void tile_table_n_rows_notify_cb (GObject *, GParamSpec *,
- 					      gpointer);
-+    
-+     static void place_gconf_notify_cb (GConfClient*, guint, GConfEntry *, 
-+                                        gpointer);
+@@ -101,6 +102,8 @@
+ static void tile_table_uri_added_cb (TileTable *, TileTableURIAddedEvent *, gpointer);
+ static void tile_table_n_rows_notify_cb (GObject *, GParamSpec *, gpointer);
  
-      static void user_spec_apps_gconf_notify_cb (GConfClient *, guint,
- 						 GConfEntry *, gpointer);
-@@ -204,6 +208,30 @@
++static void place_gconf_notify_cb (GConfClient*, guint, GConfEntry *, gpointer);
++
+ static void user_spec_apps_gconf_notify_cb (GConfClient *, guint, GConfEntry *, gpointer);
+ 
+ GtkWidget *file_area_widget_new (MainMenuUI * ui, MainMenuEngine * engine)
+@@ -182,6 +185,18 @@
  			tiles = get_tiles (this, i);
  
  			switch (i) {
-+               case PLACES:
-+                markup = _("Places");
-+                connect_gconf_notify
-+                        (PLACES_GCONF_KEY,
-+                        place_gconf_notify_cb,
-+                        this);
-+                g_signal_connect(G_OBJECT(table),
-+                        "tile-table-update",
-+                        G_CALLBACK
-+                        (tile_table_update_cb),
-+                         this);
-+                g_signal_connect(G_OBJECT(table),
-+                        "tile-table-uri-added",
-+                        G_CALLBACK
-+                        (tile_table_uri_added_cb),
-+                        this);
-+                g_signal_connect(G_OBJECT(table),
-+                       "notify::n-rows",
-+                        G_CALLBACK
-+                        (tile_table_n_rows_notify_cb),
-+                        this);
-+                break;
-+
-+
- 			case USER_SPECIFIED_APPS:
- 				markup = _("Favorite Applications");
++				case PLACES:
++					markup = _("Places");
++					connect_gconf_notify(PLACES_GCONF_KEY,
++								place_gconf_notify_cb, this);
++					g_signal_connect(G_OBJECT(table), "tile-table-update",
++							 G_CALLBACK (tile_table_update_cb),this);
++					g_signal_connect(G_OBJECT(table), "tile-table-uri-added",
++							 G_CALLBACK (tile_table_uri_added_cb),this);
++					g_signal_connect(G_OBJECT(table), "notify::n-rows",
++							 G_CALLBACK (tile_table_n_rows_notify_cb),this);
++					break;
++	
+ 				case USER_SPECIFIED_APPS:
+ 					markup = _("Favorite Applications");
  
-@@ -513,6 +541,31 @@
- 			g_free (node->data);
+@@ -463,6 +478,30 @@
+ 			g_list_free (existing_files);
  		}
  	}
 +       else if (file_class == PLACES) {
@@ -79,79 +65,69 @@
 +
 +                       }
 +       }
-+
  
  	else if (file_class == RECENTLY_USED_APPS) {
- 		files = get_recent_files (RECENT_APPS_FILE_PATH);
-@@ -754,6 +807,14 @@
+ 		files = main_menu_get_recent_apps (priv->recent_monitor);
+@@ -675,6 +714,12 @@
+ 		&& !TILE_ACTION_CHECK_FLAG (action, TILE_ACTION_OPENS_HELP))
+ 		main_menu_ui_close (priv->ui, FALSE);
  }
- 
- static void
++static void
 +place_gconf_notify_cb (GConfClient * client, guint conn_id,
 +                       GConfEntry * entry, gpointer user_data)
 +{
 +       update_table (FILE_AREA_WIDGET (user_data), PLACES );
 +}
-+
-+
-+static void
- recent_files_store_monitor_cb (GnomeVFSMonitorHandle * handle,
- 			       const gchar * monitor_uri,
- 			       const gchar * info_uri,
-Index: slab/main-menu/src/main-menu-conf.c
-===================================================================
---- slab.orig/main-menu/src/main-menu-conf.c	2006-06-26 16:13:03.000000000 +0200
-+++ slab/main-menu/src/main-menu-conf.c	2006-10-28 16:14:20.000000000 +0200
-@@ -194,6 +194,7 @@
- 	conf->lock_down_conf->file_area_showable_types [RECENTLY_USED_APPS] =
- 		FALSE;
- 	conf->lock_down_conf->file_area_showable_types [RECENT_FILES] = FALSE;
-+	conf->lock_down_conf->file_area_showable_types [PLACES] = FALSE;
  
- 	for (node = showable_file_types; node; node = node->next) {
- 		type = GPOINTER_TO_INT (node->data);
-@@ -578,13 +579,15 @@
- 		  conf->lock_down_conf->system_area_visible);
- 	g_printf ("    status_area_visible:      %d\n",
- 		  conf->lock_down_conf->status_area_visible);
--	g_printf ("    file_area_showable_types:  [%d,%d,%d]\n",
-+	g_printf ("    file_area_showable_types:  [%d,%d,%d,%d]\n",
- 		  conf->lock_down_conf->
- 		  file_area_showable_types [USER_SPECIFIED_APPS],
- 		  conf->lock_down_conf->
- 		  file_area_showable_types [RECENTLY_USED_APPS],
- 		  conf->lock_down_conf->
--		  file_area_showable_types [RECENT_FILES]);
-+		  file_area_showable_types [RECENT_FILES],
-+		  conf->lock_down_conf->
-+		  file_area_showable_types [PLACES]);
+ static void
+ recent_files_store_changed_cb (MainMenuRecentMonitor *manager, gpointer user_data)
+diff -urNad gnome-main-menu-0.6.3.cvs.20061212.orig/main-menu/src/main-menu-conf.c gnome-main-menu-0.6.3.cvs.20061212/main-menu/src/main-menu-conf.c
+--- gnome-main-menu-0.6.3.cvs.20061212.orig/main-menu/src/main-menu-conf.c	2006-12-12 18:19:51.000000000 +0100
++++ gnome-main-menu-0.6.3.cvs.20061212/main-menu/src/main-menu-conf.c	2006-12-12 19:09:26.000000000 +0100
+@@ -179,6 +179,7 @@
+ 	conf->lock_down_conf->file_area_showable_types[USER_SPECIFIED_APPS] = FALSE;
+ 	conf->lock_down_conf->file_area_showable_types[RECENTLY_USED_APPS] = FALSE;
+ 	conf->lock_down_conf->file_area_showable_types[RECENT_FILES] = FALSE;
++	conf->lock_down_conf->file_area_showable_types[PLACES] = FALSE;
  
+ 	for (node = showable_file_types; node; node = node->next)
+ 	{
+@@ -539,10 +540,11 @@
+ 	g_printf ("    ab_link_visible:          %d\n", conf->lock_down_conf->ab_link_visible);
+ 	g_printf ("    system_area_visible:      %d\n", conf->lock_down_conf->system_area_visible);
+ 	g_printf ("    status_area_visible:      %d\n", conf->lock_down_conf->status_area_visible);
+-	g_printf ("    file_area_showable_types: [%d,%d,%d]\n",
++	g_printf ("    file_area_showable_types: [%d,%d,%d,%d]\n",
+ 		conf->lock_down_conf->file_area_showable_types[USER_SPECIFIED_APPS],
+ 		conf->lock_down_conf->file_area_showable_types[RECENTLY_USED_APPS],
+-		conf->lock_down_conf->file_area_showable_types[RECENT_FILES]);
++		conf->lock_down_conf->file_area_showable_types[RECENT_FILES],
++		conf->lock_down_conf->file_area_showable_types[PLACES]);
+ 
  	g_printf ("\n");
  }
-Index: slab/main-menu/src/main-menu-conf.h
-===================================================================
---- slab.orig/main-menu/src/main-menu-conf.h	2006-06-26 16:13:03.000000000 +0200
-+++ slab/main-menu/src/main-menu-conf.h	2006-10-28 16:14:46.000000000 +0200
-@@ -35,7 +35,8 @@
+diff -urNad gnome-main-menu-0.6.3.cvs.20061212.orig/main-menu/src/main-menu-conf.h gnome-main-menu-0.6.3.cvs.20061212/main-menu/src/main-menu-conf.h
+--- gnome-main-menu-0.6.3.cvs.20061212.orig/main-menu/src/main-menu-conf.h	2006-12-12 18:19:51.000000000 +0100
++++ gnome-main-menu-0.6.3.cvs.20061212/main-menu/src/main-menu-conf.h	2006-12-12 19:09:49.000000000 +0100
+@@ -38,9 +38,10 @@
  	USER_SPECIFIED_APPS = 0,
  	RECENTLY_USED_APPS = 1,
  	RECENT_FILES = 2,
--	FILE_CLASS_SENTINEL = 3	/* must always be last and equal (in value)
-+    PLACES = 3,
-+	FILE_CLASS_SENTINEL = 4	/* must always be last and equal (in value)
- 				   to the number of possible file class types 
- 				 */
++	PLACES = 3,
+ 
+ 	/* must always be last and equal (in value) to the number of possible file class types */
+-	FILE_CLASS_SENTINEL = 3
++	FILE_CLASS_SENTINEL = 4
  } FileClass;
-Index: slab/main-menu/etc/slab.schemas.in.in
-===================================================================
---- slab.orig/main-menu/etc/slab.schemas.in.in	2006-10-28 16:09:20.000000000 +0200
-+++ slab/main-menu/etc/slab.schemas.in.in	2006-10-28 16:10:18.000000000 +0200
-@@ -12,30 +12,18 @@
- 				<long>.desktop files for "Favorite Applications"</long>
- 			</locale>
+ 
+ typedef enum
+diff -urNad gnome-main-menu-0.6.3.cvs.20061212.orig/main-menu/etc/slab.schemas.in.in gnome-main-menu-0.6.3.cvs.20061212/main-menu/etc/slab.schemas.in.in
+--- gnome-main-menu-0.6.3.cvs.20061212.orig/main-menu/etc/slab.schemas.in.in	2006-12-12 18:19:51.000000000 +0100
++++ gnome-main-menu-0.6.3.cvs.20061212/main-menu/etc/slab.schemas.in.in	2006-12-12 19:40:57.000000000 +0100
+@@ -14,28 +14,17 @@
  		</schema>
--
--		<schema>
+ 
+ 		<schema>
 -			<key>/schemas/desktop/gnome/applications/main-menu/uninstall_package_command</key>
 -			<applyto>/desktop/gnome/applications/main-menu/uninstall_package_command</applyto>
 -			<owner>gnome-main-menu</owner>
@@ -174,13 +150,12 @@
 -				<long>command to upgrade packages, PACKAGE_NAME is replaced by the name of the package in the command</long>
 -			</locale>
 -		</schema>
-+                <schema>
 +                       <key>/schemas/desktop/gnome/applications/main-menu/file-area/places</key>
 +                       <applyto>/desktop/gnome/applications/main-menu/file-area/places</applyto>
 +                       <owner>gnome-main-menu</owner>
 +                       <type>list</type>
 +                       <list_type>string</list_type>
-+                       <default>[nautilus-computer.desktop,nautilus-home.desktop,network-scheme.desktop,nautilus-cd-burner.desktop,beagle-search.desktop]</default>
++                       <default>[nautilus-computer.desktop,nautilus-home.desktop,network-scheme.desktop,nautilus-cd-burner.desktop,beagle-    search.desktop]</default>
 +                       <locale name="C">
 +                       <short>.desktop files for "Places"</short>
 +                       <long>.desktop files for "Places"</long>
@@ -189,16 +164,16 @@
  
  		<schema>
  			<key>/schemas/desktop/gnome/applications/main-menu/system-area/system_item_list</key>
-@@ -322,10 +310,10 @@
+@@ -322,10 +311,10 @@
  			<owner>gnome-main-menu</owner>
  			<type>list</type>
  			<list_type>int</list_type>
 -			<default>[0,1,2]</default>
-+			<default>[0,2,3]</default>
++			<default>[0,1,3]</default>
  			<locale name="C">
  				<short>lock-down configuration of the file area</short>
 -				<long>contains the list (in no particular order) of allowable file types to show in the file area.  possible values (see also the note for /desktop/gnome/applications/main-menu/file-area/file_class): 0 [USER_SPECIFIED_APPS], 1 [RECENTLY_USED_APPS], 2 [RECENT_FILES].  RECENTLY_USED_APPS is the list of recently used (instantiated with the main-menu or the application-browser).  USER_SPECIFIED_APPS is equivalent to "Favorite Applications".  RECENT_FILES is the list of files from ~/.recently-used.</long>
-+				<long>contains the list (in no particular order) of allowable file types to show in the file area.  possible values (see also the note for /desktop/gnome/applications/main-menu/file-area/file_class): 0 [USER_SPECIFIED_APPS], 1 [RECENTLY_USED_APPS], 2 [RECENT_FILES], 3 [PLACES], RECENTLY_USED_APPS is the list of recently used (instantiated with the main-menu or the application-browser).  USER_SPECIFIED_APPS is equivalent to "Favorite Applications".  RECENT_FILES is the list of files from ~/.recently-used, PLACE is the list of possible place (home, net, cd-rom)</long>
++				<long>contains the list (in no particular order) of allowable file types to show in the file area.  possible values (see also the note for /desktop/gnome/applications/main-menu/file-area/file_class): 0 [USER_SPECIFIED_APPS], 1 [RECENTLY_USED_APPS], 2 [RECENT_FILES].  RECENTLY_USED_APPS is the list of recently used (instantiated with the main-menu or the application-browser).  USER_SPECIFIED_APPS is equivalent to "Favorite Applications".  RECENT_FILES is the list of files from ~/.recently-used.  PLACE is the list of possible place (home, net, cd-rom)</long>
  			</locale>
  		</schema>
  	</schemalist>

Modified: packages/unstable/gnome-main-menu/debian/patches/11_fix_control_center.patch
===================================================================
--- packages/unstable/gnome-main-menu/debian/patches/11_fix_control_center.patch	2006-12-12 16:44:25 UTC (rev 462)
+++ packages/unstable/gnome-main-menu/debian/patches/11_fix_control_center.patch	2006-12-12 20:32:41 UTC (rev 463)
@@ -1,13 +1,11 @@
-Index: slab/control-center/src/control-center.c
-===================================================================
---- slab.orig/control-center/src/control-center.c	2006-06-26 16:11:50.000000000 +0200
-+++ slab/control-center/src/control-center.c	2006-10-28 16:15:25.000000000 +0200
-@@ -140,7 +140,7 @@
+--- gnome-main-menu-0.6.3.cvs.20061212.orig/control-center/src/control-center.c	2006-12-12 18:19:51.000000000 +0100
++++ gnome-main-menu-0.6.3.cvs.20061212/control-center/src/control-center.c	2006-12-12 18:26:31.000000000 +0100
+@@ -139,7 +139,7 @@
  	}
  
- 	AppShellData *app_data =
--		appshelldata_new ("preferences.menu", NULL,
-+		appshelldata_new ("gnome-settings.menu", NULL,
- 				  CONTROL_CENTER_PREFIX,
- 				  GTK_ICON_SIZE_DIALOG);
+ 	AppShellData *app_data = appshelldata_new (
+-		"preferences.menu", NULL, CONTROL_CENTER_PREFIX, GTK_ICON_SIZE_DIALOG);
++		"gnome-settings.menu", NULL, CONTROL_CENTER_PREFIX, GTK_ICON_SIZE_DIALOG);
  	generate_categories (app_data);
+ 
+ 	GSList *actions = get_actions_list ();

Modified: packages/unstable/gnome-main-menu/debian/patches/series
===================================================================
--- packages/unstable/gnome-main-menu/debian/patches/series	2006-12-12 16:44:25 UTC (rev 462)
+++ packages/unstable/gnome-main-menu/debian/patches/series	2006-12-12 20:32:41 UTC (rev 463)
@@ -1,6 +1,5 @@
 01_fix_menu_path.patch
 03_fix_upgrade_packages.patch
-04_link_statically.patch
 05_binary_locations
 06_fix_applet_conf_file.patch
 08_add_place_menu.patch




More information about the Pkg-galago-commit mailing list