-
Committer:
Bazaar Package Importer
-
Author(s):
Lorenzo De Liso
-
Date:
2010-06-05 16:35:40 UTC
-
mfrom:
(1.2.59 upstream)
(3.1.7 sid)
-
Revision ID:
james.westby@ubuntu.com-20100605163540-hzbvrhb08jsfh1gh
Tags: 1.6.3-1ubuntu1
* Merge from debian unstable (LP: #590124), remaining changes:
- debian/patches/01_ubuntu_feedlists: updated some outdated feeds
(LP: #341969)
- debian/rules: call initltool-update -p to generate translation template
- debian/patches/fix_systray_behavior: fix systray mis-behaviour when
Liferea is visible in another workspace.
- debian/patches/add_X-Ubuntu-Gettext-Domain: add x-ubuntu-gettext-domain
to .desktop file. (LP: #514272)
- debian/patches/fix-dnd-bug: dropped, as this caused a regression when
trying to reorder feeds.
- debian/patches/notification-append: add patch to make the notification
use the append feature of notify-osd. (LP: #457869)
- debian/patches/gtk-status-icon.patch: backport GtkStatusIcon support to
get proper icon transparency with new default theme. (LP: #101980)