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

[Leo Iannacone]

Added a check on gthread-2.0. Patch taken from upstream.

[Daniel Holbach (dholbach)]

Sorry. It seems like Daniel Chen already fixed this bug. I'm going to mark this merge proposal as rejected. https://bugs.launchpad.net/ubuntu/+source/rawstudio/+bug/935406/comments/1

Good work on the solution nonetheless.

[Benjamin Kerensa (bkerensa)]

review: Disapprove

Unmerged revisions

27. By Leo Iannacone on 2012-02-27

Linking gthread-2.0 during build (LP: #935406).

=== modified file 'debian/changelog'
--- debian/changelog	2011-10-30 11:58:38 +0000
+++ debian/changelog	2012-02-27 00:32:18 +0000
@@ -1,3 +1,9 @@
+rawstudio (2.0-1ubuntu1) precise; urgency=low
+
+  * Linking gthread-2.0 during build (LP: #935406).
+
+ -- Leo Iannacone <[e-mail]>  Mon, 27 Feb 2012 00:44:13 +0100
+
 rawstudio (2.0-1build1) precise; urgency=low
 
   * Rebuild for libexiv2-11.
 
=== modified file 'debian/control'
--- debian/control	2011-07-28 17:36:32 +0000
+++ debian/control	2012-02-27 00:32:18 +0000
@@ -1,7 +1,8 @@
 Source: rawstudio
 Section: graphics
 Priority: optional
-Maintainer:  Debian PhotoTools Maintainers <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer:  Debian PhotoTools Maintainers <[e-mail]>
 Uploaders: Bernd Zeimetz <[e-mail]>
 Build-Depends: debhelper (>= 7.2.14), autotools-dev (>= 20100122.1), dh-autoreconf, libdbus-1-dev, libexiv2-dev, libgconf2-dev, libgtk2.0-dev, liblcms1-dev, libjpeg8-dev, libtiff4-dev, libxml2-dev, quilt (>= 0.46-7), libfftw3-dev, liblensfun-dev, libcurl4-gnutls-dev, libflickcurl-dev, libsqlite3-dev, libgphoto2-2-dev
 Standards-Version: 3.8.3
 
=== added file 'debian/patches/add-gthread-reference.patch'
--- debian/patches/add-gthread-reference.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/add-gthread-reference.patch	2012-02-27 00:32:18 +0000
@@ -0,0 +1,20 @@
+Description: Add -lgthread-2.0 during build. Patch stolen from upstream.
+Author: Leo Iannacone <[e-mail]>
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/935406
+Forwarded: no
+
+---
+ configure.in |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- rawstudio.orig/configure.in
++++ rawstudio/configure.in
+@@ -83,7 +83,7 @@ AC_CHECK_LIB(tiff, TIFFOpen, tiff_ok=yes
+ fi
+ AC_SUBST(LIBTIFF)
+ 
+-pkg_modules="gtk+-2.0 >= 2.8.0 libxml-2.0 >= 2.4 gconf-2.0 >= 2.0 lcms dbus-1 exiv2 fftw3f lensfun libcurl flickcurl sqlite3 libgphoto2 x11"
++pkg_modules="gtk+-2.0 >= 2.8.0 libxml-2.0 >= 2.4 gconf-2.0 >= 2.0 lcms dbus-1 exiv2 fftw3f lensfun libcurl flickcurl sqlite3 libgphoto2 x11 gthread-2.0"
+ PKG_CHECK_MODULES(PACKAGE, [$pkg_modules])
+ AC_SUBST(PACKAGE_CFLAGS)
+ AC_SUBST(PACKAGE_LIBS)
 
=== modified file 'debian/patches/series'
--- debian/patches/series	2011-07-28 17:36:32 +0000
+++ debian/patches/series	2012-02-27 00:32:18 +0000
@@ -1,2 +1,3 @@
 0001-Remove-libssl-requirement-from-configure.patch
 0002-Fix-the-plugin-directory-path.patch
+add-gthread-reference.patch