r10869 - in /desktop/unstable/gnome-panel/debian: changelog control patches/01_panel_submenus.patch

[slomo at users.alioth.debian.org]

Author: slomo
Date: Tue May  8 11:08:39 2007
New Revision: 10869

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=10869
Log:
* 01_panel_submenus.patch: Use correct menu file filenames to allow adding
  submenus as menu to the panel (Closes: #422827). Thanks to Andreas Degert
  for the patch.

Added:
    desktop/unstable/gnome-panel/debian/patches/01_panel_submenus.patch
Modified:
    desktop/unstable/gnome-panel/debian/changelog
    desktop/unstable/gnome-panel/debian/control

Modified: desktop/unstable/gnome-panel/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-panel/debian/changelog?rev=10869&op=diff
==============================================================================
--- desktop/unstable/gnome-panel/debian/changelog (original)
+++ desktop/unstable/gnome-panel/debian/changelog Tue May  8 11:08:39 2007
@@ -10,7 +10,12 @@
   * Downgrade the gnome-icon-theme dependency to a Recommends; other icon
     themes work fine with gnome-panel 2.18.
 
- -- Loic Minier <lool at dooz.org>  Thu, 26 Apr 2007 08:48:25 +0200
+  [ Sebastian Dröge ]
+  * 01_panel_submenus.patch: Use correct menu file filenames to allow adding
+    submenus as menu to the panel (Closes: #422827). Thanks to Andreas Degert
+    for the patch.
+
+ -- Sebastian Dröge <slomo at debian.org>  Tue,  8 May 2007 13:07:04 +0200
 
 gnome-panel (2.18.1-1) unstable; urgency=low
 

Modified: desktop/unstable/gnome-panel/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-panel/debian/control?rev=10869&op=diff
==============================================================================
--- desktop/unstable/gnome-panel/debian/control (original)
+++ desktop/unstable/gnome-panel/debian/control Tue May  8 11:08:39 2007
@@ -2,7 +2,7 @@
 Section: gnome
 Priority: optional
 Maintainer: Guilherme de S. Pastore <gpastore at debian.org>
-Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Josselin Mouette <joss at debian.org>, Loic Minier <lool at dooz.org>
+Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Josselin Mouette <joss at debian.org>, Loic Minier <lool at dooz.org>, Sebastian Dröge <slomo at debian.org>
 Standards-Version: 3.7.2
 Build-Depends: cdbs (>= 0.4.41),
                debhelper (>= 5),

Added: desktop/unstable/gnome-panel/debian/patches/01_panel_submenus.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-panel/debian/patches/01_panel_submenus.patch?rev=10869&op=file
==============================================================================
--- desktop/unstable/gnome-panel/debian/patches/01_panel_submenus.patch (added)
+++ desktop/unstable/gnome-panel/debian/patches/01_panel_submenus.patch Tue May  8 11:08:39 2007
@@ -1,0 +1,11 @@
+--- gnome-panel-2.18.1/gnome-panel/panel-menu-button.c  Tue Apr 10 21:16:55 2007
++++ gnome-panel-2.18.1.changed/gnome-panel/panel-menu-button.c  Tue May  8 10:38:30 2007
+@@ -69,8 +69,8 @@
+ } MenuPathRootItem;
+ 
+ static MenuPathRootItem root_items [] = {
+-       { APPLICATIONS_MENU, "applications", "applications.menu" },
+-       { SETTINGS_MENU,     "settings",     "settings.menu"     }
++       { APPLICATIONS_MENU, "applications", "gnome-applications.menu" },
++       { SETTINGS_MENU,     "settings",     "gnome-settings.menu"     }
+ };