~aw/ubuntu/lucid/revelation/trunk

Viewing all changes in revision 24.

  • Committer: Bazaar Package Importer
  • Author(s): Hew McLachlan, Hew McLachlan
  • Date: 2009-06-13 23:05:07 UTC
  • mfrom: (3.1.3 sid)
  • Revision ID: james.westby@ubuntu.com-20090613230507-usn56ak9edq0zkmj
Tags: 0.4.11-4ubuntu1
[ Hew McLachlan ]
* Merge from debian unstable (LP: #386624), remaining changes:
  - Fix FTBFS with python >= 2.6
  - debian/patches/91_panel_category.dpatch:
    + Change GNOME panel category from "Utility" to the correct "Utilities".
  - debian/patches/92_typo_de_translation.dpatch:
    + Fix German translation typo
  - debian/rules:
    + Include dh_icons
* Rename Ubuntu specific patches to avoid confusion with Debian's patches:
  - 80_panel_category.dpatch -> 91_panel_category.dpatch
  - 90_typo_de_translation.dpatch -> 92_typo_de_translation.dpatch 
* debian/patches/00list: Update with new Ubuntu specific patch names
* Dropped changes now applied upstream:
  - debian/control: 
    + Drop python-xml from Depends
  - debian/patches/80_transparency.dpatch:
    + Allow applet to support transparent panels
  - Fix index out of range in ui.py (LP: #362788)
* Dropped changes no longer required:
  - debian/control: 
    + Add dependency on python-gnome2-desktop

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: