r27448 - in /desktop/experimental/gnome-menus/debian: ./ patches/

joss at users.alioth.debian.org joss at users.alioth.debian.org
Sun Apr 10 23:22:07 UTC 2011


Author: joss
Date: Sun Apr 10 23:22:06 2011
New Revision: 27448

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=27448
Log:
* Break gnome-panel and gnome-control-center < 2.91 since 
  settings.menu is gone.
* 01_default_prefix.patch: new patch. Provide backwards compatibility 
  with previous versions by using "gnome-" as a default value for 
  XDG_MENU_PREFIX.
* Re-introduce the gir package.
* Use dpkg-maintscript-helper to cleanup conffiles.

Added:
    desktop/experimental/gnome-menus/debian/gir1.2-gmenu-2.0.install
      - copied unchanged from r27445, desktop/experimental/gnome-menus/debian/gir1.0-gmenu-2.0.install
    desktop/experimental/gnome-menus/debian/gnome-menus.postrm
    desktop/experimental/gnome-menus/debian/patches/01_default_prefix.patch
Removed:
    desktop/experimental/gnome-menus/debian/gir1.0-gmenu-2.0.install
    desktop/experimental/gnome-menus/debian/patches/06_menus_rename.patch
    desktop/experimental/gnome-menus/debian/patches/08_menus_prefix.patch
Modified:
    desktop/experimental/gnome-menus/debian/changelog
    desktop/experimental/gnome-menus/debian/control
    desktop/experimental/gnome-menus/debian/control.in
    desktop/experimental/gnome-menus/debian/gnome-menus.postinst
    desktop/experimental/gnome-menus/debian/gnome-menus.preinst
    desktop/experimental/gnome-menus/debian/libgnome-menu-dev.install
    desktop/experimental/gnome-menus/debian/patches/series

Modified: desktop/experimental/gnome-menus/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-menus/debian/changelog?rev=27448&op=diff
==============================================================================
--- desktop/experimental/gnome-menus/debian/changelog [utf-8] (original)
+++ desktop/experimental/gnome-menus/debian/changelog [utf-8] Sun Apr 10 23:22:06 2011
@@ -1,4 +1,4 @@
-gnome-menus (3.0.0-1) UNRELEASED; urgency=low
+gnome-menus (3.0.0-1) experimental; urgency=low
 
   [ Josselin Mouette ]
   * Add Sun Java VisualVM to the blacklist.
@@ -8,14 +8,21 @@
   * New upstream release (3.0.0).
   * Disable 06_menus_rename.patch and 08_menus_prefix.patch as they are
     replaced with the new XDG_MENU_PREFIX feature supported by upstream.
-  * TODO: depends on a gnome-session that sets correctly this variable
-    to "gnome-".
   * Do not try to install settings.menu, it's gone. 
   * Add some copyright notices to debian/copyright to please lintian.
   * Add Build-Depends on gobject-introspection (>= 0.9.5) to match
     configure requirements.
 
- -- Josselin Mouette <joss at debian.org>  Thu, 03 Mar 2011 15:30:35 +0100
+  [ Josselin Mouette ]
+  * Break gnome-panel and gnome-control-center < 2.91 since 
+    settings.menu is gone.
+  * 01_default_prefix.patch: new patch. Provide backwards compatibility 
+    with previous versions by using "gnome-" as a default value for 
+    XDG_MENU_PREFIX.
+  * Re-introduce the gir package.
+  * Use dpkg-maintscript-helper to cleanup conffiles.
+
+ -- Josselin Mouette <joss at debian.org>  Mon, 11 Apr 2011 01:04:12 +0200
 
 gnome-menus (2.30.3-2) unstable; urgency=low
 

Modified: desktop/experimental/gnome-menus/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-menus/debian/control?rev=27448&op=diff
==============================================================================
--- desktop/experimental/gnome-menus/debian/control [utf-8] (original)
+++ desktop/experimental/gnome-menus/debian/control [utf-8] Sun Apr 10 23:22:06 2011
@@ -16,7 +16,9 @@
                dpkg-dev (>= 1.13.19),
                python-support (>= 0.6),
                intltool (>= 0.40.0),
-               gobject-introspection (>= 0.9.5)
+               libgirepository1.0-dev (>= 0.9.5),
+               gobject-introspection (>= 0.9.12-4~),
+               gir1.2-glib-2.0
 Standards-Version: 3.8.3
 XS-Python-Version: >= 2.3
 
