Source: qxmpp
Version: 0.3.0-1
Tags: patch
User: [email protected]
Usertags: qt48-transition

Hi,

Your package fails to build against the multiarch enabled Qt 4.8
which is currently in experimental.
The transition to unstable/testing is tracked in bug #653903.

I'm attaching a patch that adjusts the install path of the library, fixes
the pkg-config file to point to the multiarch libdir and sets a minimum
libqt4-dev version.
It should be applied once Qt 4.8 enters unstable.

Build log:

> dh_install -plibqxmpp-dev  
> cp: cannot stat `debian/tmp/usr/lib/libqxmpp.a': No such file or directory
> dh_install: cp -a debian/tmp/usr/lib/libqxmpp.a debian/libqxmpp-dev//usr/lib/ 
> returned exit code 1
> make: *** [binary-install/libqxmpp-dev] Error 2

Regards,
Felix

diff -Nru qxmpp-0.3.0/debian/control qxmpp-0.3.0/debian/control
--- qxmpp-0.3.0/debian/control	2010-08-10 20:00:33.000000000 +0200
+++ qxmpp-0.3.0/debian/control	2012-03-06 11:48:05.000000000 +0100
@@ -2,7 +2,7 @@
 Section: libs
 Priority: optional
 Maintainer: Jeremy Lainé <[email protected]>
-Build-Depends: cdbs, debhelper (>= 7.0), libqt4-dev
+Build-Depends: cdbs, debhelper (>= 7.0), libqt4-dev (>= 4:4.8.0)
 Standards-Version: 3.9.1
 Homepage: http://code.google.com/p/qxmpp/
 Vcs-Svn: svn://svn.debian.org/collab-maint/deb-maint/qxmpp/trunk/
diff -Nru qxmpp-0.3.0/debian/libqxmpp-dev.install qxmpp-0.3.0/debian/libqxmpp-dev.install
--- qxmpp-0.3.0/debian/libqxmpp-dev.install	2010-08-10 16:01:25.000000000 +0200
+++ qxmpp-0.3.0/debian/libqxmpp-dev.install	2012-03-06 11:47:44.000000000 +0100
@@ -1,3 +1,3 @@
 usr/include/
-usr/lib/libqxmpp.a
-usr/lib/pkgconfig/qxmpp.pc
+usr/lib/*/libqxmpp.a
+usr/lib/*/pkgconfig/qxmpp.pc
diff -Nru qxmpp-0.3.0/debian/patches/pkgconfig_install_patch.diff qxmpp-0.3.0/debian/patches/pkgconfig_install_patch.diff
--- qxmpp-0.3.0/debian/patches/pkgconfig_install_patch.diff	1970-01-01 01:00:00.000000000 +0100
+++ qxmpp-0.3.0/debian/patches/pkgconfig_install_patch.diff	2012-03-06 11:47:44.000000000 +0100
@@ -0,0 +1,15 @@
+Description: Install the pkgconfig file into multi-arch dir and set LIBDIR correctly.
+Author: Felix Geyer <[email protected]>
+
+--- qxmpp-0.3.0.orig/src/src.pro
++++ qxmpp-0.3.0/src/src.pro
+@@ -164,7 +164,8 @@ SOURCES += \
+ 
+ # pkg-config support
+ CONFIG += create_pc create_prl no_install_prl
+-QMAKE_PKGCONFIG_DESTDIR = $$QXMPP_LIBRARY_DIR/pkgconfig
++QMAKE_PKGCONFIG_DESTDIR = pkgconfig
++QMAKE_PKGCONFIG_LIBDIR = $$[QT_INSTALL_LIBS]
+ 
+ # Installation
+ headers.files = $$INSTALL_HEADERS
diff -Nru qxmpp-0.3.0/debian/patches/series qxmpp-0.3.0/debian/patches/series
--- qxmpp-0.3.0/debian/patches/series	1970-01-01 01:00:00.000000000 +0100
+++ qxmpp-0.3.0/debian/patches/series	2012-03-06 11:47:44.000000000 +0100
@@ -0,0 +1 @@
+pkgconfig_install_patch.diff

Reply via email to