diff -Nru gnome-menus-3.8.0/debian/changelog gnome-menus-3.8.0/debian/changelog --- gnome-menus-3.8.0/debian/changelog 2013-10-09 13:46:10.000000000 +0000 +++ gnome-menus-3.8.0/debian/changelog 2014-01-05 12:08:04.000000000 +0000 @@ -1,3 +1,12 @@ +gnome-menus (3.8.0-1ubuntu5.1) saucy-proposed; urgency=medium + + * debian/patches/git_OnlyUnallocated_only_for_other.patch: layout: don't + use 'OnlyUnallocated' for sections different than 'Other' to not break + this section which now contains all applications (LP: #1265489) + This bug is fixed in 3.8.1 version. + + -- Matthieu Baerts (matttbe) Sun, 05 Jan 2014 12:59:15 +0100 + gnome-menus (3.8.0-1ubuntu5) saucy; urgency=low * debian/patches/ubuntu_gcc_translations.patch: revert dropping of diff -Nru gnome-menus-3.8.0/debian/control gnome-menus-3.8.0/debian/control --- gnome-menus-3.8.0/debian/control 2013-10-09 13:46:12.000000000 +0000 +++ gnome-menus-3.8.0/debian/control 2014-01-05 12:14:17.000000000 +0000 @@ -7,7 +7,7 @@ Priority: optional Maintainer: Ubuntu Developers XSBC-Original-Maintainer: Debian GNOME Maintainers -Uploaders: Andreas Henriksson , Debian GNOME Maintainers , Jeremy Bicha , Josselin Mouette , Sjoerd Simons +Uploaders: Andreas Henriksson , Debian GNOME Maintainers , Jeremy Bicha , Sjoerd Simons Build-Depends: debhelper (>= 9), cdbs (>= 0.4.73), libglib2.0-dev (>= 2.30.0), diff -Nru gnome-menus-3.8.0/debian/patches/git_OnlyUnallocated_only_for_other.patch gnome-menus-3.8.0/debian/patches/git_OnlyUnallocated_only_for_other.patch --- gnome-menus-3.8.0/debian/patches/git_OnlyUnallocated_only_for_other.patch 1970-01-01 00:00:00.000000000 +0000 +++ gnome-menus-3.8.0/debian/patches/git_OnlyUnallocated_only_for_other.patch 2014-01-05 09:44:19.000000000 +0000 @@ -0,0 +1,298 @@ +From 6e7790b5451bbb8a44b736ed402964d1bb432247 Mon Sep 17 00:00:00 2001 +From: Giovanni Campagna +Date: Mon, 26 Aug 2013 13:59:18 +0000 +Subject: layout: don't use OnlyUnallocated for sections different than Other + +We used to have OnlyUnallocated on all non-folder sections, as +a quick way to enforce the whitelist, but that broke the Other +section. +Instead, we need a whitelist in the two folders, and a blacklist +in each category the application would normally be in (accessories +or system tools usually). +Ideally, apps in the Utilities category would expose the special +X-GNOME-Utilities desktop category, which we now recognize, but +the whitelist is kept to avoid patching all of them. +For the sundry category, ideally it should not be there at all. + +In the process, a number of .desktop files were removed, as they're +not provided by any packages (checked jhbuild and Fedora 19). They +are: +* caribou +* fedora-im-chooser +* fedora-abrt +* gnome-orca +* gnome-user-share-properties +* ibus +* ibus-daemon + +Distributions that are changing .desktop file names should take +care of patching gnome-menus appropriately. + +https://bugzilla.gnome.org/show_bug.cgi?id=706763 +--- +Index: gnome-menus/layout/gnome-applications.menu +=================================================================== +--- gnome-menus.orig/layout/gnome-applications.menu 2014-01-02 14:03:36.403171834 +0100 ++++ gnome-menus/layout/gnome-applications.menu 2014-01-02 14:03:36.395171834 +0100 +@@ -20,44 +20,49 @@ + + + Accessories +- + Utility.directory + + + Utility +- ++ + Accessibility + System +- +- +- file-roller.desktop +- gnome-file-roller.desktop +- deja-dup-preferences.desktop +- gcalctool.desktop +- gucharmap.desktop +- gnome-gucharmap.desktop +- gnome-font-viewer.desktop +- seahorse.desktop +- gnome-terminal.desktop +- gnome-tweak-tool.desktop +- gnome-disks.desktop +- gnome-screenshot.desktop +- gnome-yelp.desktop +- yelp.desktop +- gnome-control-center.desktop ++ X-GNOME-Utilities + + ++ ++ ++ deja-dup-preferences.desktop ++ eog.desktop ++ evince.desktop ++ file-roller.desktop ++ gcalctool.desktop ++ gnome-control-center.desktop ++ gnome-dictionary.desktop ++ gnome-disks.desktop ++ gnome-font-viewer.desktop ++ gnome-screenshot.desktop ++ gnome-terminal.desktop ++ gnome-tweak-tool.desktop ++ gucharmap.desktop ++ seahorse.desktop ++ vinagre.desktop ++ yelp.desktop ++ ++ ++ alacarte.desktop ++ + + + + + + Universal Access +- + Utility-Accessibility.directory + + +@@ -65,12 +70,16 @@ + Settings + + ++ ++ ++ ++ orca.desktop ++ + + + + + Development +- + Development.directory + + +@@ -78,6 +87,15 @@ + + emacs.desktop + ++ ++ ++ ++ jhbuild.desktop ++ java-1.7.0-openjdk-jconsole.desktop ++ java-1.7.0-openjdk-policytool.desktop ++ log4j-chainsaw.desktop ++ log4j-logfactor5.desktop ++ + + + +@@ -217,7 +235,6 @@ + + + Graphics +- + Graphics.directory + + +@@ -232,15 +249,21 @@ + + + Internet +- + Network.directory + + + Network + X-GNOME-WebApplication +- vinagre.desktop + + ++ ++ ++ ++ vinagre.desktop ++ ++ ++ javaws.desktop ++ + + + +@@ -258,7 +281,6 @@ + + + Multimedia +- + AudioVideo.directory + + +@@ -270,7 +292,6 @@ + + + Office +- + Office.directory + + +@@ -287,20 +308,14 @@ + X-GNOME-Sundry.directory + + alacarte.desktop +- caribou.desktop ++ authconfig.desktop + dconf-editor.desktop +- fedora-im-chooser.desktop + fedora-release-notes.desktop + firewall-config.desktop + flash-player-properties.desktop + gconf-editor.desktop + gnome-abrt.desktop +- fedora-abrt.desktop +- gnome-orca.desktop + gnome-power-statistics.desktop +- gnome-user-share-properties.desktop +- ibus.desktop +- ibus-daemon.desktop + ibus-setup-anthy.desktop + ibus-setup.desktop + ibus-setup-hangul.desktop +@@ -319,7 +334,6 @@ + nm-connection-editor.desktop + orca.desktop + setroubleshoot.desktop +- authconfig.desktop + system-config-date.desktop + system-config-firewall.desktop + system-config-keyboard.desktop +@@ -333,18 +347,31 @@ + + + System +- + System-Tools.directory + + + System + Settings + Game +- baobab.desktop +- gnome-system-log.desktop +- gnome-system-monitor.desktop ++ X-GNOME-Utilities + + ++ ++ ++ ++ baobab.desktop ++ gnome-system-log.desktop ++ gnome-system-monitor.desktop ++ ++ ++ dconf-editor.desktop ++ fedora-release-notes.desktop ++ gconf-editor.desktop ++ gnome-abrt.desktop ++ gnome-power-statistics.desktop ++ dconf-editor.desktop ++ setroubleshoot.desktop ++ + + Preferences + Settings.directory +@@ -473,26 +500,26 @@ + Utilities + X-GNOME-Utilities.directory + ++ X-GNOME-Utilities ++ baobab.desktop ++ deja-dup-preferences.desktop ++ eog.desktop ++ evince.desktop + file-roller.desktop + gcalctool.desktop +- gnome-font-viewer.desktop +- gucharmap.desktop +- seahorse.desktop +- gnome-terminal.desktop +- deja-dup-preferences.desktop ++ gnome-control-center.desktop + gnome-dictionary.desktop +- evince.desktop +- eog.desktop +- baobab.desktop ++ gnome-disks.desktop ++ gnome-font-viewer.desktop ++ gnome-screenshot.desktop + gnome-system-log.desktop + gnome-system-monitor.desktop +- vinagre.desktop ++ gnome-terminal.desktop + gnome-tweak-tool.desktop +- gnome-disks.desktop +- gnome-screenshot.desktop +- gnome-yelp.desktop ++ gucharmap.desktop ++ seahorse.desktop ++ vinagre.desktop + yelp.desktop +- gnome-control-center.desktop + + + 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-10-09 13:46:10.000000000 +0000 +++ gnome-menus-3.8.0/debian/patches/series 2014-01-02 12:56:16.000000000 +0000 @@ -9,3 +9,4 @@ 70_ubuntu-directories.patch git_restore_calculator.patch ubuntu_gcc_translations.patch +git_OnlyUnallocated_only_for_other.patch