@@ -26,6 +28,8 @@
          ${misc:Depends},
          ${python:Depends},
          python-gmenu (= ${binary:Version})
+Breaks: gnome-panel (<< 2.91),
+        gnome-control-center (<< 2.91)
 Replaces: kdelibs-data (<< 4:3.3.2-1ubuntu1)
 XB-Python-Version: ${python:Versions}
 Description: GNOME implementation of the freedesktop menu specification
@@ -57,6 +61,7 @@
 Section: libdevel
 Depends: ${misc:Depends},
          libgnome-menu2 (= ${binary:Version}),
+         gir1.2-gmenu-2.0 (= ${binary:Version}),
          libglib2.0-dev (>= 2.15.2)
 Replaces: gir-repository-dev (<< 0.6.5-6)
 Description: GNOME implementation of the freedesktop menu specification
@@ -91,3 +96,16 @@
  files and assorted menu related utility programs.
  .
  This package contains the Python binding.
+
+Package: gir1.2-gmenu-2.0
+Section: libs
+Architecture: any
+Depends: ${gir:Depends},
+         ${shlibs:Depends},
+         ${misc:Depends}
+Conflicts: gobject-introspection-repository, gir1.0-gmenu-2.0
+Description: GObject introspection data for the GNOME menu library
+ This package contains introspection data for GNOME menu, an
+ implementation of the desktop menu specification from freedesktop.org.
+ It can be used by languages supporting dynamic bindings with 
+ the GIRepository format.

Modified: desktop/experimental/gnome-menus/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-menus/debian/control.in?rev=27448&op=diff
==============================================================================
--- desktop/experimental/gnome-menus/debian/control.in [utf-8] (original)
+++ desktop/experimental/gnome-menus/debian/control.in [utf-8] Sun Apr 10 23:22:06 2011
@@ -11,7 +11,9 @@
                dpkg-dev (>= 1.13.19),
                python-support (>= 0.6),
                intltool (>= 0.40.0),
-               gobject-introspection (>= 0.9.5)
+               libgirepository1.0-dev (>= 0.9.5),
+               gobject-introspection (>= 0.9.12-4~),
+               gir1.2-glib-2.0
 Standards-Version: 3.8.3
 XS-Python-Version: >= 2.3
 
@@ -21,6 +23,8 @@
          ${misc:Depends},
          ${python:Depends},
          python-gmenu (= ${binary:Version})
+Breaks: gnome-panel (<< 2.91),
+        gnome-control-center (<< 2.91)
 Replaces: kdelibs-data (<< 4:3.3.2-1ubuntu1)
 XB-Python-Version: ${python:Versions}
 Description: GNOME implementation of the freedesktop menu specification
@@ -52,6 +56,7 @@
 Section: libdevel
 Depends: ${misc:Depends},
          libgnome-menu2 (= ${binary:Version}),
+         gir1.2-gmenu-2.0 (= ${binary:Version}),
          libglib2.0-dev (>= 2.15.2)
 Replaces: gir-repository-dev (<< 0.6.5-6)
 Description: GNOME implementation of the freedesktop menu specification
@@ -86,3 +91,16 @@
  files and assorted menu related utility programs.
  .
  This package contains the Python binding.
+
+Package: gir1.2-gmenu-2.0
+Section: libs
+Architecture: any
+Depends: ${gir:Depends},
+         ${shlibs:Depends},
+         ${misc:Depends}
+Conflicts: gobject-introspection-repository, gir1.0-gmenu-2.0
+Description: GObject introspection data for the GNOME menu library
+ This package contains introspection data for GNOME menu, an
+ implementation of the desktop menu specification from freedesktop.org.
+ It can be used by languages supporting dynamic bindings with 
+ the GIRepository format.

Modified: desktop/experimental/gnome-menus/debian/gnome-menus.postinst
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-menus/debian/gnome-menus.postinst?rev=27448&op=diff
==============================================================================
--- desktop/experimental/gnome-menus/debian/gnome-menus.postinst [utf-8] (original)
+++ desktop/experimental/gnome-menus/debian/gnome-menus.postinst [utf-8] Sun Apr 10 23:22:06 2011
@@ -7,4 +7,10 @@
     exit 0
 fi
 
