Merge lp:~laney/gnome-menus/merge-3.4.2 into lp:~ubuntu-desktop/gnome-menus/ubuntu

[Iain Lane]

Merge to 3.4.2

[Robert Ancell (robert-ancell)]

Looks good

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2012-03-28 00:28:52 +0000
+++ debian/changelog	2012-05-21 17:22:17 +0000
@@ -1,3 +1,49 @@
+gnome-menus (3.4.2-1ubuntu1) quantal; urgency=low
+
+  * 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.<localename>.cache file in e. g.
+        /usr/share/applications/ to speed up menu loading. Those
+        are generated with update-gnome-menus-cache <dir>.
+    - debian/patches/70_ubuntu-directories.patch
+      + Add Ubuntu-specific directories back to POTFILES.in
+    - debian/patches/series: Disable 01_default_prefix.patch
+
+ -- Iain Lane <[e-mail]>  Mon, 21 May 2012 17:55:46 +0100
+
+gnome-menus (3.4.2-1) unstable; urgency=low
+
+  [ Josselin Mouette ]
+  * menus.blacklist: update to the latest KDE versions.
+    Closes: #650017, #650019.
+
+  [ Michael Biebl ]
+  * New upstream release.
+  * Change section of gir1.2-gmenu-3.0 to introspection.
+  * debian/gnome-menus.maintscript: Use new versioning scheme as recommended
+    by dpkg-maintscript-helper which better handles local modifications and
+    (bin)NMUs.
+  * debian/patches/05_debian_menu.patch: Refreshed.
+  * Drop explicit Build-Depends on gir1.2-glib-2.0 and bump
+    libgirepository1.0-dev accordingly.
+  * Bump Stanards-Version to 3.9.3.
+  * debian/menus.blacklist:
+    - Remove stale entries which are no longer relevant, mostly KDE3 related.
+    - Remove KDE entries which use OnlyShowIn=KDE;
+    - Add notes for which .desktop files bugs have been filed. Once they are
+      fixed the corresponding entries should be removed again.
+    - Add Thunar (XFCE) and related applications to blacklist.
+
+ -- Michael Biebl <[e-mail]>  Sat, 19 May 2012 08:11:53 +0200
+
 gnome-menus (3.4.0-0ubuntu1) precise-proposed; urgency=low
 
   * New upstream release

=== modified file 'debian/control'
--- debian/control	2011-12-23 20:30:50 +0000
+++ debian/control	2012-05-21 17:22:17 +0000
@@ -11,14 +11,13 @@
 Uploaders: Debian GNOME Maintainers <[e-mail]>, Michael Biebl <[e-mail]>, Sjoerd Simons <[e-mail]>
 Build-Depends: debhelper (>= 8.1.0~),
                cdbs (>= 0.4.73),
-               libglib2.0-dev (>= 2.29.15),
+               libglib2.0-dev (>= 2.30.0),
                gnome-pkg-tools,
                python (>= 2.6.6-3~),
                intltool (>= 0.40.0),
-               libgirepository1.0-dev (>= 0.9.5),
-               gobject-introspection (>= 0.9.12-4~),
-               gir1.2-glib-2.0
-Standards-Version: 3.9.2
+               libgirepository1.0-dev (>= 0.10.7-1~),
+               gobject-introspection (>= 0.9.12-4~)
+Standards-Version: 3.9.3
 X-Python-Version: >= 2.3
 Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/gnome-menus/ubuntu
 
@@ -61,7 +60,7 @@
 Depends: ${misc:Depends},
          libgnome-menu-3-0 (= ${binary:Version}),
          gir1.2-gmenu-3.0 (= ${binary:Version}),
-         libglib2.0-dev (>= 2.15.2)
+         libglib2.0-dev (>= 2.30.0)
 Replaces: gir-repository-dev (<< 0.6.5-6)
 Description: GNOME implementation of the freedesktop menu specification
  The package contains an implementation of the draft
@@ -75,7 +74,7 @@
  This package contains the development headers.
 
 Package: gir1.2-gmenu-3.0
-Section: libs
+Section: introspection
 Architecture: any
 Depends: ${gir:Depends},
          ${shlibs:Depends},

=== modified file 'debian/control.in'
--- debian/control.in	2011-12-23 20:30:50 +0000
+++ debian/control.in	2012-05-21 17:22:17 +0000
@@ -6,14 +6,13 @@
 Uploaders: @GNOME_TEAM@
 Build-Depends: debhelper (>= 8.1.0~),
                cdbs (>= 0.4.73),
