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

[Adeodato Simó]

Author: adeodato
Date: 2005-07-20 00:08:33 +0000 (Wed, 20 Jul 2005)
New Revision: 1337

Modified:
   trunk/packages/qt-x11-free/debian/changelog
   trunk/packages/qt-x11-free/debian/control
   trunk/packages/qt-x11-free/debian/rules
Log:
Disable InterBase support because it hasn't done the C++ ABI transition
yet (and can't because the package FTBFS with g++ 4.0).


Modified: trunk/packages/qt-x11-free/debian/changelog
===================================================================
--- trunk/packages/qt-x11-free/debian/changelog	2005-07-19 23:43:11 UTC (rev 1336)
+++ trunk/packages/qt-x11-free/debian/changelog	2005-07-20 00:08:33 UTC (rev 1337)
@@ -31,11 +31,20 @@
     + debian/*.install, debian/*.links:
       - renamed as appropriate.
 
-    TODO: disable firebird2 support.
-
     The above solves trouble for users when using qt3-designer with g++ 4.0,
     so this upload closes: #317768.
 
+    Also, disabling InterBase support has been necessary in this upload,
+    because nobody has cared to make firebird2 not FTBFS with g++ 4.0. Dropped
+    the libqt3-ibase and libqt3-mt-ibase packages, which can be reintroduced
+    as soon as #317314 gets fixed.
+
+      + debian/control:
+        - don't build-depend on firebird2-dev.
+
+      + debian/rules:
+        - unconditionally use -no-sql-ibase and -Nlibqt3{,-mt}-ibase.
+
   * Transition to the new X.org packages:
     + debian/control:
       - build-depend in libglu1-xorg-dev instead of xlibmesa-glu-dev; make the

Modified: trunk/packages/qt-x11-free/debian/control
===================================================================
--- trunk/packages/qt-x11-free/debian/control	2005-07-19 23:43:11 UTC (rev 1336)
+++ trunk/packages/qt-x11-free/debian/control	2005-07-20 00:08:33 UTC (rev 1337)
@@ -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 freeshell.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), 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), libxrender-dev, libxcursor-dev, firebird2-dev [i386 hurd-i386 kfreebsd-i386 knetbsd-i386 netbsd-i386], libsqlite0-dev, libxinerama-dev, libxkbfile-dev
+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), 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), libxrender-dev, libxcursor-dev, libsqlite0-dev, libxinerama-dev, libxkbfile-dev
 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-07-19 23:43:11 UTC (rev 1336)
+++ trunk/packages/qt-x11-free/debian/rules	2005-07-20 00:08:33 UTC (rev 1337)
@@ -89,6 +89,9 @@
 	IBASE = -Nlibqt3-ibase -Nlibqt3-mt-ibase
 else
 	IBASE =
+	# Completely disable InterBase support because of #317314.
+	CONFIGURE_OPTS += -no-sql-ibase
+	IBASE = -Nlibqt3-ibase -Nlibqt3-mt-ibase
 endif
 
 ifeq ($(DEB_HOST_ARCH),arm)