Merge lp:~l3on/ubuntu/precise/pino/fix-ftbfs into lp:ubuntu/precise/pino

[Leo Iannacone]

New patch to add explicit declaration for gthread libraries in CMakeLists.

This fixes FTBFS.

[Andreas Moog (ampelbein)]

This got fixed in debian: http://packages.qa.debian.org/p/pino/news/20120219T152151Z.html, so I'll sync this package over (with credit to you, of course).

review: Disapprove

[Leo Iannacone (l3on)]

Ok, thanks Andreas!

=== modified file '.pc/applied-patches'
--- .pc/applied-patches	2011-06-13 08:17:14 +0000
+++ .pc/applied-patches	2012-02-19 14:26:19 +0000
@@ -4,3 +4,4 @@
 010_construct-only-properties.diff
 011_get_style_property-fix.diff
 012_libnotify-0.7.diff
+013_include-gthread.diff

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2011-06-13 08:17:14 +0000
+++ CMakeLists.txt	2012-02-19 14:26:19 +0000
@@ -59,6 +59,7 @@
 pkg_check_modules(LIBUNIQUE REQUIRED "unique-1.0 >= 1.0")
 pkg_check_modules(GTKSPELL REQUIRED "gtkspell-2.0 >= 2.0")
 pkg_check_modules(LIBINDICATE "indicate >= 0.3")
+pkg_check_modules(GTHREAD REQUIRED "gthread-2.0 >= 2.14.0")
 
 set(pino_VALA_OPTIONS ${pino_VALA_OPTIONS} --thread)
 
@@ -131,6 +132,7 @@
   ${LIBUNIQUE_LIBRARIES}
   ${GTKSPELL_LIBRARIES}
   ${LIBINDICATE_LIBRARIES}
+  ${GTHREAD_LIBRARIES}
 )
 
 include_directories(src/vapi/)

=== modified file 'debian/changelog'
--- debian/changelog	2011-07-31 08:08:02 +0000
+++ debian/changelog	2012-02-19 14:26:19 +0000
@@ -1,3 +1,9 @@
+pino (0.2.11-9ubuntu1) precise; urgency=low
+
+  * Add support for gthread-2.0, fixes FTBFS (LP: #931691).
+
+ -- Leo Iannacone <[e-mail]>  Sun, 19 Feb 2012 12:12:53 +0100
+
 pino (0.2.11-9) unstable; urgency=low
 
   * Upload to unstable 

=== modified file 'debian/control'
--- debian/control	2011-07-31 08:08:02 +0000
+++ debian/control	2012-02-19 14:26:19 +0000
@@ -1,7 +1,8 @@
 Source: pino
 Section: net
 Priority: optional
-Maintainer: Julien Valroff <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Julien Valroff <[e-mail]>
 Standards-Version: 3.9.2
 Build-Depends: debhelper (>= 8),
                cmake (>= 2.6.0),

=== added file 'debian/patches/013_include-gthread.diff'
--- debian/patches/013_include-gthread.diff	1970-01-01 00:00:00 +0000
+++ debian/patches/013_include-gthread.diff	2012-02-19 14:26:19 +0000
@@ -0,0 +1,26 @@
+Description: Add explicit declaration for gthread libraries. Fixes FTBFS.
+Author: Leo Iannacone <[e-mail]>
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/931691
+
+---
+ CMakeLists.txt |    2 ++
+ 1 file changed, 2 insertions(+)
+
+--- pino.orig/CMakeLists.txt
++++ pino/CMakeLists.txt
+@@ -59,6 +59,7 @@ pkg_check_modules(WEBKIT REQUIRED "webki
+ pkg_check_modules(LIBUNIQUE REQUIRED "unique-1.0 >= 1.0")
+ pkg_check_modules(GTKSPELL REQUIRED "gtkspell-2.0 >= 2.0")
+ pkg_check_modules(LIBINDICATE "indicate >= 0.3")
++pkg_check_modules(GTHREAD REQUIRED "gthread-2.0 >= 2.14.0")
+ 
+ set(pino_VALA_OPTIONS ${pino_VALA_OPTIONS} --thread)
+ 
+@@ -131,6 +132,7 @@ link_libraries(
+   ${LIBUNIQUE_LIBRARIES}
+   ${GTKSPELL_LIBRARIES}
+   ${LIBINDICATE_LIBRARIES}
++  ${GTHREAD_LIBRARIES}
+ )
+ 
+ include_directories(src/vapi/)

=== modified file 'debian/patches/series'
--- debian/patches/series	2011-06-13 08:17:14 +0000
+++ debian/patches/series	2012-02-19 14:26:19 +0000
@@ -4,3 +4,4 @@
 010_construct-only-properties.diff
 011_get_style_property-fix.diff
 012_libnotify-0.7.diff
+013_include-gthread.diff