rev 7121 - in trunk/packages/qt-x11-free/debian: . patches

[Ana Beatriz Guerrero López]

Author: ana
Date: 2007-08-23 06:40:54 +0000 (Thu, 23 Aug 2007)
New Revision: 7121

Modified:
   trunk/packages/qt-x11-free/debian/changelog
   trunk/packages/qt-x11-free/debian/control
   trunk/packages/qt-x11-free/debian/patches/00list
   trunk/packages/qt-x11-free/debian/rules
Log:
Updating Qt3 to build against firebird2. Patch from  Damyan Ivanov
<dmn at debian.org>


Modified: trunk/packages/qt-x11-free/debian/changelog
===================================================================
--- trunk/packages/qt-x11-free/debian/changelog	2007-08-23 05:41:00 UTC (rev 7120)
+++ trunk/packages/qt-x11-free/debian/changelog	2007-08-23 06:40:54 UTC (rev 7121)
@@ -1,3 +1,14 @@
+qt-x11-free (3:3.3.7-7) unstable; urgency=low
+
+  * Updating Qt3 to build against firebird2. Many thanks to Damyan Ivanov for
+    his work on this!
+    - Build-Depend on firebird2.0-dev instead of firebird1.5-dev.
+    - Add powerpc to firebird-supported architectures.
+    - Add patch 70_bad_typecast_amd64 to fix bad typecast in 
+      src/sql/drivers/ibase/qsql_ibase.cpp causing FTBFS on amd64.
+
+ -- Ana Beatriz Guerrero Lopez <ana at debian.org>  Thu, 23 Aug 2007 08:25:07 +0200
+
 qt-x11-free (3:3.3.7-6) unstable; urgency=low
 
   * Patch for potential vulnerability in QTextEdit, which might cause remote

Modified: trunk/packages/qt-x11-free/debian/control
===================================================================
--- trunk/packages/qt-x11-free/debian/control	2007-08-23 05:41:00 UTC (rev 7120)
+++ trunk/packages/qt-x11-free/debian/control	2007-08-23 06:40:54 UTC (rev 7121)
@@ -1,7 +1,7 @@
 Source: qt-x11-free
 Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 Uploaders: Christopher Martin <chrsmrtn at debian.org>, Adeodato Simó <dato at net.com.org.es>, Ana Beatriz Guerrero Lopez <ana at debian.org>, Sune Vuorela <debian at pusling.com>
-Build-Depends: debhelper (>= 5.0.31), libxext-dev (>= 4.3.0.dfsg.1-4), libxrandr-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, libxi-dev, zlib1g-dev, libjpeg62-dev, libmng-dev (>= 1.0.3), libpng12-dev | libpng12-0-dev, libfontconfig1-dev, libfreetype6-dev, libxft-dev, libiodbc2-dev (>= 3.51.2-4), libmysqlclient15-dev | libmysqlclient-dev, flex, libpq-dev, libaudio-dev, libcupsys2-dev, libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev, dpatch (>= 1.13), libsqlite3-dev, firebird1.5-dev [i386 kfreebsd-i386 kfreebsd-amd64 knetbsd-i386 netbsd-i386 amd64 sparc]
+Build-Depends: debhelper (>= 5.0.31), libxext-dev (>= 4.3.0.dfsg.1-4), libxrandr-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, libxi-dev, zlib1g-dev, libjpeg62-dev, libmng-dev (>= 1.0.3), libpng12-dev | libpng12-0-dev, libfontconfig1-dev, libfreetype6-dev, libxft-dev, libiodbc2-dev (>= 3.51.2-4), libmysqlclient15-dev | libmysqlclient-dev, flex, libpq-dev, libaudio-dev, libcupsys2-dev, libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev, dpatch (>= 1.13), libsqlite3-dev, firebird2.0-dev [i386 kfreebsd-i386 kfreebsd-amd64 knetbsd-i386 netbsd-i386 amd64 sparc powerpc]
 Section: libs
 Priority: optional
 Standards-Version: 3.7.2
@@ -51,7 +51,7 @@
  to access a PostgreSQL DB.
 
 Package: libqt3-mt-ibase
-Architecture: i386 kfreebsd-i386 kfreebsd-amd64 knetbsd-i386 netbsd-i386 amd64 sparc
+Architecture: i386 kfreebsd-i386 kfreebsd-amd64 knetbsd-i386 netbsd-i386 amd64 sparc powerpc
 Section: libs
 Depends: ${shlibs:Depends}
 Conflicts: libqt3c102-mt-ibase

Modified: trunk/packages/qt-x11-free/debian/patches/00list
===================================================================
--- trunk/packages/qt-x11-free/debian/patches/00list	2007-08-23 05:41:00 UTC (rev 7120)
+++ trunk/packages/qt-x11-free/debian/patches/00list	2007-08-23 06:40:54 UTC (rev 7121)
@@ -46,4 +46,5 @@
 66_gcc-4.3_compile-fix.dpatch
 68_use-lfbclient_not-lgds
 69_CVE-2007-3388
+70_bad_typecast_amd64
 90_armeabi

Modified: trunk/packages/qt-x11-free/debian/rules
===================================================================
--- trunk/packages/qt-x11-free/debian/rules	2007-08-23 05:41:00 UTC (rev 7120)
+++ trunk/packages/qt-x11-free/debian/rules	2007-08-23 06:40:54 UTC (rev 7121)
@@ -93,7 +93,7 @@
 		-inputmethod			\
 		# End of CONFIGURE_OPTS
 
-interbase_archs := i386 amd64 sparc
+interbase_archs := i386 amd64 sparc powerpc
 ifneq ($(DEB_HOST_ARCH_CPU),$(findstring $(DEB_HOST_ARCH_CPU),$(interbase_archs)))
 	CONFIGURE_OPTS += -no-sql-ibase
 	IBASE = -Nlibqt3-mt-ibase