-
Committer:
Package Import Robot
-
Author(s):
Robert Ancell, Iain Lane
-
Date:
2012-05-22 12:20:01 UTC
-
mfrom:
(1.1.64)
(2.2.4 sid)
-
Revision ID:
package-import@ubuntu.com-20120522122001-93dgkpy6lomz91bu
Tags: 3.4.2-1ubuntu1
[ 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.<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