-
Committer:
Bazaar Package Importer
-
Author(s):
David Futcher
-
Date:
2008-12-03 18:55:55 UTC
-
mfrom:
(3.1.2 lenny)
-
Revision ID:
james.westby@ubuntu.com-20081203185555-02p31gcd9oj5i2sl
Tags: 0.4.11-3.1ubuntu1
* Merge from Debian unstable. Remaining Ubuntu changes:
- debian/patches/80_panel_category.dpatch:
+ Change GNOME panel category from "Utility" to the correct "Utilities".
- debian/patches/90_typo_de_translation.dpatch:
+ Fix German translation typo
- debian/patches/70_transparency.dpatch:
+ Allow applet to support transparent panels
- debian/control:
+ Drop python-xml from Depends
+ Add dependency on python-gnome2-desktop
- debian/rules: Replace dh_iconcache with dh_icons
* Rename Ubuntu specific patches to avoid confusion with Debian's patches:
- 50_panel_category.dpatch -> 80_panel_category.dpatch
- 60_typo_de_translation.dpatch -> 90_typo_de_translation.dpatch
* debian/patches/00list: Update with new Ubuntu specific patch names