-
Committer:
Iain Lane
-
Date:
2012-05-21 17:15:55 UTC
-
Revision ID:
iain.lane@canonical.com-20120521171555-q21hx2l3ww21neep
Merge
* 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
* menus.blacklist: update to the latest KDE versions.
Closes: #650017, #650019.
* 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.