-
Committer:
Package Import Robot
-
Author(s):
Jeremy Bicha
-
Date:
2013-06-08 16:16:43 UTC
-
mfrom:
(1.1.73)
(2.2.5 saucy-proposed)
-
Revision ID:
package-import@ubuntu.com-20130608161643-eemx2dcsvjyw3wz1
Tags: 3.8.0-1ubuntu1
* 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
* 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