[SCM] hydrogen/master: Set QTDIR during build: according to upstream INSTALL.txt this avoids potential clash with Qt3.

js at users.alioth.debian.org js at users.alioth.debian.org
Fri Mar 18 00:59:28 UTC 2011


The following commit has been merged in the master branch:
commit 09bbe4ead4f692cb955d93de4ff2c50a15f10d8e
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Thu Mar 17 21:17:00 2011 +0100

    Set QTDIR during build: according to upstream INSTALL.txt this avoids potential clash with Qt3.

diff --git a/debian/rules b/debian/rules
index c33ca8f..20e7b82 100755
--- a/debian/rules
+++ b/debian/rules
@@ -25,6 +25,9 @@ DEB_UPSTREAM_URL = http://downloads.sourceforge.net/hydrogen
 
 DEB_COPYRIGHT_CHECK_IGNORE_REGEX = ^.*\.(flac|png|qm)|debian/(changelog|copyright(|_hints|_newhints))$
 
+# according to upstream INSTALL.txt this avoids potential clash with Qt3
+export QTDIR=/usr/share/qt4
+
 DEB_SCONS_OPTIONS = libarchive=1 portaudio=1 portmidi=1 lash=1 prefix=/usr
 DEB_SCONS_OPTIONS += optflags="$(CXXFLAGS)"
 

-- 
hydrogen packaging



More information about the pkg-multimedia-commits mailing list