+# Remove no-longer used conffiles
+dpkg-maintscript-helper rm_conffile \
+	/etc/xdg/menus/gnome-preferences.menu 2.22.2-4 -- "$@"
+dpkg-maintscript-helper rm_conffile \
+	/etc/xdg/menus/gnome-settings.menu 2.30.3-2 -- "$@"
+
 #DEBHELPER#

Added: desktop/experimental/gnome-menus/debian/gnome-menus.postrm
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-menus/debian/gnome-menus.postrm?rev=27448&op=file
==============================================================================
--- desktop/experimental/gnome-menus/debian/gnome-menus.postrm (added)
+++ desktop/experimental/gnome-menus/debian/gnome-menus.postrm [utf-8] Sun Apr 10 23:22:06 2011
@@ -1,0 +1,10 @@
+#! /bin/sh
+set -e
+
+# Remove no-longer used conffiles
+dpkg-maintscript-helper rm_conffile \
+	/etc/xdg/menus/gnome-preferences.menu 2.22.2-4 -- "$@"
+dpkg-maintscript-helper rm_conffile \
+	/etc/xdg/menus/gnome-settings.menu 2.30.3-2 -- "$@"
+
+#DEBHELPER#

Modified: desktop/experimental/gnome-menus/debian/gnome-menus.preinst
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-menus/debian/gnome-menus.preinst?rev=27448&op=diff
==============================================================================
--- desktop/experimental/gnome-menus/debian/gnome-menus.preinst [utf-8] (original)
+++ desktop/experimental/gnome-menus/debian/gnome-menus.preinst [utf-8] Sun Apr 10 23:22:06 2011
@@ -1,29 +1,10 @@
 #! /bin/sh
 set -e
 
-# Remove a no-longer used conffile
-rm_conffile() {
-    PKGNAME="$1"
-    CONFFILE="$2"
-    if [ -e "$CONFFILE" ]; then
-        md5sum="`md5sum \"$CONFFILE\" | sed -e \"s/ .*//\"`"
-        old_md5sum="`dpkg-query -W -f='${Conffiles}' $PKGNAME | sed -n -e \"\\\\' $CONFFILE '{s/ obsolete$//;s/.* //p}\"`"
-        if [ "$md5sum" != "$old_md5sum" ]; then
-            echo "Obsolete conffile $CONFFILE has been modified by you."
-            echo "Saving as $CONFFILE.dpkg-bak ..."
-            mv -f "$CONFFILE" "$CONFFILE".dpkg-bak
-        else
-            echo "Removing obsolete conffile $CONFFILE ..."
-            rm -f "$CONFFILE"
-        fi
-    fi
-}
-
-case "$1" in
-install|upgrade)
-    if dpkg --compare-versions "$2" le "2.22.2-4"; then
-        rm_conffile gnome-menus "/etc/xdg/menus/gnome-preferences.menu"
-    fi
-esac
+# Remove no-longer used conffiles
+dpkg-maintscript-helper rm_conffile \
+	/etc/xdg/menus/gnome-preferences.menu 2.22.2-4 -- "$@"
+dpkg-maintscript-helper rm_conffile \
+	/etc/xdg/menus/gnome-settings.menu 2.30.3-2 -- "$@"
 
 #DEBHELPER#

Modified: desktop/experimental/gnome-menus/debian/libgnome-menu-dev.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-menus/debian/libgnome-menu-dev.install?rev=27448&op=diff
==============================================================================
--- desktop/experimental/gnome-menus/debian/libgnome-menu-dev.install [utf-8] (original)
+++ desktop/experimental/gnome-menus/debian/libgnome-menu-dev.install [utf-8] Sun Apr 10 23:22:06 2011
@@ -2,3 +2,4 @@
 debian/tmp/usr/lib/*.so
 debian/tmp/usr/include
 debian/tmp/usr/lib/pkgconfig
+debian/tmp/usr/share/gir-1.0

Added: desktop/experimental/gnome-menus/debian/patches/01_default_prefix.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-menus/debian/patches/01_default_prefix.patch?rev=27448&op=file
==============================================================================
--- desktop/experimental/gnome-menus/debian/patches/01_default_prefix.patch (added)
+++ desktop/experimental/gnome-menus/debian/patches/01_default_prefix.patch [utf-8] Sun Apr 10 23:22:06 2011
@@ -1,0 +1,72 @@
+Index: gnome-menus-3.0.0/libmenu/gmenu-tree.c
+===================================================================
+--- gnome-menus-3.0.0.orig/libmenu/gmenu-tree.c	2011-04-11 00:35:40.828974496 +0200
++++ gnome-menus-3.0.0/libmenu/gmenu-tree.c	2011-04-11 00:45:53.891971611 +0200
+@@ -528,6 +528,16 @@ canonicalize_basename (GMenuTree  *tree,
+     }
+ }
+ 
++static char *
++prefix_menu_name (const char *orig_name)
++{
++  char *prefix;
++  prefix = g_getenv ("XDG_MENU_PREFIX");
++  if (prefix == NULL)
++    prefix = "gnome-";
++  return g_strconcat (prefix, orig_name, NULL);
++}
++
+ static gboolean
+ gmenu_tree_canonicalize_path (GMenuTree *tree)
+ {
+@@ -540,13 +550,10 @@ gmenu_tree_canonicalize_path (GMenuTree
+     {
+       gmenu_tree_remove_menu_file_monitors (tree);
+ 
+-      if (strcmp (tree->basename, "applications.menu") == 0 &&
+-          g_getenv ("XDG_MENU_PREFIX"))
++      if (strcmp (tree->basename, "applications.menu") == 0)
+         {
+           char *prefixed_basename;
+-          prefixed_basename = g_strdup_printf ("%s%s",
+-                                               g_getenv ("XDG_MENU_PREFIX"),
+-                                               tree->basename);
++          prefixed_basename = prefix_menu_name (tree->basename);
+           canonicalize_basename (tree, prefixed_basename);
+           g_free (prefixed_basename);
+         }
+@@ -1923,13 +1930,10 @@ load_parent_merge_file (GMenuTree      *
+   found = FALSE;
+   menu_file = g_strconcat (menu_name, ".menu", NULL);
+ 
+-  if (strcmp (menu_file, "applications.menu") == 0 &&
+-      g_getenv ("XDG_MENU_PREFIX"))
++  if (strcmp (menu_file, "applications.menu") == 0)
+     {
+       char *prefixed_basename;
+-      prefixed_basename = g_strdup_printf ("%s%s",
+-                                           g_getenv ("XDG_MENU_PREFIX"),
+-                                           menu_file);
++      prefixed_basename = prefix_menu_name (menu_file);
+       found = load_parent_merge_file_from_basename (tree, loaded_menu_files,
+                                                     layout, prefixed_basename,
+                                                     canonical_basedir);
+Index: gnome-menus-3.0.0/simple-editor/GMenuSimpleEditor/menutreemodel.py
+===================================================================
+--- gnome-menus-3.0.0.orig/simple-editor/GMenuSimpleEditor/menutreemodel.py	2011-04-11 00:46:32.236159071 +0200
++++ gnome-menus-3.0.0/simple-editor/GMenuSimpleEditor/menutreemodel.py	2011-04-11 00:50:14.801247125 +0200
+@@ -105,11 +105,11 @@ class MenuTreeModel (Gtk.TreeStore):
+         self.icon_theme = Gtk.IconTheme.get_default ()
+ 
+         if (len (menu_files) < 1):
+-            menu_files = ["applications.menu", "settings.menu"]
++            menu_files = ["applications.menu"]
+ 
+         for menu_file in menu_files:
+-            if menu_file == "applications.menu" and os.environ.has_key ("XDG_MENU_PREFIX"):
+-                menu_file = os.environ["XDG_MENU_PREFIX"] + menu_file
++            if menu_file == "applications.menu":
++                menu_file = os.environ.get("XDG_MENU_PREFIX", "gnome-") + menu_file
+ 
+             tree = gmenu.lookup_tree (menu_file, gmenu.FLAGS_INCLUDE_EXCLUDED)
+             tree.sort_key = gmenu.SORT_DISPLAY_NAME

Modified: desktop/experimental/gnome-menus/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-menus/debian/patches/series?rev=27448&op=diff
==============================================================================
--- desktop/experimental/gnome-menus/debian/patches/series [utf-8] (original)
+++ desktop/experimental/gnome-menus/debian/patches/series [utf-8] Sun Apr 10 23:22:06 2011
@@ -1,7 +1,6 @@
+01_default_prefix.patch
 03_kde-legacydirs.patch
 05_debian_menu.patch
-#06_menus_rename.patch
-#08_menus_prefix.patch
 09_games-menu.patch
 10_use-default-python-path.patch
 #20_show-admin-tools-for-admin-group.patch




More information about the pkg-gnome-commits mailing list