diff -u tulip-3.1.2/debian/changelog tulip-3.1.2/debian/changelog --- tulip-3.1.2/debian/changelog +++ tulip-3.1.2/debian/changelog @@ -1,3 +1,10 @@ +tulip (3.1.2-2.3ubuntu3) oneiric; urgency=low + + * debian/rules: Use Qt4 multiarch lib location. Fixes FTBFS. + (LP: #832796) + + -- Daniel T Chen Sun, 18 Sep 2011 19:39:49 -0400 + tulip (3.1.2-2.3ubuntu2) natty; urgency=low * debian/patches/05-ftbfs_gcc45: Fix FTBFS with gcc4.5 diff -u tulip-3.1.2/debian/rules tulip-3.1.2/debian/rules --- tulip-3.1.2/debian/rules +++ tulip-3.1.2/debian/rules @@ -12,6 +12,7 @@ LIBTULIP_SOVERSION=$(shell echo $(TULIP_VERSION) | cut -d. -f1-2) ARCH=$(shell dpkg-architecture -qDEB_BUILD_ARCH) +DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) # This has to be exported to make some magic below work. export DH_OPTIONS @@ -24,7 +25,8 @@ --enable-tlprender --enable-stats-gui \ --with-qt-dir=/usr/share/qt4 --prefix=/usr \ --with-gle-includes=-I/usr/include/GL --with-gle-lib=-lgle \ - --disable-static --with-pic + --disable-static --with-pic \ + --with-qt-libraries=/usr/lib/$(DEB_HOST_MULTIARCH) # --with-ftgl-includes=-I/usr/include/FTGL --with-ftgl-lib=-lftgl_pic