diff -Nru liferea-1.10.8/debian/changelog liferea-1.10.8/debian/changelog --- liferea-1.10.8/debian/changelog 2014-03-27 21:17:36.000000000 +0100 +++ liferea-1.10.8/debian/changelog 2014-04-29 16:12:53.000000000 +0200 @@ -1,3 +1,16 @@ +liferea (1.10.8-1ubuntu1) utopic; urgency=low + + * Merge from Debian unstable (LP: #1208776). Remaining changes: + + debian/patches/ubuntu-example-feeds.patch. + + debian/patches/port-to-messaging-menu.patch. + + debian/patches/libunity.patch: refreshed. + + debian/control: build-depends on libmessaging-menu-dev libunity-dev. + + debian/rules: enable messaging-menu. + * Upstream changes: + + Fix a issue in opening link in a external browser (LP: #1299649) + + -- Mattia Rizzolo Tue, 29 Apr 2014 16:12:32 +0200 + liferea (1.10.8-1) unstable; urgency=low [ David Michael Smith ] @@ -15,6 +28,24 @@ -- Paul Gevers Thu, 27 Mar 2014 21:03:00 +0100 +liferea (1.10.3-1ubuntu1) trusty; urgency=low + + * Merge from Debian unstable (LP: #1281283). Remaining changes: + + debian/patch/ubuntu-example-feeds.patch: + - refreshed. + - alphabetically ordered. + - add ubuntu-it planet to opml/feedlist_it.opml. + + debian/patch/port-to-messaging-menu.patch: + - refreshed. + - add an hook for src/ui/ui_indicator.h. + + debian/patch/add_X-Ubuntu-Gettext-Domain.patch: refreshed. + + debian/patch/libunity.patch: refreshed. + + debian/control: build-depends on libmessaging-menu-dev libunity-dev. + + debian/liferea.indicate: dropped since useless. + + debian/rules: enable messaging-menu + + -- Mattia Rizzolo Mon, 17 Feb 2014 19:58:20 +0100 + liferea (1.10.3-1) unstable; urgency=low * New upstream release [October 2013] @@ -48,6 +79,22 @@ -- David Michael Smith Wed, 10 Jul 2013 13:37:20 +0800 +liferea (1.8.15-1ubuntu1) saucy; urgency=low + + * Merge from Debian unstable. Remaining changes: + * debian/patches: + - port-to-libindicate-0.7.patch: dropped as obsolete + - port-to-messaging-menu.patch: rebased + - ubuntu-example-feeds.patch: removed feedlist_ru.oplm changes + added .patch extension + - add_X-Ubuntu-Gettext-Domain.patch: Added .patch extension + - libunity.patch + * debian/control: libunity-dev, libmessaging-menu-dev + * debian/liferea.indicate: Removed as obsolete + * debian/rules: enable messaging-menu + + -- Oliver Sauder Sun, 14 Jul 2013 02:35:28 +0300 + liferea (1.8.15-1) unstable; urgency=low [ Dmitry Smirnov ] @@ -217,6 +264,37 @@ -- Dmitry Smirnov Wed, 10 Apr 2013 13:09:30 +1000 +liferea (1.8.10-0ubuntu2) raring; urgency=low + + * Port to messaging-menu. (LP: #1040259) + + -- Dmitrijs Ledkovs Mon, 25 Mar 2013 16:55:30 +0000 + +liferea (1.8.10-0ubuntu1) raring; urgency=low + + * New upstream release. + + * Remerge on Debian unstable. Remaining Ubuntu changes: + - debian/control: Build depend on libindicate-dev, libindicate-gtk-dev, + and libunity-dev. + - debian/liferea.{indicate,install}: Ship indicator desktop file. + - debian/rules: Enable libindicate. + - Ubuntu specific patches: ubuntu-example-feeds, add_X-Ubuntu-Gettext-Domain + libunity.patch, and port-to-libindicate-0.7.patch. + + * indicator_include_config.h.patch: Dropped, applied upstream. + * libindicate.patch: Already had been disabled, drop completely. + * libindicate_increase_version.patch: Simply changed configure.ac to look + for libindicate-0.7, no need for it to be a separate patch. Add changes + to port-to-libindicate-0.7.patch and drop. Not that this really + works as expected anymore. Thanks bug #1040259! + * debian/watch: New releases are in .tar.bz2 format, so look for those. + * debian/control: Transition libwebkit-dev build dependency to + libwebkitgtk-dev. + * Enable hardening in debian/rules and build depend on dpkg-dev (>= 1.16.1~). + + -- Andrew Starr-Bochicchio Tue, 11 Dec 2012 14:44:40 -0500 + liferea (1.8.6-1.1) unstable; urgency=low * Non-maintainer upload. @@ -255,6 +333,35 @@ -- bojo42 Tue, 17 Apr 2012 11:04:06 +0200 +liferea (1.8.3-0.1ubuntu2) precise; urgency=low + + * debian/patches: + - port-to-libindicate-0.7.patch: Replace deprecated + indicate_indicator_set_property_icon() call with + indicate_gtk_indicator_set_property_icon() (LP: #976120) + - indicator_include_config.h.patch: Include config.h for HAVE_LIBINDICATE + macro + + -- Chow Loong Jin Sun, 08 Apr 2012 02:13:07 +0800 + +liferea (1.8.3-0.1ubuntu1) precise; urgency=low + + * New upstream release (LP: #290666, #371754, #741543, #716688) + * Merge from Debian unstable (LP: #935147), remaining changes: + * debian/patches: + - drop gtk-status-icon.patch & notification-append as in upstream + - drop fix_systray_behavior as mostly upstreamed and rest seems unused + - 01_ubuntu_feedlists: update & rename, move planets to "Open Source" + - add_X-Ubuntu-Gettext-Domain: rebase + - libunity.patch: rebase, apply before indicator patch (liferea_shell.c) + - libindicate_increase_version.patch: exclude from libindicate.patch + - deactivate libindicate.patch, seems partly upstreamed and needs rework + * debian/control: libindicate-dev, libindicate-gtk-dev & libunity-dev + * debian/liferea.indicate & liferea.install: ship indicator desktop file + * debian/rules: enable libindicate + + -- bojo42 Thu, 29 Mar 2012 14:17:21 +0200 + liferea (1.8.3-0.1) unstable; urgency=low [ Bojo42 ] @@ -287,6 +394,49 @@ -- Moray Allan Tue, 27 Mar 2012 21:44:42 +0100 +liferea (1.6.6b-0ubuntu4) precise; urgency=low + + * debian/patches/libindicate.patch + - pkgconfig update for indicate-0.7 + * debian/control + - bumped build depends for libindicate-dev to 0.6.90 + + -- Ken VanDine Fri, 10 Feb 2012 14:13:54 -0500 + +liferea (1.6.6b-0ubuntu3) precise; urgency=low + + * debian/control: + - build-dep on latest libunity-dev for ABI break + + -- Didier Roche Fri, 13 Jan 2012 10:02:47 +0100 + +liferea (1.6.6b-0ubuntu2) oneiric; urgency=low + + * debian/control: + - build-dep on latest libunity-dev for ABI break + + -- Didier Roche Fri, 09 Sep 2011 12:21:41 +0200 + +liferea (1.6.6b-0ubuntu1) oneiric; urgency=low + + * New upstream release. + * Merge with Debian, remaining changes: + * debian/control: + - Build-depends on libindicate, dh_autoreconf, & libunity + * debian/rules: + - Run dh_autoreconf & update translations + - Build with libindicate + * debian/liferea.install: Install indicator files + * debian/patches/01_ubuntu_feedlists + * debian/patches/fix_systray_behavior + * debian/patches/add_X-Ubuntu-Gettext-Domain + * debian/patches/gtk-status-icon.patch: Refreshed + * debian/patches/libindicate.patch: Fixed an undefined reference + * debian/patches/notification-append + - Support libnotify 0.7, use instead of Debian's libnotify0.7 patch + + -- Jeremy Bicha Mon, 15 Aug 2011 04:02:37 -0400 + liferea (1.6.5-1.2) unstable; urgency=low * Non-maintainer upload. @@ -318,6 +468,120 @@ -- Emilio Pozuelo Monfort Sat, 19 Mar 2011 23:39:59 +0000 +liferea (1.6.4-1ubuntu9) oneiric; urgency=low + + * debian/patches/libindicate.patch + - Updated to look for indicate-0.6 + * debian/control + - bumped libindincate build depends to >= 0.5.90 + + -- Ken VanDine Wed, 10 Aug 2011 23:14:04 -0400 + +liferea (1.6.4-1ubuntu8) oneiric; urgency=low + + * debian/patches/notification-append: + - Apply libnotify 0.7 API change, fixes FTBFS. (LP: #794010) + * Rebuild to correctly update connected state with Network Manager 0.9. + (LP: #791548) + + -- Maia Kozheva Tue, 07 Jun 2011 19:52:56 +0700 + +liferea (1.6.4-1ubuntu7) natty; urgency=low + + * Rebuild against latest libunity (soname bump) + + -- Didier Roche Thu, 07 Apr 2011 12:29:22 +0200 + +liferea (1.6.4-1ubuntu6) natty; urgency=low + + * debian/patches/libunity.patch + - Displays the number of unread items in the Unity Launcher + entry (LP: #732848). + * debian/control + - Added missing build dep to libunity-dev + + -- Jean-Philippe Orsini Thu, 10 Mar 2011 20:37:50 +0100 + +liferea (1.6.4-1ubuntu5) natty; urgency=low + + * Fix indicator support again (LP: #723349) + - debian/patches/libindicate.patch: updated check for new version of + libindicate. + - debian/control: bump libindicate-dev and libindicate-gtk-dev + version requirement. + + -- Marc Deslauriers Tue, 22 Feb 2011 15:18:28 -0500 + +liferea (1.6.4-1ubuntu4) natty; urgency=low + + * Change build dependency from libwebkit-dev to libwebkitgtk-dev + (LP: #703248). + + -- Benjamin Drung Sat, 15 Jan 2011 22:28:08 +0100 + +liferea (1.6.4-1ubuntu3) natty; urgency=low + + * debian/control: Add libindicate-gtk-dev to Build-Depends so indicator + support gets built properly. (LP: #689710) + + -- Marc Deslauriers Mon, 13 Dec 2010 16:13:11 -0500 + +liferea (1.6.4-1ubuntu2) natty; urgency=low + + * debian/patches/libindicate.patch: Fixed reversed order and missing + favicons in indicator applet, thanks to Pavol Klačanský for the patch. + (LP: #653995) + + -- Luke Yelavich Tue, 30 Nov 2010 17:36:05 +1100 + +liferea (1.6.4-1ubuntu1) natty; urgency=low + + * 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." + + -- Lorenzo De Liso Sun, 31 Oct 2010 11:58:23 +0100 + liferea (1.6.4-1) unstable; urgency=low * New upstream bugfix release. @@ -335,6 +599,67 @@ -- Emilio Pozuelo Monfort Mon, 19 Jul 2010 21:45:37 +0200 +liferea (1.6.3-1ubuntu4) maverick; urgency=low + + * 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. + + -- Maia Kozheva Sun, 08 Aug 2010 19:02:08 +0700 + +liferea (1.6.3-1ubuntu3) maverick; urgency=low + + * Added libindicate.patch: messaging indicator support. (LP: #540490) + * debian/control: + - Depend on libindicate-dev, automake and libtool. + * debian/rules: + - Run autogen.sh to regenerate build system for indicator support files. + - Run configure in --disable-maintainer-mode. + - Unquote -Wl,--as-needed in LDFLAGS. + + [Ken VanDine] + * debian/control + - Specify version libindicate build depends (>= 0.3.0) + - change build depends for automake and libtool to dh-autoreconf + * debian/rules + - explicitly enable libindicate with configure to avoid accidentally + getting builds without libindicate support + - use dh_autoreconf instead of running autogen.sh + * debian/liferea.install debian/liferea.indicate + - Install a launcher to appear in the messaging menu + + -- Maia Kozheva Wed, 14 Jul 2010 22:39:01 +0700 + +liferea (1.6.3-1ubuntu2) maverick; urgency=low + + * debian/patches/google-reader-auth.patch: fix Google reader + authentication (LP: #597532) + + -- Marc Deslauriers Fri, 25 Jun 2010 14:46:11 -0400 + +liferea (1.6.3-1ubuntu1) maverick; urgency=low + + * 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) + + -- Lorenzo De Liso Sat, 05 Jun 2010 16:35:40 +0200 + liferea (1.6.3-1) unstable; urgency=low * New upstream bugfix release. @@ -346,6 +671,56 @@ -- Emilio Pozuelo Monfort Sat, 06 Mar 2010 12:53:32 +0100 +liferea (1.6.2-1ubuntu6) lucid; urgency=low + + * debian/patches/gtk-status-icon.patch: backport GtkStatusIcon support to + get proper icon transparency with new default theme. (LP: #101980) + + -- Marc Deslauriers Fri, 05 Mar 2010 18:51:45 -0500 + +liferea (1.6.2-1ubuntu5) lucid; urgency=low + + * debian/patches/notification-append: Add patch to make the notification + use the append feature of notify-osd. (LP: #457869) + + -- Ted Gould Thu, 04 Mar 2010 18:56:51 -0600 + +liferea (1.6.2-1ubuntu4) lucid; urgency=low + + * debian/patches/fix-dnd-bug: dropped, as this caused a regression when + trying to reorder feeds. + + -- Marc Deslauriers Wed, 03 Mar 2010 08:06:02 -0500 + +liferea (1.6.2-1ubuntu3) lucid; urgency=low + + * debian/patches/fix-dnd-bug: fix drag and drop bug that was creating + spurious new subscriptions. (LP: #518801) + * debian/patches/01_ubuntu_feedlists: updated some outdated feeds + (LP: #341969) + + -- Marc Deslauriers Tue, 02 Mar 2010 18:20:36 -0500 + +liferea (1.6.2-1ubuntu2) lucid; urgency=low + + * debian/patches/add_X-Ubuntu-Gettext-Domain: add x-ubuntu-gettext-domain + to .desktop file. (LP: #514272) + + -- Marc Deslauriers Wed, 10 Feb 2010 08:31:45 -0500 + +liferea (1.6.2-1ubuntu1) lucid; urgency=low + + * Merge from debian testing. Remaining changes: + - debian/patches/01_ubuntu_feedlists + - ubuntu feedlist + - remove example feeds from debian + - debian/rules + - Call intltool-update -p to generate translation template + - debian/patches/fix_systray_behavior: fix systray mis-behaviour + when Liferea is visible in another workspace. + + -- Marc Deslauriers Mon, 08 Feb 2010 19:53:55 -0500 + liferea (1.6.2-1) unstable; urgency=low * New upstream release. Closes: #567529. @@ -366,6 +741,25 @@ -- Emilio Pozuelo Monfort Wed, 03 Feb 2010 16:56:43 +0100 +liferea (1.6.0-1ubuntu2) karmic; urgency=low + + * libnm-glib soname transition (LP: #427400) + + -- Alexander Sack Thu, 24 Sep 2009 16:07:49 +0200 + +liferea (1.6.0-1ubuntu1) karmic; urgency=low + + * Merge from debian/unstable, remaining changes: (LP: #405306) + - debian/patches/01_ubuntu_feedlists + - ubuntu feedlist + - remove example feeds from debian + - debian/rules + - Call intltool-update -p to generate translation template + - debian/patches/fix_systray_behavior: fix systray mis-behaviour + when Liferea is visible in another workspace. + + -- Andreas Moog Mon, 27 Jul 2009 15:50:08 +0200 + liferea (1.6.0-1) unstable; urgency=low * New upstream releases. @@ -374,6 +768,18 @@ -- Luis Rodrigo Gallardo Cruz Sun, 26 Jul 2009 12:31:27 -0700 +liferea (1.6.0~rc6-1ubuntu1) karmic; urgency=low + + Merge from debian; remaining ubunt changes: + * debian/patches/01_ubuntu_feedlists: ubuntu feedlist; removing + a few debian changes example feeds too + * debian/rules: Call intltool-update -p to generate translation template for + Rosetta. + * debian/patches/fix_systray_behavior: fix systray mis-behaviour + when Liferea is visible in another workspace. + + -- Alexander Sack Mon, 13 Jul 2009 14:24:27 +0200 + liferea (1.6.0~rc6-1) unstable; urgency=low [ Luis Rodrigo Gallardo Cruz ] diff -Nru liferea-1.10.8/debian/control liferea-1.10.8/debian/control --- liferea-1.10.8/debian/control 2014-03-27 21:02:16.000000000 +0100 +++ liferea-1.10.8/debian/control 2014-03-30 15:46:19.000000000 +0200 @@ -1,7 +1,8 @@ Source: liferea Section: web Priority: optional -Maintainer: David Michael Smith +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: David Michael Smith Uploaders: Emilio Pozuelo Monfort , Paul Gevers Build-Depends: debhelper (>= 9), @@ -15,11 +16,13 @@ libgtk-3-dev, libindicate-gtk3-dev, libjson-glib-dev, + libmessaging-menu-dev, libnotify-dev (>= 0.7.0), libpango1.0-dev, libpeas-dev, libsoup2.4-dev, libsqlite3-dev, + libunity-dev, libwebkitgtk-3.0-dev, libxml2-dev, libxslt1-dev, diff -Nru liferea-1.10.8/debian/patches/add_X-Ubuntu-Gettext-Domain.patch liferea-1.10.8/debian/patches/add_X-Ubuntu-Gettext-Domain.patch --- liferea-1.10.8/debian/patches/add_X-Ubuntu-Gettext-Domain.patch 1970-01-01 01:00:00.000000000 +0100 +++ liferea-1.10.8/debian/patches/add_X-Ubuntu-Gettext-Domain.patch 2014-03-30 15:46:19.000000000 +0200 @@ -0,0 +1,14 @@ +Description: add x-ubuntu-gettext-domain to .desktop file +Bug-Ubuntu: https://bugs.launchpad.net/bugs/514272 +Author: Marc Deslauriers +Last-Update: 2014-02-13 + +--- a/liferea.desktop.in ++++ b/liferea.desktop.in +@@ -10,5 +10,6 @@ + Terminal=false + Type=Application + Categories=Network;Feed; ++X-Ubuntu-Gettext-Domain=liferea + Version=0.9.4 + MimeType=application/rss+xml;application/atom+xml;application/rdf+xml; diff -Nru liferea-1.10.8/debian/patches/libunity.patch liferea-1.10.8/debian/patches/libunity.patch --- liferea-1.10.8/debian/patches/libunity.patch 1970-01-01 01:00:00.000000000 +0100 +++ liferea-1.10.8/debian/patches/libunity.patch 2014-03-30 15:46:59.000000000 +0200 @@ -0,0 +1,200 @@ +Description: Enable Unity support +Origin: Ubuntu +Bug-Ubuntu: https://bugs.launchpad.net/bugs/732848 +Forwarded: no +Author: Jean-Philippe Orsini +Reviewed-By: Ken VanDine +Last-Update: 2014-02-13 + +--- a/configure.ac ++++ b/configure.ac +@@ -24,6 +24,7 @@ + + AC_ARG_ENABLE(libnotify, AS_HELP_STRING([--disable-libnotify],[compile without libnotify support]),,enable_libnotify=yes) + AC_ARG_ENABLE(libindicate, AS_HELP_STRING([--disable-libindicate],[compile without libindicate support]),,enable_libindicate=yes) ++AC_ARG_ENABLE(libunity, AS_HELP_STRING([--disable-libunity],[compile without libunity support]),,enable_libunity=yes) + + AC_CHECK_FUNCS([strsep]) + +@@ -72,6 +73,24 @@ + + AM_CONDITIONAL(WITH_LIBINDICATE, test "x$enable_libindicate" = "xyes") + ++dnl ********* ++dnl libunity ++dnl ********* ++ ++if test "x$enable_libunity" = "xyes"; then ++ PKG_CHECK_MODULES([LIBUNITY], unity >= 3.4.2,enable_libunity=yes,enable_libunity=no) ++ AC_SUBST(LIBUNITY_CFLAGS) ++ AC_SUBST(LIBUNITY_LIBS) ++else ++ enable_libunity=no ++fi ++ ++if test "x$enable_libunity" = "xyes"; then ++ AC_DEFINE(HAVE_LIBUNITY, 1, [Define if libunity support is enabled]) ++fi ++ ++AM_CONDITIONAL(WITH_LIBUNITY, test "x$enable_libunity" = "xyes") ++ + ################################################################################ + # Mandatory library dependencies + +@@ -151,6 +170,7 @@ + echo + echo "Use libnotify................... : $enable_libnotify" + echo "Use libindicate................. : $enable_libindicate" ++echo "Use libunity.................... : $enable_libunity" + echo + eval eval echo Liferea will be installed in $bindir. + echo +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -88,6 +88,12 @@ + + endif + ++if WITH_LIBUNITY ++ ++liferea_LDADD += $(LIBUNITY_LIBS) ++ ++endif ++ + -include $(INTROSPECTION_MAKEFILE) + INTROSPECTION_GIRS = Liferea-3.0.gir + +--- /dev/null ++++ b/src/ui/ui_unity.h +@@ -0,0 +1,29 @@ ++/* ++ * Copyright (C) 2011 Jean-Philippe Orsini ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation; either version 2 of the License, or ++ * (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU Library General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, write to the Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor Boston, MA 02110-1301, USA ++ */ ++ ++#ifndef _UI_UNITY_H ++#define _UI_UNITY_H ++ ++#ifdef HAVE_CONFIG_H ++ #include ++#endif ++ ++void ui_unity_update (); ++void ui_unity_destroy (); ++ ++#endif /* _UI_UNITY_H */ +--- a/src/ui/ui_tray.c ++++ b/src/ui/ui_tray.c +@@ -197,6 +197,7 @@ + gchar *msg, *tmp; + + ui_indicator_update (); ++ ui_unity_update(); + + if (!trayIcon_priv) + return; +--- /dev/null ++++ b/src/ui/ui_unity.c +@@ -0,0 +1,62 @@ ++/* ++ * Copyright (C) 2011 Jean-Philippe Orsini ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation; either version 2 of the License, or ++ * (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU Library General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, write to the Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor Boston, MA 02110-1301, USA ++ */ ++ ++#include "ui_unity.h" ++ ++#ifdef HAVE_LIBUNITY ++ ++#include ++ ++#include ++ ++static UnityLauncherEntry *entry; ++ ++void ui_unity_update (void) ++{ ++ int count; ++ ++ if (!entry) ++ entry = unity_launcher_entry_get_for_desktop_file ++ ("liferea.desktop"); ++ ++ if (entry) { ++ count = feedlist_get_unread_item_count (); ++ ++ if (count) { ++ unity_launcher_entry_set_count (entry, count); ++ unity_launcher_entry_set_count_visible (entry, TRUE); ++ } else { ++ unity_launcher_entry_set_count_visible (entry, FALSE); ++ } ++ } ++} ++ ++void ui_unity_destroy (void) ++{ ++ if (entry) { ++ unity_launcher_entry_set_count_visible (entry, FALSE); ++ g_main_context_iteration(NULL, FALSE); ++ } ++} ++ ++#else ++ ++void ui_unity_update (void) {} ++void ui_unity_destroy (void) {} ++ ++#endif /* HAVE_LIBUNITY */ +--- a/src/ui/liferea_shell.c ++++ b/src/ui/liferea_shell.c +@@ -1409,6 +1409,7 @@ + feed_list_view_select (NULL); // FIXME: Move to feed list handling + + liferea_shell_save_position (); ++ ui_unity_destroy (); + ui_tray_enable (FALSE); + g_object_unref (shell->priv->tabs); + g_object_unref (shell->priv->feedlist); +--- a/src/ui/Makefile.am ++++ b/src/ui/Makefile.am +@@ -8,7 +8,7 @@ + + noinst_LIBRARIES = libliui.a + +-libliui_a_CFLAGS = $(PACKAGE_CFLAGS) $(LIBINDICATE_CFLAGS) ++libliui_a_CFLAGS = $(PACKAGE_CFLAGS) $(LIBINDICATE_CFLAGS) $(LIBUNITY_CFLAGS) + libliui_a_SOURCES = \ + auth_dialog.c auth_dialog.h \ + browser_tabs.c browser_tabs.h \ +@@ -36,4 +36,5 @@ + ui_folder.c ui_folder.h \ + ui_indicator.c ui_indicator.h \ + ui_tray.c ui_tray.h \ ++ ui_unity.c ui_unity.h \ + ui_update.c ui_update.h diff -Nru liferea-1.10.8/debian/patches/port-to-messaging-menu.patch liferea-1.10.8/debian/patches/port-to-messaging-menu.patch --- liferea-1.10.8/debian/patches/port-to-messaging-menu.patch 1970-01-01 01:00:00.000000000 +0100 +++ liferea-1.10.8/debian/patches/port-to-messaging-menu.patch 2014-03-30 15:46:19.000000000 +0200 @@ -0,0 +1,321 @@ +Description: port to messaging menu +Author: Dmitrijs Ledkovs +Bug-Ubuntu: https://bugs.launchpad.net/bugs/1040259 +Last-Update: 2014-02-13 + +--- a/configure.ac ++++ b/configure.ac +@@ -23,7 +23,7 @@ + GLIB_GSETTINGS + + AC_ARG_ENABLE(libnotify, AS_HELP_STRING([--disable-libnotify],[compile without libnotify support]),,enable_libnotify=yes) +-AC_ARG_ENABLE(libindicate, AS_HELP_STRING([--disable-libindicate],[compile without libindicate support]),,enable_libindicate=yes) ++AC_ARG_ENABLE(messaging-menu, AS_HELP_STRING([--disable-messaging-menu],[compile without messaging-menu support]),,enable_messaging_menu=yes) + AC_ARG_ENABLE(libunity, AS_HELP_STRING([--disable-libunity],[compile without libunity support]),,enable_libunity=yes) + + AC_CHECK_FUNCS([strsep]) +@@ -48,30 +48,22 @@ + AM_CONDITIONAL(WITH_LIBNOTIFY, test "x$enable_libnotify" = "xyes") + + dnl ********* +-dnl libindicate ++dnl messaging-menu + dnl ********* + +-if test "x$enable_libindicate" = "xyes"; then +- dnl Try 0.7 first +- PKG_CHECK_MODULES([LIBINDICATE], indicate-0.7 indicate-gtk3-0.7,enable_libindicate=yes,enable_libindicate=no) +- AC_SUBST(LIBINDICATE_CFLAGS) +- AC_SUBST(LIBINDICATE_LIBS) +- +- dnl But 0.6 will also do... +- if test "x$enable_libindicate" = "xno"; then +- PKG_CHECK_MODULES([LIBINDICATE], indicate-0.6 indicate-gtk3-0.6,enable_libindicate=yes,enable_libindicate=no) +- AC_SUBST(LIBINDICATE_CFLAGS) +- AC_SUBST(LIBINDICATE_LIBS) +- fi ++if test "x$enable_messaging_menu" = "xyes"; then ++ PKG_CHECK_MODULES([MESSAGING_MENU], messaging-menu,enable_messaging_menu=yes,enable_messaging_menu=no) ++ AC_SUBST(MESSAGING_MENU_CFLAGS) ++ AC_SUBST(MESSAGING_MENU_LIBS) + else +- enable_libindicate=no ++ enable_messaging_menu=no + fi + +-if test "x$enable_libindicate" = "xyes"; then +- AC_DEFINE(HAVE_LIBINDICATE, 1, [Define if libindicate support is enabled]) ++if test "x$enable_messaging_menu" = "xyes"; then ++ AC_DEFINE(HAVE_MESSAGING_MENU, 1, [Define if messaging-menu support is enabled]) + fi + +-AM_CONDITIONAL(WITH_LIBINDICATE, test "x$enable_libindicate" = "xyes") ++AM_CONDITIONAL(WITH_MESSAGING_MENU, test "x$enable_messaging_menu" = "xyes") + + dnl ********* + dnl libunity +@@ -169,7 +161,7 @@ + echo "$PACKAGE $VERSION" + echo + echo "Use libnotify................... : $enable_libnotify" +-echo "Use libindicate................. : $enable_libindicate" ++echo "Use messaging-menu.............. : $enable_messaging_menu" + echo "Use libunity.................... : $enable_libunity" + echo + eval eval echo Liferea will be installed in $bindir. +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -82,9 +82,9 @@ + + endif + +-if WITH_LIBINDICATE ++if WITH_MESSAGING_MENU + +-liferea_LDADD += $(LIBINDICATE_LIBS) ++liferea_LDADD += $(MESSAGING_MENU_LIBS) + + endif + +--- a/src/ui/Makefile.am ++++ b/src/ui/Makefile.am +@@ -8,7 +8,7 @@ + + noinst_LIBRARIES = libliui.a + +-libliui_a_CFLAGS = $(PACKAGE_CFLAGS) $(LIBINDICATE_CFLAGS) $(LIBUNITY_CFLAGS) ++libliui_a_CFLAGS = $(PACKAGE_CFLAGS) $(MESSAGING_MENU_CFLAGS) $(LIBUNITY_CFLAGS) + libliui_a_SOURCES = \ + auth_dialog.c auth_dialog.h \ + browser_tabs.c browser_tabs.h \ +--- a/src/ui/ui_indicator.c ++++ b/src/ui/ui_indicator.c +@@ -24,13 +24,10 @@ + + #include "ui_indicator.h" + +-#ifdef HAVE_LIBINDICATE ++#ifdef HAVE_MESSAGING_MENU + + #include +-#include +-#include +-#include +-#include ++#include + #include "feedlist.h" + #include "ui/feed_list_view.h" + #include "ui/liferea_shell.h" +@@ -39,15 +36,9 @@ + + /* The maximum number of feeds to display in the indicator menu. */ + #define MAX_INDICATORS 6 +-/* Whether Liferea should set the indicator menu to attention +- status whenever new feed items are downloaded. Since news feeds +- do not typically require the user's urgent attention, unlike +- mail and IM messages, this is set to false by default. */ +-#define SET_DRAW_ATTENTION FALSE + + static struct indicator_priv { +- IndicateServer *server; +- gboolean visible; ++ MessagingMenuApp *server; + GPtrArray *indicators; + } *indicator_priv = NULL; + +@@ -55,7 +46,7 @@ + The desktop file to initialize the indicator menu with. Resolves to + a string like "/usr/share/applications/liferea.desktop". + */ +-static const char *DESKTOP_FILE = PACKAGE_DATA_DIR G_DIR_SEPARATOR_S "applications" G_DIR_SEPARATOR_S "liferea.desktop"; ++static const char *DESKTOP_FILE = "liferea.desktop"; + + static void + remove_all_indicators () { +@@ -66,44 +57,18 @@ + Called when the main "Liferea" entry in the indicator menu is clicked. + */ + static void +-on_indicator_server_clicked (IndicateServer *server, gchar *type, gpointer user_data) ++on_indicator_server_clicked (MessagingMenuApp *server, gchar *source_id, gpointer user_data) + { + liferea_shell_present (); + remove_all_indicators (); + } + + /* +- Called when the indicator container applet is shown. +-*/ +-static void +-on_indicator_interest_added (IndicateServer *server, guint interest, gpointer user_data) +-{ +- if (interest != INDICATE_INTEREST_SERVER_SIGNAL) +- return; +- +- indicator_priv->visible = TRUE; +- ui_tray_update (); +-} +- +-/* +- Called when the indicator container applet is hidden. +-*/ +-static void +-on_indicator_interest_removed (IndicateServer *server, guint interest, gpointer user_data) +-{ +- if (interest != INDICATE_INTEREST_SERVER_SIGNAL) +- return; +- +- indicator_priv->visible = FALSE; +- ui_tray_update (); +-} +- +-/* + Called when the indicator menu entry for a specific feed + is clicked, meaning Liferea should switch to that feed. + */ + static void +-on_indicator_clicked (IndicateIndicator *indicator, guint timestamp, gpointer user_data) ++on_indicator_clicked (MessagingMenuApp *indicator, gchar *source_id, gpointer user_data) + { + feed_list_view_select ((nodePtr) user_data); + liferea_shell_present (); +@@ -116,8 +81,7 @@ + if (indicator_priv->server == NULL || indicator == NULL) + return; + +- indicate_server_remove_indicator (indicator_priv->server, INDICATE_INDICATOR(indicator)); +- g_object_unref (G_OBJECT (indicator)); ++ messaging_menu_app_remove_source (indicator_priv->server, (char *)(indicator)); + } + + void +@@ -127,18 +91,13 @@ + return; + + indicator_priv = g_new0 (struct indicator_priv, 1); +- indicator_priv->visible = FALSE; + indicator_priv->indicators = g_ptr_array_new_with_free_func (destroy_indicator); + +- indicator_priv->server = indicate_server_ref_default(); +- indicate_server_set_type (indicator_priv->server, "message.im"); +- indicate_server_set_desktop_file (indicator_priv->server, DESKTOP_FILE); +- +- g_signal_connect (G_OBJECT (indicator_priv->server), "server-display", G_CALLBACK (on_indicator_server_clicked), NULL); +- g_signal_connect (G_OBJECT (indicator_priv->server), "interest-added", G_CALLBACK (on_indicator_interest_added), NULL); +- g_signal_connect (G_OBJECT (indicator_priv->server), "interest-removed", G_CALLBACK (on_indicator_interest_removed), NULL); ++ indicator_priv->server = messaging_menu_app_new (DESKTOP_FILE); ++ messaging_menu_app_register (indicator_priv->server); ++ ++ g_signal_connect (G_OBJECT (indicator_priv->server), "activate-source", G_CALLBACK (on_indicator_server_clicked), NULL); + +- indicate_server_show (indicator_priv->server); + ui_indicator_update (); + } + +@@ -159,9 +118,10 @@ + static void + add_node_indicator (nodePtr node) + { +- IndicateIndicator *indicator; +- GdkPixbuf *pixbuf; ++ GFile *file; ++ GIcon *icon; + gchar count[10]; ++ gchar *signal; + + if (indicator_priv->indicators->len >= MAX_INDICATORS) + return; +@@ -176,30 +136,28 @@ + if (node->unreadCount == 0) + return; + +- indicator = indicate_indicator_new_with_server (indicator_priv->server); +- g_signal_connect (indicator, "user-display", G_CALLBACK (on_indicator_clicked), node); +- +- /* load favicon */ +- pixbuf = gdk_pixbuf_new_from_file (node->iconFile, NULL); ++ file = g_file_new_for_path (node->iconFile); ++ icon = g_file_icon_new (file); + +- /* display favicon */ +- indicate_gtk_indicator_set_property_icon (indicator, "icon", pixbuf); +- g_object_unref (pixbuf); +- +- sprintf (count, "%u", node->unreadCount); +- indicate_indicator_set_property (indicator, "name", node->title); +- indicate_indicator_set_property (indicator, "count", count); +-#if SET_DRAW_ATTENTION +- indicate_indicator_set_property_bool (indicator, "draw-attention", TRUE); +-#endif +- g_ptr_array_add (indicator_priv->indicators, indicator); ++ messaging_menu_app_append_source_with_count( ++ indicator_priv->server, ++ node->id, ++ icon, ++ node->title, ++ node->unreadCount); ++ ++ signal = g_strdup_printf("activate-source::%s", node->id); ++ g_signal_connect (indicator_priv->server, signal, G_CALLBACK (on_indicator_clicked), node); ++ g_ptr_array_add (indicator_priv->indicators, node->id); ++ ++ g_object_unref(icon); ++ g_object_unref(file); ++ g_free(signal); + } + + void + ui_indicator_update () + { +- guint index; +- + /* Do not update indicators if the user is interacting with the main window */ + if (!indicator_priv || gtk_window_is_active (GTK_WINDOW (liferea_shell_get_window ()))) + return; +@@ -208,16 +166,12 @@ + remove_all_indicators (); + /* ...then walk the tree and add an indicator for each unread feed */ + feedlist_foreach (add_node_indicator); +- +- /* revert order of items */ +- for (index = indicator_priv->indicators->len; index > 0; index--) +- indicate_indicator_show (g_ptr_array_index (indicator_priv->indicators, index - 1)); + } + + gboolean + ui_indicator_is_visible () + { +- return indicator_priv && indicator_priv->visible; ++ return TRUE; + } + +-#endif /* HAVE_LIBINDICATE */ ++#endif /* HAVE_MESSAGING_MENU */ +--- a/src/ui/ui_indicator.h ++++ b/src/ui/ui_indicator.h +@@ -23,7 +23,7 @@ + + #include + +-#ifdef HAVE_LIBINDICATE ++#ifdef HAVE_MESSAGING_MENU + + /** + * Setup indicator widget. +@@ -47,7 +47,7 @@ + */ + gboolean ui_indicator_is_visible (void); + +-#else /* HAVE_LIBINDICATE */ ++#else /* HAVE_MESSAGING_MENU */ + + /* + If Liferea is compiled without libindicate support, all indicator +@@ -60,6 +60,6 @@ + static inline void ui_indicator_update () {} + static inline gboolean ui_indicator_is_visible () { return FALSE; } + +-#endif /* HAVE_LIBINDICATE */ ++#endif /* HAVE_MESSAGING_MENU */ + + #endif /* _UI_INDICATOR_H */ diff -Nru liferea-1.10.8/debian/patches/series liferea-1.10.8/debian/patches/series --- liferea-1.10.8/debian/patches/series 2014-03-26 21:11:40.000000000 +0100 +++ liferea-1.10.8/debian/patches/series 2014-03-30 15:46:19.000000000 +0200 @@ -1,2 +1,6 @@ debian-example-feeds.patch www-browser.patch +ubuntu-example-feeds.patch +add_X-Ubuntu-Gettext-Domain.patch +libunity.patch +port-to-messaging-menu.patch diff -Nru liferea-1.10.8/debian/patches/ubuntu-example-feeds.patch liferea-1.10.8/debian/patches/ubuntu-example-feeds.patch --- liferea-1.10.8/debian/patches/ubuntu-example-feeds.patch 1970-01-01 01:00:00.000000000 +0100 +++ liferea-1.10.8/debian/patches/ubuntu-example-feeds.patch 2014-03-30 15:46:19.000000000 +0200 @@ -0,0 +1,246 @@ +Description: Let's put some Ubuntu English and localized feeds in the default feedlist. +Origin: Ubuntu +Author: Emilio Pozuelo Monfort +Bug-Ubuntu: https://bugs.launchpad.net/bugs/51604 +Forwarded: not-needed +Reviewed-By: bojo42 +Reviewed-By: Mattia Rizzolo +Last-Update: 2014-02-13 + +--- a/opml/feedlist_bg.opml ++++ b/opml/feedlist_bg.opml +@@ -19,8 +19,8 @@ + + + +- +- ++ ++ + + + +--- a/opml/feedlist_ca.opml ++++ b/opml/feedlist_ca.opml +@@ -24,8 +24,9 @@ + + + +- +- ++ ++ ++ + + + +--- a/opml/feedlist_de.opml ++++ b/opml/feedlist_de.opml +@@ -26,9 +26,9 @@ + + + +- +- +- ++ ++ ++ + + + +--- a/opml/feedlist_en.opml ++++ b/opml/feedlist_en.opml +@@ -13,9 +13,8 @@ + + + +- +- +- ++ ++ + + + +--- a/opml/feedlist_es.opml ++++ b/opml/feedlist_es.opml +@@ -21,9 +21,9 @@ + + + +- +- +- ++ ++ ++ + + + +--- a/opml/feedlist_eu.opml ++++ b/opml/feedlist_eu.opml +@@ -24,8 +24,8 @@ + + + +- +- ++ ++ + + + +--- a/opml/feedlist_fr.opml ++++ b/opml/feedlist_fr.opml +@@ -24,9 +24,9 @@ + + + +- +- +- ++ ++ ++ + + + +--- a/opml/feedlist_gl.opml ++++ b/opml/feedlist_gl.opml +@@ -19,9 +19,9 @@ + + + +- +- +- ++ ++ ++ + + + +--- a/opml/feedlist_he.opml ++++ b/opml/feedlist_he.opml +@@ -35,8 +35,8 @@ + + + +- +- ++ ++ + + + +--- a/opml/feedlist_hu.opml ++++ b/opml/feedlist_hu.opml +@@ -13,8 +13,8 @@ + + + +- +- ++ ++ + + + +--- a/opml/feedlist_it.opml ++++ b/opml/feedlist_it.opml +@@ -25,8 +25,9 @@ + + + +- +- ++ ++ ++ + + + +--- a/opml/feedlist_nl.opml ++++ b/opml/feedlist_nl.opml +@@ -13,8 +13,9 @@ + + + +- +- ++ ++ ++ + + + +--- a/opml/feedlist_pl.opml ++++ b/opml/feedlist_pl.opml +@@ -20,8 +20,9 @@ + + + +- +- ++ ++ ++ + + + +--- a/opml/feedlist_pt.opml ++++ b/opml/feedlist_pt.opml +@@ -31,9 +31,8 @@ + + + +- +- +- ++ ++ + + + +--- a/opml/feedlist_pt_BR.opml ++++ b/opml/feedlist_pt_BR.opml +@@ -18,9 +18,9 @@ + + + +- +- +- ++ ++ ++ + + + +--- a/opml/feedlist_sk.opml ++++ b/opml/feedlist_sk.opml +@@ -15,8 +15,8 @@ + + + +- +- ++ ++ + + + +--- a/opml/feedlist_sv.opml ++++ b/opml/feedlist_sv.opml +@@ -22,8 +22,8 @@ + + + +- +- ++ ++ + + + diff -Nru liferea-1.10.8/debian/rules liferea-1.10.8/debian/rules --- liferea-1.10.8/debian/rules 2014-03-26 21:11:40.000000000 +0100 +++ liferea-1.10.8/debian/rules 2014-03-30 15:46:19.000000000 +0200 @@ -20,6 +20,7 @@ --mandir=\$${prefix}/share/man \ --sysconfdir=/etc \ --enable-libnotify \ + --enable-messaging-menu \ --disable-silent-rules override_dh_installdocs: