~ubuntu-branches/ubuntu/precise/gnome-panel/precise

Viewing all changes in revision 213.

  • Committer: Package Import Robot
  • Author(s): Jeremy Bicha
  • Date: 2011-12-21 02:30:29 UTC
  • mfrom: (1.13.14) (2.1.14 sid)
  • Revision ID: package-import@ubuntu.com-20111221023029-e4upkcvf80jxgf36
Tags: 1:3.3.3-0ubuntu1
* Merge with Debian. Remaining changes:
* New upstream release
* debian/control:
  - Recommend gnome-settings-daemon which has the timezone polkit service
  - Recommend gnome-session-fallback
  - Break libpanel-applet2-0, libpanel-applet-3-0, and python-gnomeapplet
  - Drop python and python-gconf recommends
  - Use epoch in breaks/replaces version
* debian/rules:
  - Update translations template.
* debian/patches/01_panel_submenus.patch: Dropped, Debian-specific
* debian/patches/12_panel_icon_size_fixes.patch: Dropped, upstream
* debian/patches/13_disable_missing_help.patch:
  - Disable help buttons since the user guide no longer includes that
    content (LP: #846470, #885959)
* debian/patches/40_unset_menuproxy.patch:
  - Make sure gnome-panel and the applets don't pick up menu proxies.
* debian/patches/85_disable_shutdown_on_ltsp.patch:
  - Suppress the shutdown option in the panel if LTSP_CLIENT is set.
* debian/watch: Watch for unstable releases

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: