Viewing all changes in revision 134.
- Committer: Package Import Robot
- 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
* 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
- 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
- files added:
- .pc/02_kill_debian_menu.patch
- .pc/02_kill_debian_menu.patch/libmenu
- .pc/50_add-gcc-apps.patch
- .pc/50_add-gcc-apps.patch/desktop-directories
- .pc/git_restore_calculator.patch
- .pc/git_restore_calculator.patch/layout
- files removed:
- .pc/03_kde-legacydirs.patch/layout/applications.menu
- .pc/05_debian_menu.patch
- .pc/05_debian_menu.patch/layout
- .pc/10_use-default-python-path.patch
- .pc/10_use-default-python-path.patch/simple-editor
- .pc/21_default-python-in-shebang.patch
- .pc/21_default-python-in-shebang.patch/simple-editor
- .pc/22_directory-suffix-for-icons.patch
- .pc/22_directory-suffix-for-icons.patch/desktop-directories
- simple-editor
- simple-editor/GMenuSimpleEditor
- files modified:
- .pc/70_ubuntu-directories.patch/po/POTFILES.in
expand all
collapse all
added
removed