-               libglib2.0-dev (>= 2.29.15),
+               libglib2.0-dev (>= 2.30.0),
                gnome-pkg-tools,
                python (>= 2.6.6-3~),
                intltool (>= 0.40.0),
-               libgirepository1.0-dev (>= 0.9.5),
-               gobject-introspection (>= 0.9.12-4~),
-               gir1.2-glib-2.0
-Standards-Version: 3.9.2
+               libgirepository1.0-dev (>= 0.10.7-1~),
+               gobject-introspection (>= 0.9.12-4~)
+Standards-Version: 3.9.3
 X-Python-Version: >= 2.3
 Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/gnome-menus/ubuntu
 
@@ -56,7 +55,7 @@
 Depends: ${misc:Depends},
          libgnome-menu-3-0 (= ${binary:Version}),
          gir1.2-gmenu-3.0 (= ${binary:Version}),
-         libglib2.0-dev (>= 2.15.2)
+         libglib2.0-dev (>= 2.30.0)
 Replaces: gir-repository-dev (<< 0.6.5-6)
 Description: GNOME implementation of the freedesktop menu specification
  The package contains an implementation of the draft
@@ -70,7 +69,7 @@
  This package contains the development headers.
 
 Package: gir1.2-gmenu-3.0
-Section: libs
+Section: introspection
 Architecture: any
 Depends: ${gir:Depends},
          ${shlibs:Depends},

=== modified file 'debian/gnome-menus.maintscript'
--- debian/gnome-menus.maintscript	2012-02-08 10:35:07 +0000
+++ debian/gnome-menus.maintscript	2012-05-21 17:22:17 +0000
@@ -1,3 +1,3 @@
-rm_conffile /etc/xdg/menus/gnome-preferences.menu 2.22.2-4 gnome-menus
-rm_conffile /etc/xdg/menus/gnome-settings.menu 3.2.0.1-2ubuntu1 gnome-menus
-rm_conffile /etc/xdg/menus/gnome-applications.menu 3.2.0.1-2ubuntu2 gnome-menus
+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

=== modified file 'debian/gnome-menus.postinst'
--- debian/gnome-menus.postinst	2011-12-23 20:30:50 +0000
+++ debian/gnome-menus.postinst	2012-05-21 17:22:17 +0000
@@ -7,9 +7,4 @@
     exit 0
 fi
 
-if [ "$1" = configure ] && dpkg --compare-versions "$2" lt-nl "3.2.0-0ubuntu2"; then
-    # we dropped the menu cache, clean up old files
-    rm -f /usr/share/applications/desktop.*.cache
-fi
-
 #DEBHELPER#

=== modified file 'debian/menus.blacklist'
--- debian/menus.blacklist	2011-12-23 20:30:50 +0000
+++ debian/menus.blacklist	2012-05-21 17:22:17 +0000
@@ -5,21 +5,23 @@
 sun-java6-controlpanel.desktop
 sun-java6-java.desktop
 sun-java6-javaws.desktop
-sun-java6-jconsole.desktop
 sun-java6-jvisualvm.desktop
 sun-java6-policytool.desktop
 
 # hplip
 hplip.desktop
-hplip-kubuntu.desktop
 hp-fab.desktop
 hp-sendfax.desktop
 
 # foo2zjs
 hplj1020.desktop
 
+# kde4libs (Bug #673362)
+kde4/kmailservice.desktop
+kde4/ktelnetservice.desktop
+
 # kdeaccessibility
-kde4/kttsmgr.desktop
+kde4/jovieapp.desktop
 kde4/kmag.desktop
 kde4/kmousetool.desktop
 kde4/kmouth.desktop
@@ -27,149 +29,147 @@
 # kdeadmin
 kde4/kuser.desktop
 kde4/ksystemlog.desktop
-kde4/kpackage.desktop
 
 # kdebase
-kde4/kwrite.desktop
 kde4/dolphin.desktop
-kde4/kappfinder.desktop
+kde4/keditbookmarks.desktop
+kde4/kdepasswd.desktop
+kde4/kfmclient.desktop
+kde4/kfmclient_dir.desktop
+kde4/kfmclient_html.desktop
+kde4/kfmclient_war.desktop
+kde4/konqbrowser.desktop
+kde4/konquerorsu.desktop
 kde4/konsole.desktop
