~laney/gnome-menus/merge-3.4.2

Viewing all changes in revision 109.

  • Committer: Michael Terry
  • Date: 2011-12-23 20:30:50 UTC
  • Revision ID: michael.terry@canonical.com-20111223203050-78q0g4icpce85lle
Tags: 3.2.0.1-2ubuntu1
* Merge from Debian testing, remaining changes:
  - debian/patches/09_app_install_entry.patch: Add Software Center
  - debian/patches/series: Disable 01_default_prefix.patch
  - debian/gnome-menus.postinst: Disable blacklist
  - debian/watch: Look for unstable tarballs
* Update po-up/ca.po.
* Upload to unstable.
* New upstream release
* Partial sync from Ubuntu, ensure we're using the same package names and
  initial 3.2.0 packaging
* debian/patches/01_default_prefix.patch: Refreshed
* debian/libgnome-menu-3-0.symbols: Add symbols file
* debian/gnome-menus.install: Install gmenu-simple-editor
* Remove pysupport depends, gnome-menus bindings go via GI now.
* debian/rules:
  - Call dh_python2 for gnome-menus, so python:Depends is set.
* debian/control.in:
  - Bump Build-Depends on python to (>= 2.6.6-3~) for dh_python2.
* Stop installing gmenu-simple-editor
* Add xterm to the blacklist.
* Use the .maintscript facility provided by dh_installdeb to cleanup the old
  conffiles.
* Update the last unfixed version to 3.0.1-2 as we missed to remove the old
  conffile for users upgrading from 2.30.3-2+b1. Closes: #645446
* Upload to unstable.
* debian/control.in:
  - Set pkg-gnome-maintainers@lists.alioth.debian.org as Maintainer.
  - Remove obsolete Build-Depends on dpkg-dev.
  - Remove old Conflicts and Replaces.
  - Bump Standards-Version to 3.9.2. No further changes.
  - Add Vcs-* fields.
* Bump debhelper compatibility level to 8.
  - Update Build-Depends on debhelper.
  - Strip debian/tmp/ from .install files.
* debian/watch:
  - Update to version 3.
  - Switch to .xz tarballs.
* Break alacarte < 0.13.2-2 (version without support for 
  settings.menu).
* New upstream release.
* 08_settings-menus.patch: new patch. Move the old settings and system 
  settings to submenus in the “system” submenu. This is merely so that 
  they have a place until we clean them up entirely.
  + desktop-files/Settings{,-System}.directory.in: taken from the 2.30 
    package.
  + Update translations accordingly.
* po-up/fr.po: add a missing French translation.
* Clean up old comments in translations.
* 09_games-menu.patch: refreshed.

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: