Branches for Wily

Author: Steve Langasek
Revision Date: 2012-03-04 17:00:13 UTC

* Merge from Debian testing, remaining changes:
  - debian/patches/091_panel_category.dpatch:
    + Change GNOME panel category from "Utility" to the correct "Utilities".
  - debian/rules: Include dh_icons.
  - debian/patches/series: Include 040_xhtml.dpatch
* Dropped changes, included in Debian:
  - Build with python 2.7
  - debian/patches/230-optional-gnomeapplet.patch: Make gnome-applet optional
  - Note that md5sums between Debian and Ubuntu are different.
  - debian/control:
    - Drop libbonoboui2-0, libbonoboui2-dev, libpanel-applet2-dev,
      python-gnome2-extras-dev build-dependencies
    - Drop python-gnomeapplet dependency