* 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