[Pkg-kde-commits] rev 1822 - trunk/packages/qt-x11-free/debian

[Christopher Martin]

Author: chrsmrtn
Date: 2005-09-17 22:05:51 +0000 (Sat, 17 Sep 2005)
New Revision: 1822

Modified:
   trunk/packages/qt-x11-free/debian/changelog
   trunk/packages/qt-x11-free/debian/control
   trunk/packages/qt-x11-free/debian/rules
Log:
Add amd64 to the ibase archs.


Modified: trunk/packages/qt-x11-free/debian/changelog
===================================================================
--- trunk/packages/qt-x11-free/debian/changelog	2005-09-17 21:31:09 UTC (rev 1821)
+++ trunk/packages/qt-x11-free/debian/changelog	2005-09-17 22:05:51 UTC (rev 1822)
@@ -1,3 +1,11 @@
+qt-x11-free (3:3.3.5-2) UNRELEASED; urgency=low
+
+  +++ Changes by Christopher Martin:
+
+  * Build the InterBase plugin on amd64, now that firebird2 builds there.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Date
+
 qt-x11-free (3:3.3.5-1) unstable; urgency=low
 
   * New upstream release. Drop patches merged upstream, and sync those that

Modified: trunk/packages/qt-x11-free/debian/control
===================================================================
--- trunk/packages/qt-x11-free/debian/control	2005-09-17 21:31:09 UTC (rev 1821)
+++ trunk/packages/qt-x11-free/debian/control	2005-09-17 22:05:51 UTC (rev 1822)
@@ -1,7 +1,7 @@
 Source: qt-x11-free
 Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 Uploaders: Martin Loschwitz <madkiss at debian.org>, Christopher Martin <chrsmrtn at debian.org>, Adeodato Simó <asp16 at alu.ua.es>
-Build-Depends: debhelper (>= 4.1.26), xlibs-static-dev (>= 4.3.0.dfsg.1-4), libxext-dev (>= 4.3.0.dfsg.1-4), libxrandr-dev (>= 4.3.0.dfsg.1-4), x-dev (>= 4.3.0.dfsg.1-4), libsm-dev (>= 4.3.0.dfsg.1-4), libxmu-dev (>= 4.3.0.dfsg.1-4), libice-dev (>= 4.3.0.dfsg.1-4), libx11-dev (>= 4.3.0.dfsg.1-4), libxt-dev (>= 4.3.0.dfsg.1-4), libxrender-dev, libxcursor-dev, libxinerama-dev, libxkbfile-dev, libxi-dev, libjpeg62-dev, zlib1g-dev, libmng-dev (>= 1.0.3), libpng12-dev | libpng12-0-dev, libfreetype6-dev, libiodbc2-dev (>= 3.51.2-4), libmysqlclient12-dev | libmysqlclient-dev, flex, libpq-dev, libaudio-dev, libcupsys2-dev, xlibmesa-gl-dev | libgl-dev, libglu1-xorg-dev | libglu1-mesa-dev | libglu-dev, libxft-dev, dpatch (>= 1.13), libsqlite0-dev, firebird2-dev [i386 hurd-i386 kfreebsd-i386 knetbsd-i386 netbsd-i386]
+Build-Depends: debhelper (>= 4.1.26), xlibs-static-dev (>= 4.3.0.dfsg.1-4), libxext-dev (>= 4.3.0.dfsg.1-4), libxrandr-dev (>= 4.3.0.dfsg.1-4), x-dev (>= 4.3.0.dfsg.1-4), libsm-dev (>= 4.3.0.dfsg.1-4), libxmu-dev (>= 4.3.0.dfsg.1-4), libice-dev (>= 4.3.0.dfsg.1-4), libx11-dev (>= 4.3.0.dfsg.1-4), libxt-dev (>= 4.3.0.dfsg.1-4), libxrender-dev, libxcursor-dev, libxinerama-dev, libxkbfile-dev, libxi-dev, libjpeg62-dev, zlib1g-dev, libmng-dev (>= 1.0.3), libpng12-dev | libpng12-0-dev, libfreetype6-dev, libiodbc2-dev (>= 3.51.2-4), libmysqlclient12-dev | libmysqlclient-dev, flex, libpq-dev, libaudio-dev, libcupsys2-dev, xlibmesa-gl-dev | libgl-dev, libglu1-xorg-dev | libglu1-mesa-dev | libglu-dev, libxft-dev, dpatch (>= 1.13), libsqlite0-dev, firebird2-dev [i386 hurd-i386 kfreebsd-i386 knetbsd-i386 netbsd-i386 amd64]
 Section: libs
 Priority: optional
 Standards-Version: 3.6.2

Modified: trunk/packages/qt-x11-free/debian/rules
===================================================================
--- trunk/packages/qt-x11-free/debian/rules	2005-09-17 21:31:09 UTC (rev 1821)
+++ trunk/packages/qt-x11-free/debian/rules	2005-09-17 22:05:51 UTC (rev 1822)
@@ -86,7 +86,8 @@
 		-lfontconfig			\
 		# End of CONFIGURE_OPTS
 
-ifneq ($(DEB_HOST_ARCH_CPU),i386)
+interbase_archs := i386 amd64
+ifneq ($(DEB_HOST_ARCH_CPU),$(findstring $(DEB_HOST_ARCH_CPU),$(interbase_archs)))
 	CONFIGURE_OPTS += -no-sql-ibase
 	IBASE = -Nlibqt3-mt-ibase
 else