-
Committer:
Bazaar Package Importer
-
Author(s):
Lorenzo De Liso
-
Date:
2010-10-31 11:58:23 UTC
-
mfrom:
(1.2.60 upstream)
(3.1.8 sid)
-
Revision ID:
james.westby@ubuntu.com-20101031115823-93ee4a42p0ohcenu
Tags: 1.6.4-1ubuntu1
* Merge from debian unstable (LP: #608159), remaining changes:
- debian/patches/01_ubuntu_feedlists: updated some outdated feeds
(LP: #341969)
- debian/rules:
+ call initltool-update -p to generate translation template
+ Use dh_autoreconf to regenerate build system for indicator support files.
+ Run configure in --disable-maintainer-mode.
+ Unquote -Wl,--as-needed in LDFLAGS.
+ explicitly enable libindicate with configure to avoid accidentally
getting builds without libindicate support
- debian/control: Depend on libindicate-dev and dh-autoreconf.
- 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/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)
- Added libindicate.patch: messaging indicator support. (LP: #540490)
- debian/patches/libindicate.patch:
+ ui/ui_indicator.c:
+ Correctly determine when the indicator menu is unavailable, to show
the notification area icon as a fallback (LP: #609827).
+ ui/ui_prefs.c:
+ Hide all tray-related checkboxes in indicator mode; leave the "start
minimized" checkbox shown and rename it accordingly.
* debian/patches/01_ubuntu_feedlists: updated
* debian/patches/gtk-status-icon.patch: updated
* debian/patches/libindicate.patch: updated
* debian/control:
+ Build-Depend on "libnm-glib-dev" instead of "libnm-glib-dev [linux-any]":
currently our toolchain doesn't support that
+ Build-Depend on "libice-dev" for the "libICE" library
* debian/rules: export "LIBS=-lICE" to fix the FTBFS due to binutils-gold
* Dropped changes:
- debian/patches/google-reader-auth.patch: fix Google reader
authentication (LP: #597532): fixed upstream
- Run autogen.sh to regenerate build system for indicator support files:
replaced by the change: "Use dh_autoreconf to regenerate build system
for indicator support files."
- Depend on libindicate-dev, automake and libtool: replaced by the
change: "Depend on libindicate-dev and dh-autoreconf."