~ubuntu-branches/ubuntu/raring/gnome-panel/raring

Viewing all changes in revision 222.

  • Committer: Package Import Robot
  • Author(s): Jeremy Bicha
  • Date: 2012-05-25 10:44:35 UTC
  • mfrom: (2.1.17 sid)
  • Revision ID: package-import@ubuntu.com-20120525104435-icbp1ii5bg6tiial
Tags: 1:3.4.2.1-2ubuntu1
* Resynchronize with Debian. Remaining changes:
  - debian/control:
    + Recommend indicator-complete
    + Use epoch in breaks/replaces version
  - debian/patches/01_menus_rename.patch: Dropped, Debian-specific
  - debian/patches/40_unset_menuproxy.patch:
    + Make sure gnome-panel and the applets don't pick up menu proxies.
  - debian/patches/41_classic_layout.patch:
    + Change the defaults to be more "classic Ubuntu": Show indicators
      & show desktop, drop GNOME clock & notification area
  - debian/patches/85_disable_shutdown_on_ltsp.patch:
    + Suppress the shutdown option in the panel if LTSP_CLIENT is set.
* Dropped extra intltool-update run from debian/rules; I don't think
  this is needed anymore

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: