← Back to branch summary

~ubuntu-branches/ubuntu/vivid/liferea/vivid-proposed

« back to all changes in this revision

Viewing changes to debian/patches/libindicate_increase_version.patch

  • Committer: Package Import Robot
  • Author(s): bojo42
  • Date: 2012-03-29 14:17:21 UTC
  • mfrom: (1.3.9) (3.2.5 sid)
  • Revision ID: package-import@ubuntu.com-20120329141721-tbfopcrc5797wxt7
Tags: 1.8.3-0.1ubuntu1
https://launchpad.net/bugs/290666
https://launchpad.net/bugs/371754
https://launchpad.net/bugs/741543
https://launchpad.net/bugs/716688
https://launchpad.net/bugs/935147
* 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

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/libindicate_increase_version.patch
 
1
Description: Increase indicate version for current Ubuntu releases
 
2
Origin: Ubuntu
 
3
Forwarded: no
 
4
Reviewed-By: bojo42@gmail
 
5
Last-Update: 2012-02-19
 
6
 
 
7
--- liferea-1.8.0.orig/configure.ac
 
8
+++ liferea-1.8.0/configure.ac
 
9
@@ -65,7 +65,7 @@ dnl libindicate
 
10
 dnl *********
 
11
 
 
12
 if test "x$enable_libindicate" = "xyes"; then
 
13
-   PKG_CHECK_MODULES([LIBINDICATE], indicate-0.5 indicate-gtk-0.5,enable_libindicate=yes,enable_libindicate=no)
 
14
+   PKG_CHECK_MODULES([LIBINDICATE], indicate-0.7 indicate-gtk-0.7,enable_libindicate=yes,enable_libindicate=no)
 
15
    AC_SUBST(LIBINDICATE_CFLAGS)
 
16
    AC_SUBST(LIBINDICATE_LIBS)
 
17
 else