-kde4/konqbrowser.desktop
-kde4/kinfocenter.desktop
-kde4/kfind.desktop
-
-# kdebluetooth
-kde/kbluelock.desktop
-kde/kbluemon.desktop
-kde/kinputwizard.desktop
-kde/kbtobexclient.desktop
-kde/kbtobexsrv.desktop
-kde/kcm_btpaired.desktop
-kde/kbluetooth.desktop
+kde4/kwrite.desktop
+
+# kdebase-runtime (Bug #673361)
+kde4/nepomukbackup.desktop
+kde4/nepomukcontroller.desktop
+
+# kdebase-workspace
+kde4/kfontview.desktop
+kde4/ksysguard.desktop
+kde4/systemsettings.desktop
 
 # kdeedu - no equivalents in GNOME
 
 # kdegames - only those which have equivalents in gnome-games
-kde4/ksame.desktop
+kde4/kblocks.desktop
 kde4/kfourinline.desktop
-kde4/kmines.desktop
 kde4/killbots.desktop
+kde4/kiriki.desktop
+kde4/klickety.desktop
+kde4/ksame.desktop
 kde4/klines.desktop
-kde4/ksudoku.desktop
 kde4/kmahjongg.desktop
+kde4/kmines.desktop
 kde4/kpat.desktop
 kde4/kreversi.desktop
+kde4/ksudoku.desktop
 kde4/kdesnake.desktop
-kde4/kblocks.desktop
+kde4/ktron.desktop
 
 # kdegraphics
+kde4/gwenview.desktop
 kde4/kcolorchooser.desktop
+kde4/kolourpaint.desktop
 kde4/kruler.desktop
+kde4/ksnapshot.desktop
 kde4/okular.desktop
-kde4/gwenview.desktop
-kde4/kolourpaint.desktop
-kde4/ksnapshot.desktop
+kde4/okularApplication_comicbook.desktop
+kde4/okularApplication_dvi.desktop
+kde4/okularApplication_fax.desktop
+kde4/okularApplication_fb.desktop
+kde4/okularApplication_ghostview.desktop
+kde4/okularApplication_kimgio.desktop
+kde4/okularApplication_mobi.desktop
+kde4/okularApplication_ooo.desktop
+kde4/okularApplication_pdf.desktop
+kde4/okularApplication_plucker.desktop
+kde4/okularApplication_xps.desktop
+kde4/okularApplication_chm.desktop
+kde4/okularApplication_djvu.desktop
+kde4/okularApplication_epub.desktop
+kde4/okularApplication_tiff.desktop
 
 # kdemultimedia
+kde4/dragonplayer.desktop
+kde4/juk.desktop
 kde4/kmix.desktop
-kde4/juk.desktop
-kde4/dragonplayer.desktop
 kde4/kscd.desktop
 
 # kdenetwork
-kde4/krfb.desktop
+kde4/kget.desktop
 kde4/kopete.desktop
+kde4/kppplogview.desktop
 kde4/Kppp.desktop
-kde4/kget.desktop
 kde4/krdc.desktop
+kde4/krfb.desktop
 
 # kdepim
-kde4/ktimetracker.desktop
+kde4/akonadiconsole.desktop
+kde4/akregator.desktop
+kde4/blogilo.desktop
+kde4/kaddressbook.desktop
+kde4/kalarm.desktop
 kde4/groupwarewizard.desktop
+kde4/Kjots.desktop
+kde4/kleopatra.desktop
+kde4/kleopatra_import.desktop
+kde4/KMail.desktop
+kde4/kmail_view.desktop
 kde4/KNode.desktop
-kde4/Kjots.desktop
+kde4/knotes.desktop
+kde4/konsolekalendar.desktop
 kde4/Kontact.desktop
-kde4/kpilot.desktop
-kde4/knotes.desktop
-kde4/kalarm.desktop
-kde4/kaddressbook.desktop
-kde4/akregator.desktop
-kde4/KMail.desktop
+kde4/kontact-admin.desktop
+kde4/korganizer-import.desktop
 kde4/korganizer.desktop
+kde4/ktimetracker.desktop
+kde4/akonaditray.desktop
 
 # kdesdk
+kde4/cervisia.desktop
+kde4/kapptemplate.desktop
+kde4/ktesnippets_editor.desktop
+kde4/kate.desktop
+kde4/kcachegrind.desktop
 kde4/kompare.desktop
