diff -Nru gnome-menus-3.8.0/debian/changelog gnome-menus-3.8.0/debian/changelog --- gnome-menus-3.8.0/debian/changelog 2013-04-02 03:23:04.000000000 +0000 +++ gnome-menus-3.8.0/debian/changelog 2013-06-09 05:03:15.000000000 +0000 @@ -1,125 +1,108 @@ -gnome-menus (3.8.0-0ubuntu1~raring1) raring; urgency=low +gnome-menus (3.8.0-1ubuntu1~raring1) raring; urgency=medium - * New upstream release. - * debian/patches/git_restore_calculator.patch: - - Don't hide Calculator from the menus + * Copied from saucy - -- Jeremy Bicha Mon, 01 Apr 2013 22:59:22 -0400 + -- Rico Tzschichholz Sun, 09 Jun 2013 07:03:15 +0200 -gnome-menus (3.7.90-0ubuntu1~raring3) raring; urgency=medium +gnome-menus (3.8.0-1ubuntu1) saucy; urgency=low - * New upstream release. + * Merge with Debian, remaining changes: + - debian/gnome-menus.postinst: + + Disable blacklist to not break old applications + - debian/gnome-menus.triggers: Drop "gmenucache". + - debian/patches/series: Disable 01_default_prefix.patch + - debian/patches/09_app_install_entry.patch: + + Include Software Center in menus + - debian/patches/70_ubuntu-directories.patch + + Add Ubuntu-specific directories back to POTFILES.in + * Dropped changes: + - debian/patches/22_directory-suffix-for-icons.patch + - debian/gnome-menus.maintscript: + + ensure conffile is removed on upgrade (not needed after 12.04 LTS) * Refreshed patches - * Rewrote 50_add-gcc-apps.patch to unhide Settings panels - since we're sticking with Settings 3.6 in the GNOME3 PPA for now. - Settings 3.8 includes a GNOME Shell 3.8 search provider. - Also, this patch unhides Ubuntu settings panels like - Dejua Dup and language-selector. - * Dropped obsolete patches: - - 10_use-default-python-path.patch - - 21_default-python-in-shebang.patch - - 22_directory-suffix-for-icons.patch - - -- Jeremy Bicha Sun, 03 Mar 2013 01:26:49 -0500 - -gnome-menus (3.6.2-0ubuntu2~raring1) raring; urgency=medium - - * debian/patches: - - 50_add-gcc-apps.patch: Put control center apps in the applications - menu to make them available in gnome-shell - - -- Rico Tzschichholz Fri, 01 Mar 2013 22:18:24 +0100 - -gnome-menus (3.6.2-0ubuntu1) raring; urgency=low - - * New upstream release - * debian/control: - - Use standards version 3.9.4 - - -- Robert Ancell Tue, 15 Jan 2013 17:04:41 -0800 - -gnome-menus (3.6.1-0ubuntu2) raring; urgency=low - - * Port gnome-menus-blacklist to python3. - - -- Dmitrijs Ledkovs Mon, 03 Dec 2012 00:26:02 +0000 - -gnome-menus (3.6.1-0ubuntu1) raring; urgency=low - - * New upstream release - - -- Robert Ancell Thu, 15 Nov 2012 10:39:37 +1300 - -gnome-menus (3.6.0-0ubuntu1) quantal; urgency=low + * debian/patches/50_add-gcc-apps.patch + - Unhide Settings panels in GNOME Shell since we're sticking with Settings + 3.6 for now. Settings 3.8 includes a GNOME Shell 3.8 search provider. + * debian/patches/git_restore_calculator.patch: + - Git patch to not hide Calculator from the menus - * New upstream stable release + -- Jeremy Bicha Sat, 08 Jun 2013 16:16:43 -0400 - -- Robert Ancell Wed, 26 Sep 2012 10:56:57 +1200 +gnome-menus (3.8.0-1) unstable; urgency=low -gnome-menus (3.5.92-0ubuntu1) quantal; urgency=low + [ Josselin Mouette ] + * Switch to interest-noawait for triggers. - * New upstream version + [ Andreas Henriksson ] + * New upstream release. + * Upload to unstable. - -- Didier Roche Mon, 17 Sep 2012 13:19:49 +0200 + -- Andreas Henriksson Sat, 25 May 2013 16:41:40 +0200 -gnome-menus (3.5.5-0ubuntu1) quantal; urgency=low +gnome-menus (3.7.90-1) experimental; urgency=low - * New upstream version + [ Josselin Mouette ] + * Team upload + * New upstream release. + * gnome-menus-blacklist: patch from Fabian Greffrath to handle + correctly menu files with missing ending newlines. Closes: #692141. + * Drop Debian menu support entirely. In the case it gets enabled by + mistake by users, it breaks the shell beyond all repair. + Closes: #694356. + * 02_kill_debian_menu.patch: new patch. Completely remove Debian menu + entries by discarding them at the parsing stage. This should work + around bug #696530 in menu-xdg. + * gnome-menus.postinst: clean up the desktop files once upon upgrades, + in order to get rid of files generated by a buggy script. - -- Sebastien Bacher Tue, 07 Aug 2012 18:52:01 +0200 + [ Dmitrijs Ledkovs ] + * Port gnome-menus-blacklist to python3. -gnome-menus (3.5.4-0ubuntu1) quantal; urgency=low + [ Sjoerd Simons ] + * New upstream release (3.7.90) + * debian/patches/10_use-default-python-path.patch, + debian/patches/21_default-python-in-shebang.patch: + + Dropped, simple-editor is no longer part of gnome-menus + * debian/patches/*: refreshed - * New upstream release - * debian/libgnome-menu-3-0.symbols: - - Updated + -- Sjoerd Simons Sat, 23 Mar 2013 20:51:31 +0100 - -- Robert Ancell Tue, 17 Jul 2012 14:02:01 +1200 +gnome-menus (3.6.0-2) experimental; urgency=low -gnome-menus (3.5.3-0ubuntu1) quantal-proposed; urgency=low + * Team upload + * Move to debhelper compat level 9, for compressed debug symbols + * Add libgnome-menus-3-0-dbg - * New upstream release - * debian/patches/forgotten-gmenu-separator-api: - - Applied upstream + -- Simon McVittie Thu, 25 Oct 2012 13:00:52 +0100 - -- Robert Ancell Wed, 27 Jun 2012 17:25:12 +1200 +gnome-menus (3.6.0-1) experimental; urgency=low -gnome-menus (3.5.2-0ubuntu2) quantal; urgency=low + [ Josselin Mouette ] + * Update blacklist for OpenJDK and Icedtea control panels. + Closes: #679565. - * Take patch from upstream bug #677344 to add a forgotten API - gmenu_tree_iter_get_separator. Unbreaks alacarte. (LP: #1010800) + [ Sjoerd Simons ] + * New upstream release (3.6.0) - -- Iain Lane Mon, 11 Jun 2012 16:17:52 +0100 + -- Sjoerd Simons Sun, 14 Oct 2012 18:42:49 +0200 -gnome-menus (3.5.2-0ubuntu1) quantal-proposed; urgency=low +gnome-menus (3.4.2-3) unstable; urgency=low - * New upstream release - * debian/libgnome-menu-3-0.symbols: - - Updated + * 61_nodisplay_recurse.patch: backported from upstream git. Add a + function to check for NoDisplay=true recursively. This is needed for + gnome-shell. + * Update symbols file accordingly. - -- Robert Ancell Wed, 06 Jun 2012 14:18:54 +1200 + -- Josselin Mouette Sat, 23 Jun 2012 20:28:18 +0200 -gnome-menus (3.4.2-1ubuntu1) quantal; urgency=low +gnome-menus (3.4.2-2) unstable; urgency=low - [ Iain Lane ] - * Merge with Debian, remaining changes: - - debian/gnome-menus.postinst: - + Disable blacklist to not break old applications - - debian/rules, debian/gnome-menus.maintscript: - + Remove rule renaming applications.menu to gnome-applications.menu and - ensure conffile is removed on upgrade - - debian/gnome-menus.triggers: Drop "gmenucache". - - debian/patches/09_app_install_entry.patch: - + Include Software Center in menus - - debian/patches/22_desktop-cache.patch: - + Support a desktop..cache file in e. g. - /usr/share/applications/ to speed up menu loading. Those - are generated with update-gnome-menus-cache . - - debian/patches/70_ubuntu-directories.patch - + Add Ubuntu-specific directories back to POTFILES.in - - debian/patches/series: Disable 01_default_prefix.patch + * Blacklist imagemagick. Closes: #678406. + * 60_missing_function.patch: backported from upstream git. Add a + missing function in the library. Closes: #676566. + * Update symbols file. - -- Robert Ancell Tue, 22 May 2012 12:20:01 +1200 + -- Josselin Mouette Sat, 23 Jun 2012 19:02:38 +0200 gnome-menus (3.4.2-1) unstable; urgency=low @@ -146,61 +129,6 @@ -- Michael Biebl Sat, 19 May 2012 08:11:53 +0200 -gnome-menus (3.4.0-0ubuntu1) precise-proposed; urgency=low - - * New upstream release - - -- Robert Ancell Wed, 28 Mar 2012 11:27:10 +1100 - -gnome-menus (3.3.5-0ubuntu2) precise; urgency=low - - * debian/patches/70_ubuntu-directories.patch - - Add Ubuntu-specific directories back to POTFILES.in, thanks - (Gabor Kelemen) (LP: #943387) - - -- Ken VanDine Wed, 29 Feb 2012 16:32:50 -0500 - -gnome-menus (3.3.5-0ubuntu1) precise; urgency=low - - * New upstream release. - * Unfuzz patches. - - -- Martin Pitt Wed, 22 Feb 2012 09:07:37 +0100 - -gnome-menus (3.2.0.1-2ubuntu3) precise; urgency=low - - * debian/patches/22_directory-suffix-for-icons.patch: append "-directory" - suffix to icon names for categories which appear in gnome-control-center - - -- Aurélien Gâteau Mon, 06 Feb 2012 15:35:07 +0100 - -gnome-menus (3.2.0.1-2ubuntu2) precise; urgency=low - - * debian/gnome-menus.maintscript: - - clean gnome-applications.menu on upgrade, it was installed by error - - updated transition version for settings.menu there - * debian/rules: don't rename the .menus with a prefix "gnome-" like in - Debian, we use the upstream names - - -- Sebastien Bacher Mon, 09 Jan 2012 15:49:25 +0100 - -gnome-menus (3.2.0.1-2ubuntu1) precise; urgency=low - - [ Michael Terry ] - * Merge from Debian testing, remaining changes: - - debian/patches/09_app_install_entry.patch: Add Software Center - - debian/patches/series: Disable 01_default_prefix.patch - - debian/gnome-menus.postinst: Disable blacklist - - debian/watch: Look for unstable tarballs - - [ Martin Pitt ] - * Remove remaining menu cache stuff, as it is not being used any more: - - Drop debian/update-gnome-menus-cache. (LP: #769349, #771196) - - debian/gnome-menus.triggers: Drop "gmenucache". - - Drop 22_desktop-cache.patch (already wasn't applied any more in series) - - -- Michael Terry Fri, 23 Dec 2011 15:25:07 -0500 - gnome-menus (3.2.0.1-2) unstable; urgency=low [ Jordi Mallach ] @@ -233,53 +161,6 @@ -- Sjoerd Simons Fri, 21 Oct 2011 22:26:35 +0200 -gnome-menus (3.2.0-0ubuntu2) oneiric; urgency=low - - * debian/gnome-menus.postinst: Drop old menu cache on upgrade, to avoid - using old data in applications which use the cache. (LP: #868219) - - -- Martin Pitt Wed, 05 Oct 2011 12:03:56 +0200 - -gnome-menus (3.2.0-0ubuntu1) oneiric; urgency=low - - * New upstream release: - - Updated translations - - -- Didier Roche Mon, 26 Sep 2011 15:37:45 +0200 - -gnome-menus (3.1.92-0ubuntu1) oneiric; urgency=low - - * New upstream release: - - Fix build failure with --enable-debug - - Translation updates. - - -- Martin Pitt Mon, 19 Sep 2011 21:05:14 +0200 - -gnome-menus (3.1.90-0ubuntu1) oneiric; urgency=low - - * New upstream release. - - -- Martin Pitt Tue, 06 Sep 2011 11:00:38 +0200 - -gnome-menus (3.1.5-0ubuntu1) oneiric; urgency=low - - * New upstream release. - * debian/watch: Watch for unstable versions, and switch to bz2. - * Disable 22_desktop-cache.patch for now, needs to be rewritten, and not - that important with Unity any more. - * Drop 23_add_inherited_gnome_session.patch; obsolete, and does not apply - any more. - * Drop 24_xdg_current_desktop.patch, applied upstream. - * Drop python-gmenu{,-dbg}, dropped upstream in favor of the GI bindings. - * debian/control.in: Bump libglib2.0-dev build dep to >= 2.29.15 according - to upstream configure.ac. - * libgnome-menu2 → libgnome-menu-3-0 SONAME transition. - * Rename gir1.2-gmenu-2.0 to gir1.2-gmenu-3.0 as per upstream change. - * debian/gnome-menus.install: Drop gmenu-simple-editor stuff. If we need it, - it needs to go into a separate package with proper python packaging. - - -- Martin Pitt Tue, 16 Aug 2011 15:50:47 +0200 - gnome-menus (3.0.1-3) unstable; urgency=low [ Josselin Mouette ] @@ -328,78 +209,6 @@ -- Josselin Mouette Sat, 04 Jun 2011 22:13:14 +0200 -gnome-menus (3.0.1-0ubuntu5) oneiric; urgency=low - - * debian/rules: - - Remove rule renaming applications.menu to gnome-applications.menu - (LP: #798951) - - -- Rodrigo Moya Tue, 26 Jul 2011 18:41:11 +0200 - -gnome-menus (3.0.1-0ubuntu4) oneiric; urgency=low - - * debian/patches/24_xdg_current_desktop.patch: - - Support XDG_CURRENT_DESKTOP when parsing OnlyShowIn and NotShowIn - keys. LP: #803519 - - -- Michael Terry Wed, 20 Jul 2011 13:48:25 -0400 - -gnome-menus (3.0.1-0ubuntu3) oneiric; urgency=low - - * Switch to dh_python2. (LP: #788514) - - -- Barry Warsaw Wed, 29 Jun 2011 16:45:32 +0100 - -gnome-menus (3.0.1-0ubuntu2) oneiric; urgency=low - - * debian/rules: Put back installation of update-gnome-menus-cache, which was - accidentally dropped in the previous uploads. (LP: #791837) - - -- Martin Pitt Mon, 06 Jun 2011 09:06:41 +0200 - -gnome-menus (3.0.1-0ubuntu1) oneiric; urgency=low - - * New upstream version - - -- Rodrigo Moya Wed, 01 Jun 2011 11:41:06 +0200 - -gnome-menus (3.0.0-0ubuntu1) oneiric; urgency=low - - [ Josselin Mouette ] - * Break alacarte < 0.13.2-2 (version without support for - settings.menu). - - [ Rodrigo Moya ] - * Rebase on Debian, remaining Ubuntu changes: - * debian/control: - - Use Standards-Version: 3.8.4 - - Depends: python-xdg for update-gnome-menus-cache - - Add python-gmenu-dbg package - * debian/gnome-menus.triggers: - - Add gmenucache trigger - * debian/gnome-menus.postinst: - - Disable blacklist to not break old applications - * debian/update-gnome-menus-cache: - - Script to update the menu cache - * debian/python-gmenu.postinst: - - Add code to generate the menu cache - * debian/patches/06_menus_rename.patch: - - Rename applications.menu to gnome-applications.menu - * debian/patches/09_app_install_entry.patch: - - Include Software Center in menus - * debian/patches/22_desktop-cache.patch: - - Support a desktop..cache file in e. g. - /usr/share/applications/ to speed up menu loading. Those - are generated with update-gnome-menus-cache . - * debian/patches/23_add_inherited_gnome_session.patch: - - Add inherited GNOME session - * debian/patches/*: - - Add missing descriptions to Ubuntu-specific patches - * debian/patches/series: - - Disable 01_default_prefix.patch, which is Debian specific - - -- Rodrigo Moya Mon, 16 May 2011 12:24:57 +0200 - gnome-menus (3.0.0-1) experimental; urgency=low [ Josselin Mouette ] diff -Nru gnome-menus-3.8.0/debian/compat gnome-menus-3.8.0/debian/compat --- gnome-menus-3.8.0/debian/compat 2013-04-02 03:23:04.000000000 +0000 +++ gnome-menus-3.8.0/debian/compat 2013-06-08 20:17:05.000000000 +0000 @@ -1 +1 @@ -8 +9 diff -Nru gnome-menus-3.8.0/debian/control gnome-menus-3.8.0/debian/control --- gnome-menus-3.8.0/debian/control 2013-04-02 03:23:07.000000000 +0000 +++ gnome-menus-3.8.0/debian/control 2013-06-09 05:03:26.000000000 +0000 @@ -5,10 +5,10 @@ Source: gnome-menus Section: gnome Priority: optional -Maintainer: Ubuntu Desktop Team +Maintainer: Ubuntu Developers XSBC-Original-Maintainer: Debian GNOME Maintainers -Uploaders: Debian GNOME Maintainers , Jeremy Bicha -Build-Depends: debhelper (>= 8.1.0~), +Uploaders: Andreas Henriksson , Debian GNOME Maintainers , Jeremy Bicha , Josselin Mouette , Michael Biebl , Sjoerd Simons +Build-Depends: debhelper (>= 9), cdbs (>= 0.4.73), libglib2.0-dev (>= 2.30.0), gnome-pkg-tools, @@ -16,7 +16,7 @@ intltool (>= 0.40.0), libgirepository1.0-dev (>= 0.10.7-1~), gobject-introspection (>= 0.9.12-4~) -Standards-Version: 3.9.4 +Standards-Version: 3.9.3 X-Python3-Version: >= 3.1 Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/gnome-menus/ubuntu @@ -53,6 +53,23 @@ . This package contains the shared library. +Package: libgnome-menu-3-0-dbg +Section: debug +Priority: extra +Architecture: any +Depends: libgnome-menu-3-0 (= ${binary:Version}), + ${misc:Depends} +Description: GNOME implementation of the freedesktop menu specification + The package contains an implementation of the draft + "Desktop Menu Specification" from freedesktop.org: + . + http://www.freedesktop.org/Standards/menu-spec + . + Also contained here are the GNOME menu layout configuration files, .directory + files and assorted menu related utility programs. + . + This package contains debugging symbols. + Package: libgnome-menu-3-dev Architecture: any Section: libdevel diff -Nru gnome-menus-3.8.0/debian/control.in gnome-menus-3.8.0/debian/control.in --- gnome-menus-3.8.0/debian/control.in 2013-04-02 03:23:04.000000000 +0000 +++ gnome-menus-3.8.0/debian/control.in 2013-06-08 20:17:05.000000000 +0000 @@ -1,10 +1,10 @@ Source: gnome-menus Section: gnome Priority: optional -Maintainer: Ubuntu Desktop Team +Maintainer: Ubuntu Developers XSBC-Original-Maintainer: Debian GNOME Maintainers Uploaders: @GNOME_TEAM@ -Build-Depends: debhelper (>= 8.1.0~), +Build-Depends: debhelper (>= 9), cdbs (>= 0.4.73), libglib2.0-dev (>= 2.30.0), gnome-pkg-tools, @@ -12,7 +12,7 @@ intltool (>= 0.40.0), libgirepository1.0-dev (>= 0.10.7-1~), gobject-introspection (>= 0.9.12-4~) -Standards-Version: 3.9.4 +Standards-Version: 3.9.3 X-Python3-Version: >= 3.1 Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/gnome-menus/ubuntu @@ -49,6 +49,23 @@ . This package contains the shared library. +Package: libgnome-menu-3-0-dbg +Section: debug +Priority: extra +Architecture: any +Depends: libgnome-menu-3-0 (= ${binary:Version}), + ${misc:Depends} +Description: GNOME implementation of the freedesktop menu specification + The package contains an implementation of the draft + "Desktop Menu Specification" from freedesktop.org: + . + http://www.freedesktop.org/Standards/menu-spec + . + Also contained here are the GNOME menu layout configuration files, .directory + files and assorted menu related utility programs. + . + This package contains debugging symbols. + Package: libgnome-menu-3-dev Architecture: any Section: libdevel diff -Nru gnome-menus-3.8.0/debian/gnome-menus.maintscript gnome-menus-3.8.0/debian/gnome-menus.maintscript --- gnome-menus-3.8.0/debian/gnome-menus.maintscript 2013-04-02 03:23:04.000000000 +0000 +++ gnome-menus-3.8.0/debian/gnome-menus.maintscript 2013-06-08 20:17:05.000000000 +0000 @@ -1,3 +1,2 @@ rm_conffile /etc/xdg/menus/gnome-preferences.menu 2.24.2-1~ gnome-menus rm_conffile /etc/xdg/menus/gnome-settings.menu 3.0.1-3~ gnome-menus -rm_conffile /etc/xdg/menus/gnome-applications.menu 3.2.0.1-2ubuntu2~ gnome-menus diff -Nru gnome-menus-3.8.0/debian/gnome-menus.postinst gnome-menus-3.8.0/debian/gnome-menus.postinst --- gnome-menus-3.8.0/debian/gnome-menus.postinst 2013-04-02 03:23:04.000000000 +0000 +++ gnome-menus-3.8.0/debian/gnome-menus.postinst 2013-06-08 20:17:05.000000000 +0000 @@ -1,6 +1,12 @@ #! /bin/sh set -e +#if [ "$1" = configure ] && dpkg --compare-versions "$2" lt-nl 3.6.1-1; then +# # Clean up old files generated by buggy script +# # See #692141 +# rm -f /usr/share/gnome/applications/*.desktop +#fi +# #gnome-menus-blacklist if [ "$1" = triggered ]; then diff -Nru gnome-menus-3.8.0/debian/gnome-menus.triggers gnome-menus-3.8.0/debian/gnome-menus.triggers --- gnome-menus-3.8.0/debian/gnome-menus.triggers 2013-04-02 03:23:04.000000000 +0000 +++ gnome-menus-3.8.0/debian/gnome-menus.triggers 2013-06-08 20:17:05.000000000 +0000 @@ -1 +1,2 @@ -interest /usr/share/applications +interest-noawait /usr/share/applications +#interest-noawait gmenucache diff -Nru gnome-menus-3.8.0/debian/libgnome-menu-3-0.symbols gnome-menus-3.8.0/debian/libgnome-menu-3-0.symbols --- gnome-menus-3.8.0/debian/libgnome-menu-3-0.symbols 2013-04-02 03:23:04.000000000 +0000 +++ gnome-menus-3.8.0/debian/libgnome-menu-3-0.symbols 2013-06-08 20:17:05.000000000 +0000 @@ -3,8 +3,8 @@ gmenu_tree_alias_get_aliased_entry@Base 3.2.0.1 gmenu_tree_alias_get_aliased_item_type@Base 3.2.0.1 gmenu_tree_alias_get_directory@Base 3.2.0.1 - gmenu_tree_alias_get_parent@Base 3.5.4 - gmenu_tree_alias_get_tree@Base 3.5.4 + gmenu_tree_alias_get_parent@Base 3.6.0 + gmenu_tree_alias_get_tree@Base 3.6.0 gmenu_tree_alias_get_type@Base 3.2.0.1 gmenu_tree_directory_get_comment@Base 3.2.0.1 gmenu_tree_directory_get_desktop_file_path@Base 3.2.0.1 @@ -14,7 +14,7 @@ gmenu_tree_directory_get_menu_id@Base 3.2.0.1 gmenu_tree_directory_get_name@Base 3.2.0.1 gmenu_tree_directory_get_parent@Base 3.2.0.1 - gmenu_tree_directory_get_tree@Base 3.5.4 + gmenu_tree_directory_get_tree@Base 3.6.0 gmenu_tree_directory_get_type@Base 3.2.0.1 gmenu_tree_directory_iter@Base 3.2.0.1 gmenu_tree_directory_make_path@Base 3.2.0.1 @@ -22,10 +22,10 @@ gmenu_tree_entry_get_desktop_file_id@Base 3.2.0.1 gmenu_tree_entry_get_desktop_file_path@Base 3.2.0.1 gmenu_tree_entry_get_is_excluded@Base 3.2.0.1 - gmenu_tree_entry_get_is_nodisplay_recurse@Base 3.5.4 - gmenu_tree_entry_get_is_unallocated@Base 3.5.2 + gmenu_tree_entry_get_is_nodisplay_recurse@Base 3.4.2-3~ + gmenu_tree_entry_get_is_unallocated@Base 3.6.0 gmenu_tree_entry_get_parent@Base 3.2.0.1 - gmenu_tree_entry_get_tree@Base 3.5.4 + gmenu_tree_entry_get_tree@Base 3.6.0 gmenu_tree_entry_get_type@Base 3.2.0.1 gmenu_tree_flags_get_type@Base 3.2.0.1 gmenu_tree_get_canonical_menu_path@Base 3.2.0.1 @@ -34,8 +34,8 @@ gmenu_tree_get_root_directory@Base 3.2.0.1 gmenu_tree_get_type@Base 3.2.0.1 gmenu_tree_header_get_directory@Base 3.2.0.1 - gmenu_tree_header_get_parent@Base 3.5.4 - gmenu_tree_header_get_tree@Base 3.5.4 + gmenu_tree_header_get_parent@Base 3.6.0 + gmenu_tree_header_get_tree@Base 3.6.0 gmenu_tree_header_get_type@Base 3.2.0.1 gmenu_tree_item_ref@Base 3.2.0.1 gmenu_tree_item_unref@Base 3.2.0.1 @@ -43,7 +43,7 @@ gmenu_tree_iter_get_directory@Base 3.2.0.1 gmenu_tree_iter_get_entry@Base 3.2.0.1 gmenu_tree_iter_get_header@Base 3.2.0.1 - gmenu_tree_iter_get_separator@Base 3.5.2-0ubuntu2~ + gmenu_tree_iter_get_separator@Base 3.4.2-2~ gmenu_tree_iter_get_type@Base 3.2.0.1 gmenu_tree_iter_next@Base 3.2.0.1 gmenu_tree_iter_ref@Base 3.2.0.1 @@ -51,6 +51,6 @@ gmenu_tree_load_sync@Base 3.2.0.1 gmenu_tree_new@Base 3.2.0.1 gmenu_tree_new_for_path@Base 3.2.0.1 - gmenu_tree_separator_get_parent@Base 3.5.4 - gmenu_tree_separator_get_tree@Base 3.5.4 + gmenu_tree_separator_get_parent@Base 3.6.0 + gmenu_tree_separator_get_tree@Base 3.6.0 gmenu_tree_separator_get_type@Base 3.2.0.1 diff -Nru gnome-menus-3.8.0/debian/menus.blacklist gnome-menus-3.8.0/debian/menus.blacklist --- gnome-menus-3.8.0/debian/menus.blacklist 2013-04-02 03:23:04.000000000 +0000 +++ gnome-menus-3.8.0/debian/menus.blacklist 2013-06-08 20:17:05.000000000 +0000 @@ -1,7 +1,11 @@ -# -*- coding: utf-8 -*- # openjdk-6 +openjdk-6-java.desktop openjdk-6-policytool.desktop +# openjdk-7 +openjdk-7-java.desktop +openjdk-7-policytool.desktop + # sun-java6 sun-java6-controlpanel.desktop sun-java6-java.desktop @@ -9,11 +13,18 @@ sun-java6-jvisualvm.desktop sun-java6-policytool.desktop +# icedtea +icedtea-netx-javaws.desktop +itweb-settings.desktop + # hplip hplip.desktop hp-fab.desktop hp-sendfax.desktop +# imagemagick (Bug #677318) +display.im6.desktop + # foo2zjs hplj1020.desktop diff -Nru gnome-menus-3.8.0/debian/patches/01_default_prefix.patch gnome-menus-3.8.0/debian/patches/01_default_prefix.patch --- gnome-menus-3.8.0/debian/patches/01_default_prefix.patch 2013-04-02 03:23:04.000000000 +0000 +++ gnome-menus-3.8.0/debian/patches/01_default_prefix.patch 2013-06-08 20:17:05.000000000 +0000 @@ -1,8 +1,6 @@ -diff --git a/libmenu/gmenu-tree.c b/libmenu/gmenu-tree.c -index f580af0..68fc33b 100644 --- a/libmenu/gmenu-tree.c +++ b/libmenu/gmenu-tree.c -@@ -389,6 +389,16 @@ canonicalize_basename (GMenuTree *tree, +@@ -391,6 +391,16 @@ } } @@ -19,23 +17,17 @@ static gboolean gmenu_tree_canonicalize_path (GMenuTree *tree, GError **error) -@@ -411,13 +421,10 @@ gmenu_tree_canonicalize_path (GMenuTree *tree, - { +@@ -416,6 +426,9 @@ menu_file = tree->basename; + xdg_menu_prefix = g_getenv ("XDG_MENU_PREFIX"); -- if (strcmp (tree->basename, "applications.menu") == 0 && -- g_getenv ("XDG_MENU_PREFIX")) -+ if (strcmp (tree->basename, "applications.menu") == 0) ++ if (xdg_menu_prefix == NULL) ++ xdg_menu_prefix = "gnome-"; ++ + if (xdg_menu_prefix != NULL) { - 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); - } -@@ -1875,13 +1882,10 @@ load_parent_merge_file (GMenuTree *tree, + gchar *prefixed_basename; +@@ -2077,13 +2090,10 @@ found = FALSE; menu_file = g_strconcat (menu_name, ".menu", NULL); @@ -51,18 +43,3 @@ found = load_parent_merge_file_from_basename (tree, loaded_menu_files, layout, prefixed_basename, canonical_basedir); -diff --git a/simple-editor/GMenuSimpleEditor/menutreemodel.py b/simple-editor/GMenuSimpleEditor/menutreemodel.py -index 2eded47..94a2559 100644 ---- a/simple-editor/GMenuSimpleEditor/menutreemodel.py -+++ b/simple-editor/GMenuSimpleEditor/menutreemodel.py -@@ -58,8 +58,8 @@ class MenuTreeModel (Gtk.TreeStore): - 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 = GObject.new (GMenu.Tree, menu_basename = menu_file, flags = GMenu.TreeFlags.INCLUDE_EXCLUDED|GMenu.TreeFlags.SORT_DISPLAY_NAME) - tree.load_sync () diff -Nru gnome-menus-3.8.0/debian/patches/02_kill_debian_menu.patch gnome-menus-3.8.0/debian/patches/02_kill_debian_menu.patch --- gnome-menus-3.8.0/debian/patches/02_kill_debian_menu.patch 1970-01-01 00:00:00.000000000 +0000 +++ gnome-menus-3.8.0/debian/patches/02_kill_debian_menu.patch 2013-06-08 20:17:05.000000000 +0000 @@ -0,0 +1,13 @@ +Index: gnome-menus-3.4.2/libmenu/desktop-entries.c +=================================================================== +--- gnome-menus-3.4.2.orig/libmenu/desktop-entries.c 2011-10-24 13:48:12.000000000 +0200 ++++ gnome-menus-3.4.2/libmenu/desktop-entries.c 2013-01-02 21:11:23.617525227 +0100 +@@ -250,6 +250,8 @@ desktop_entry_load_directory (DesktopEnt + static gboolean + desktop_entry_load (DesktopEntry *entry) + { ++ if (strstr (entry->path, "/menu-xdg/")) ++ return FALSE; + if (entry->type == DESKTOP_ENTRY_DESKTOP) + { + DesktopEntryDesktop *entry_desktop = (DesktopEntryDesktop*)entry; diff -Nru gnome-menus-3.8.0/debian/patches/03_kde-legacydirs.patch gnome-menus-3.8.0/debian/patches/03_kde-legacydirs.patch --- gnome-menus-3.8.0/debian/patches/03_kde-legacydirs.patch 2013-04-02 03:23:04.000000000 +0000 +++ gnome-menus-3.8.0/debian/patches/03_kde-legacydirs.patch 2013-06-08 20:17:05.000000000 +0000 @@ -1,7 +1,5 @@ -Index: gnome-menus-2.26.1/layout/gnome-applications.menu -=================================================================== ---- gnome-menus-2.26.1.orig/layout/gnome-applications.menu 2009-04-14 00:01:00.000000000 +0200 -+++ gnome-menus-2.26.1/layout/gnome-applications.menu 2009-06-17 22:54:29.254809753 +0200 +--- a/layout/gnome-applications.menu ++++ b/layout/gnome-applications.menu @@ -7,7 +7,6 @@ X-GNOME-Menu-Applications.directory diff -Nru gnome-menus-3.8.0/debian/patches/05_debian_menu.patch gnome-menus-3.8.0/debian/patches/05_debian_menu.patch --- gnome-menus-3.8.0/debian/patches/05_debian_menu.patch 2013-04-02 03:23:04.000000000 +0000 +++ gnome-menus-3.8.0/debian/patches/05_debian_menu.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,16 +0,0 @@ -Index: gnome-menus-3.5.2/layout/gnome-applications.menu -=================================================================== ---- gnome-menus-3.5.2.orig/layout/gnome-applications.menu 2012-06-06 14:21:53.189819457 +1200 -+++ gnome-menus-3.5.2/layout/gnome-applications.menu 2012-06-06 14:21:53.977819429 +1200 -@@ -171,4 +171,11 @@ - - - -+ -+ -+ Debian -+ debian-menu.menu -+ Debian.directory -+ -+ - diff -Nru gnome-menus-3.8.0/debian/patches/08_settings-menus.patch gnome-menus-3.8.0/debian/patches/08_settings-menus.patch --- gnome-menus-3.8.0/debian/patches/08_settings-menus.patch 2013-04-02 03:23:04.000000000 +0000 +++ gnome-menus-3.8.0/debian/patches/08_settings-menus.patch 2013-06-08 20:17:05.000000000 +0000 @@ -1,7 +1,5 @@ -Index: gnome-menus-3.7.90/layout/gnome-applications.menu -=================================================================== ---- gnome-menus-3.7.90.orig/layout/gnome-applications.menu 2013-03-03 01:00:43.953488579 -0500 -+++ gnome-menus-3.7.90/layout/gnome-applications.menu 2013-03-03 01:00:43.949488579 -0500 +--- a/layout/gnome-applications.menu ++++ b/layout/gnome-applications.menu @@ -228,6 +228,34 @@ gnome-system-monitor.desktop diff -Nru gnome-menus-3.8.0/debian/patches/09_app_install_entry.patch gnome-menus-3.8.0/debian/patches/09_app_install_entry.patch --- gnome-menus-3.8.0/debian/patches/09_app_install_entry.patch 2013-04-02 03:23:04.000000000 +0000 +++ gnome-menus-3.8.0/debian/patches/09_app_install_entry.patch 2013-06-08 20:17:05.000000000 +0000 @@ -1,12 +1,12 @@ Description: Include Software Center in menus -Index: gnome-menus-3.5.2/layout/gnome-applications.menu +Index: gnome-menus-3.8.0/layout/gnome-applications.menu =================================================================== ---- gnome-menus-3.5.2.orig/layout/gnome-applications.menu 2012-06-06 14:21:57.305819313 +1200 -+++ gnome-menus-3.5.2/layout/gnome-applications.menu 2012-06-06 14:21:58.721819264 +1200 -@@ -206,4 +206,16 @@ - Debian.directory - +--- gnome-menus-3.8.0.orig/layout/gnome-applications.menu 2013-06-04 18:22:04.293014377 -0400 ++++ gnome-menus-3.8.0/layout/gnome-applications.menu 2013-06-04 18:22:04.293014377 -0400 +@@ -325,4 +325,16 @@ + + + + ubuntu-software-center.desktop diff -Nru gnome-menus-3.8.0/debian/patches/09_games-menu.patch gnome-menus-3.8.0/debian/patches/09_games-menu.patch --- gnome-menus-3.8.0/debian/patches/09_games-menu.patch 2013-04-02 03:23:04.000000000 +0000 +++ gnome-menus-3.8.0/debian/patches/09_games-menu.patch 2013-06-08 20:17:05.000000000 +0000 @@ -1,7 +1,5 @@ -Index: gnome-menus-3.7.90/layout/gnome-applications.menu -=================================================================== ---- gnome-menus-3.7.90.orig/layout/gnome-applications.menu 2013-03-03 00:56:00.353482551 -0500 -+++ gnome-menus-3.7.90/layout/gnome-applications.menu 2013-03-03 00:56:55.137483715 -0500 +--- a/layout/gnome-applications.menu ++++ b/layout/gnome-applications.menu @@ -99,8 +99,107 @@ diff -Nru gnome-menus-3.8.0/debian/patches/11_science-menu.patch gnome-menus-3.8.0/debian/patches/11_science-menu.patch --- gnome-menus-3.8.0/debian/patches/11_science-menu.patch 2013-04-02 03:23:04.000000000 +0000 +++ gnome-menus-3.8.0/debian/patches/11_science-menu.patch 2013-06-08 20:17:05.000000000 +0000 @@ -1,8 +1,6 @@ -Index: gnome-menus-2.24.2/layout/gnome-applications.menu -=================================================================== ---- gnome-menus-2.24.2.orig/layout/gnome-applications.menu 2008-12-26 17:08:38.587592137 +0100 -+++ gnome-menus-2.24.2/layout/gnome-applications.menu 2008-12-26 17:10:25.727590587 +0100 -@@ -65,10 +65,23 @@ +--- a/layout/gnome-applications.menu ++++ b/layout/gnome-applications.menu +@@ -88,10 +88,23 @@ Education @@ -26,20 +24,16 @@ Games -Index: gnome-menus-2.24.2/desktop-directories/Education.directory.in -=================================================================== ---- gnome-menus-2.24.2.orig/desktop-directories/Education.directory.in 2008-11-25 14:01:14.000000000 +0100 -+++ gnome-menus-2.24.2/desktop-directories/Education.directory.in 2008-12-26 17:10:25.731589699 +0100 +--- a/desktop-directories/Education.directory.in ++++ b/desktop-directories/Education.directory.in @@ -1,4 +1,4 @@ [Desktop Entry] _Name=Education -Icon=applications-science +Icon=applications-accessories Type=Directory -Index: gnome-menus-2.24.2/desktop-directories/Utility.directory.in -=================================================================== ---- gnome-menus-2.24.2.orig/desktop-directories/Utility.directory.in 2008-12-26 17:10:52.531587812 +0100 -+++ gnome-menus-2.24.2/desktop-directories/Utility.directory.in 2008-12-26 17:11:01.619588523 +0100 +--- a/desktop-directories/Utility.directory.in ++++ b/desktop-directories/Utility.directory.in @@ -1,5 +1,5 @@ [Desktop Entry] _Name=Accessories diff -Nru gnome-menus-3.8.0/debian/patches/series gnome-menus-3.8.0/debian/patches/series --- gnome-menus-3.8.0/debian/patches/series 2013-04-02 03:23:04.000000000 +0000 +++ gnome-menus-3.8.0/debian/patches/series 2013-06-08 20:17:05.000000000 +0000 @@ -1,10 +1,9 @@ #01_default_prefix.patch +02_kill_debian_menu.patch 03_kde-legacydirs.patch -05_debian_menu.patch 08_settings-menus.patch 09_app_install_entry.patch 09_games-menu.patch -#20_show-admin-tools-for-admin-group.patch 11_science-menu.patch 50_add-gcc-apps.patch 70_ubuntu-directories.patch diff -Nru gnome-menus-3.8.0/debian/watch gnome-menus-3.8.0/debian/watch --- gnome-menus-3.8.0/debian/watch 2013-04-02 03:23:04.000000000 +0000 +++ gnome-menus-3.8.0/debian/watch 2013-06-08 20:17:05.000000000 +0000 @@ -1,3 +1,3 @@ version=3 -http://ftp.gnome.org/pub/GNOME/sources/gnome-menus/([\d\.]+)/ \ +http://ftp.gnome.org/pub/GNOME/sources/gnome-menus/([\d\.]+[02468])/ \ gnome-menus-(.*)\.tar\.xz