-kde4/cervisia.desktop
-kde4/umbrello.desktop
 kde4/kuiviewer.desktop
 kde4/lokalize.desktop
-kde4/kcachegrind.desktop
-kde4/kbugbuster.desktop
-kde4/kate.desktop
-kde4/kapptemplate.desktop
+kde4/okteta.desktop
+kde4/umbrello.desktop
 
 # kdetoys
 kde4/amor.desktop
 kde4/kteatime.desktop
 
 # kdeutils
-kde4/kwalletmanager.desktop
-kde4/ktimer.desktop
+kde4/ark.desktop
+kde4/filelight.desktop
+kde4/kcalc.desktop
 kde4/KCharSelect.desktop
+kde4/kwikdisk.desktop
+kde4/kdf.desktop
 kde4/KFloppy.desktop
-kde4/kdf.desktop
-kde4/ark.desktop
-kde4/superkaramba.desktop
-kde4/kwikdisk.desktop
-kde4/irkick.desktop
+kde4/kgpg.desktop
+kde4/krcdnotifieritem.desktop
+kde4/ktimer.desktop
+kde4/kwalletmanager.desktop
+kde4/kwalletmanager-kwalletd.desktop
 kde4/sweeper.desktop
-kde4/kcalc.desktop
-kde4/okteta.desktop
-kde4/kgpg.desktop
-
-# kdevelop - only remove the redundant stuff
-kde/kdevelop_kde_cpp.desktop
-kde/kdevelop_scripting.desktop
-kde/kdevelop_ruby.desktop
-kde/kdevelop_c_cpp.desktop
 
 # kdewebdev
 kde4/kfilereplace.desktop
+kde4/kimagemapeditor.desktop
 kde4/klinkstatus.desktop
-kde4/kxsldbg.desktop
-kde4/kimagemapeditor.desktop
 
 # Other KDE-only stuff that have GNOME equivalents in the standard install
-amarok.desktop
-codeine.desktop
-digikam.desktop
-gwenview.desktop
-k3b.desktop
-kaffeine.desktop
-kasablanca.desktop
-katapult.desktop
-kcm_knemo.desktop
-kdesvn.desktop
-kdiff3.desktop
-keep.desktop
-kftpgrabber.desktop
 Kino.desktop
-kmplayer.desktop
-knetload.desktop
-knmap.desktop
-komparator.desktop
-konversation.desktop
-kpowersave.desktop
-krusader.desktop
-krusader_root-mode.desktop
-ksystemlog.desktop
-ktorrent.desktop
 qt3config.desktop
-qtconfig-qt3.desktop
 qt4config.desktop
 qtconfig-qt4.desktop
-showfoto.desktop
-smb4k.desktop
 
 # Viewers only belong in the MIME associations, not in the menu
 djvulibre-djview3.desktop
@@ -186,10 +186,14 @@
 xscreensaver-properties.desktop
 
 # IDLE - we don't need one entry for each Python version
-idle-python2.4.desktop
 idle-python2.5.desktop
 idle-python2.6.desktop
 
 # XTerm
 debian-xterm.desktop
 debian-uxterm.desktop
+
+# XFCE (Bug #673363, #673360)
+Thunar-bulk-rename.desktop
+Thunar.desktop
+thunar-volman-settings.desktop

=== modified file 'debian/patches/05_debian_menu.patch'
--- debian/patches/05_debian_menu.patch	2012-02-22 08:03:11 +0000
+++ debian/patches/05_debian_menu.patch	2012-05-21 17:22:17 +0000
@@ -1,7 +1,6 @@
-Index: gnome-menus-3.3.5/layout/applications.menu
-===================================================================
---- gnome-menus-3.3.5.orig/layout/applications.menu	2012-02-22 09:02:30.771202095 +0100
-+++ gnome-menus-3.3.5/layout/applications.menu	2012-02-22 09:02:31.527202131 +0100
+Index: gnome-menus-3.4.2/layout/applications.menu
+--- gnome-menus-3.4.2.orig/layout/applications.menu	2012-05-18 22:07:48.359105100 +0200
++++ gnome-menus-3.4.2/layout/applications.menu	2012-05-18 22:07:49.191105070 +0200
 @@ -156,4 +156,11 @@
       <Merge type="files" />
     </Layout>