Enable qt3 ibase support on Debian and Ubuntu

This closes Bug 713

10 files changed, 52 insertions, 56 deletions

diff --git a/debian/lenny/dependencies/qt3/debian/KUBUNTU-DEBIAN-CHANGES b/debian/lenny/dependencies/qt3/debian/KUBUNTU-DEBIAN-CHANGES
deleted file mode 100644
index f02b47f99..000000000
--- a/debian/lenny/dependencies/qt3/debian/KUBUNTU-DEBIAN-CHANGES
+++ /dev/null
@@ -1,4 +0,0 @@
-No firebird/ibase build (remove build-dep, control entry, ibase ./configure option), firebird is not in Ubuntu main
-install qtrc (change rules, qtrc file) and qt_plugins_3.3rc
-add /etc/ to libqt3-mt
-
diff --git a/debian/lenny/dependencies/qt3/debian/control b/debian/lenny/dependencies/qt3/debian/control
index ee9afe53c..2078a94a5 100644
--- a/debian/lenny/dependencies/qt3/debian/control
+++ b/debian/lenny/dependencies/qt3/debian/control
@@ -10,7 +10,8 @@ Build-Depends: debhelper (>= 5.0.31), quilt, cpio, libxext-dev (>= 4.3.0.dfsg.1-
  libmng-dev (>= 1.0.3), libpng12-dev | libpng12-0-dev, libfontconfig1-dev,
  libfreetype6-dev, libxft-dev, libiodbc2-dev (>= 3.51.2-4),
  libmysqlclient-dev, flex, libpq-dev, libaudio-dev, libcups2-dev,
- libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev, libsqlite3-dev
+ libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev, libsqlite3-dev,
+ firebird2.1-dev [i386 kfreebsd-i386 kfreebsd-amd64 knetbsd-i386 netbsd-i386 amd64 sparc powerpc] | firebird2-dev [i386 amd64]
 Section: libs
 Priority: optional
 Standards-Version: 3.7.3
@@ -66,17 +67,16 @@ Description: PostgreSQL database driver for Qt3 (Threaded)
  Install it if you intend to use or write Qt programs that are
  to access a PostgreSQL DB.
 
-#Not in Debian
-#Package: libqt3-mt-ibase
-#Architecture: i386 kfreebsd-i386 kfreebsd-amd64 knetbsd-i386 netbsd-i386 amd64 sparc powerpc
-#Section: libs
-#Depends: ${shlibs:Depends}
-#Conflicts: libqt3c102-mt-ibase
-#Replaces: libqt3c102-mt-ibase
-#Description: InterBase/FireBird database driver for Qt3 (Threaded)
-# This package contains the threaded InterBase/FireBird plugin
-# for Qt3. Install it if you intend to use or write Qt programs
-# that are to access an InterBase/FireBird DB.
+Package: libqt3-mt-ibase
+Architecture: i386 kfreebsd-i386 kfreebsd-amd64 knetbsd-i386 netbsd-i386 amd64 sparc powerpc
+Section: libs
+Depends: ${shlibs:Depends}
+Conflicts: libqt3c102-mt-ibase
+Replaces: libqt3c102-mt-ibase
+Description: InterBase/FireBird database driver for Qt3 (Threaded)
+ This package contains the threaded InterBase/FireBird plugin
+ for Qt3. Install it if you intend to use or write Qt programs
+ that are to access an InterBase/FireBird DB.
 
 Package: libqt3-mt-sqlite
 Architecture: any
diff --git a/debian/lenny/dependencies/qt3/debian/rules b/debian/lenny/dependencies/qt3/debian/rules
index 0d2c1e5a0..09b237823 100755
--- a/debian/lenny/dependencies/qt3/debian/rules
+++ b/debian/lenny/dependencies/qt3/debian/rules
@@ -86,6 +86,7 @@ CONFIGURE_OPTS = \
 		-plugin-sql-odbc		\
 		-plugin-sql-psql		\
 		-plugin-sql-mysql		\
+		-plugin-sql-ibase		\
 		-plugin-sql-sqlite		\
 						\
 		-I/usr/include/mysql		\
diff --git a/debian/lenny/dependencies/tqt3/debian/control b/debian/lenny/dependencies/tqt3/debian/control
index 828331f2b..b564b8374 100644
--- a/debian/lenny/dependencies/tqt3/debian/control
+++ b/debian/lenny/dependencies/tqt3/debian/control
@@ -10,7 +10,8 @@ Build-Depends: debhelper (>= 5.0.31), quilt, cpio, libxext-dev (>= 4.3.0.dfsg.1-
  libmng-dev (>= 1.0.3), libpng12-dev | libpng12-0-dev, libfontconfig1-dev,
  libfreetype6-dev, libxft-dev, libiodbc2-dev (>= 3.51.2-4),
  libmysqlclient-dev, flex, libpq-dev, libaudio-dev, libcups2-dev,
- libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev, libsqlite3-dev
+ libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev, libsqlite3-dev,
+ firebird2.1-dev [i386 kfreebsd-i386 kfreebsd-amd64 knetbsd-i386 netbsd-i386 amd64 sparc powerpc] | firebird2-dev [i386 amd64]
 Section: libs
 Priority: optional
 Standards-Version: 3.8.4
@@ -64,17 +65,16 @@ Description: PostgreSQL database driver for TQt3 (Threaded)
  Install it if you intend to use or write TQt programs that are
  to access a PostgreSQL DB.
 
-#Not in Debian
-#Package: libtqt3-mt-ibase
-#Architecture: i386 kfreebsd-i386 kfreebsd-amd64 knetbsd-i386 netbsd-i386 amd64 sparc powerpc
-#Section: libs
-#Depends: ${shlibs:Depends}
-#Conflicts: libtqt3c102-mt-ibase
-#Replaces: libtqt3c102-mt-ibase
-#Description: InterBase/FireBird database driver for TQt3 (Threaded)
-# This package contains the threaded InterBase/FireBird plugin
-# for TQt3. Install it if you intend to use or write TQt programs
-# that are to access an InterBase/FireBird DB.
+Package: libtqt3-mt-ibase
+Architecture: i386 kfreebsd-i386 kfreebsd-amd64 knetbsd-i386 netbsd-i386 amd64 sparc powerpc
+Section: libs
+Depends: ${shlibs:Depends}
+Conflicts: libtqt3c102-mt-ibase
+Replaces: libtqt3c102-mt-ibase
+Description: InterBase/FireBird database driver for TQt3 (Threaded)
+ This package contains the threaded InterBase/FireBird plugin
+ for TQt3. Install it if you intend to use or write TQt programs
+ that are to access an InterBase/FireBird DB.
 
 Package: libtqt3-mt-sqlite
 Architecture: any
diff --git a/debian/lenny/dependencies/tqt3/debian/rules b/debian/lenny/dependencies/tqt3/debian/rules
index 93e27e91e..be33513fd 100755
--- a/debian/lenny/dependencies/tqt3/debian/rules
+++ b/debian/lenny/dependencies/tqt3/debian/rules
@@ -86,6 +86,7 @@ CONFIGURE_OPTS = \
 		-plugin-sql-odbc		\
 		-plugin-sql-psql		\
 		-plugin-sql-mysql		\
+		-plugin-sql-ibase		\
 		-plugin-sql-sqlite		\
 						\
 		-I/usr/include/mysql		\
diff --git a/debian/squeeze/dependencies/qt3/debian/KUBUNTU-DEBIAN-CHANGES b/debian/squeeze/dependencies/qt3/debian/KUBUNTU-DEBIAN-CHANGES
deleted file mode 100644
index f02b47f99..000000000
--- a/debian/squeeze/dependencies/qt3/debian/KUBUNTU-DEBIAN-CHANGES
+++ /dev/null
@@ -1,4 +0,0 @@
-No firebird/ibase build (remove build-dep, control entry, ibase ./configure option), firebird is not in Ubuntu main
-install qtrc (change rules, qtrc file) and qt_plugins_3.3rc
-add /etc/ to libqt3-mt
-
diff --git a/debian/squeeze/dependencies/qt3/debian/control b/debian/squeeze/dependencies/qt3/debian/control
index ee9afe53c..2078a94a5 100644
--- a/debian/squeeze/dependencies/qt3/debian/control
+++ b/debian/squeeze/dependencies/qt3/debian/control
@@ -10,7 +10,8 @@ Build-Depends: debhelper (>= 5.0.31), quilt, cpio, libxext-dev (>= 4.3.0.dfsg.1-
  libmng-dev (>= 1.0.3), libpng12-dev | libpng12-0-dev, libfontconfig1-dev,
  libfreetype6-dev, libxft-dev, libiodbc2-dev (>= 3.51.2-4),
  libmysqlclient-dev, flex, libpq-dev, libaudio-dev, libcups2-dev,
- libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev, libsqlite3-dev
+ libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev, libsqlite3-dev,
+ firebird2.1-dev [i386 kfreebsd-i386 kfreebsd-amd64 knetbsd-i386 netbsd-i386 amd64 sparc powerpc] | firebird2-dev [i386 amd64]
 Section: libs
 Priority: optional
 Standards-Version: 3.7.3
@@ -66,17 +67,16 @@ Description: PostgreSQL database driver for Qt3 (Threaded)
  Install it if you intend to use or write Qt programs that are
  to access a PostgreSQL DB.
 
-#Not in Debian
-#Package: libqt3-mt-ibase
-#Architecture: i386 kfreebsd-i386 kfreebsd-amd64 knetbsd-i386 netbsd-i386 amd64 sparc powerpc
-#Section: libs
-#Depends: ${shlibs:Depends}
-#Conflicts: libqt3c102-mt-ibase
-#Replaces: libqt3c102-mt-ibase
-#Description: InterBase/FireBird database driver for Qt3 (Threaded)
-# This package contains the threaded InterBase/FireBird plugin
-# for Qt3. Install it if you intend to use or write Qt programs
-# that are to access an InterBase/FireBird DB.
+Package: libqt3-mt-ibase
+Architecture: i386 kfreebsd-i386 kfreebsd-amd64 knetbsd-i386 netbsd-i386 amd64 sparc powerpc
+Section: libs
+Depends: ${shlibs:Depends}
+Conflicts: libqt3c102-mt-ibase
+Replaces: libqt3c102-mt-ibase
+Description: InterBase/FireBird database driver for Qt3 (Threaded)
+ This package contains the threaded InterBase/FireBird plugin
+ for Qt3. Install it if you intend to use or write Qt programs
+ that are to access an InterBase/FireBird DB.
 
 Package: libqt3-mt-sqlite
 Architecture: any
diff --git a/debian/squeeze/dependencies/qt3/debian/rules b/debian/squeeze/dependencies/qt3/debian/rules
index 0d2c1e5a0..09b237823 100755
--- a/debian/squeeze/dependencies/qt3/debian/rules
+++ b/debian/squeeze/dependencies/qt3/debian/rules
@@ -86,6 +86,7 @@ CONFIGURE_OPTS = \
 		-plugin-sql-odbc		\
 		-plugin-sql-psql		\
 		-plugin-sql-mysql		\
+		-plugin-sql-ibase		\
 		-plugin-sql-sqlite		\
 						\
 		-I/usr/include/mysql		\
diff --git a/debian/squeeze/dependencies/tqt3/debian/control b/debian/squeeze/dependencies/tqt3/debian/control
index 377851559..3ba683a76 100644
--- a/debian/squeeze/dependencies/tqt3/debian/control
+++ b/debian/squeeze/dependencies/tqt3/debian/control
@@ -10,7 +10,8 @@ Build-Depends: debhelper (>= 5.0.31), quilt, cpio, libxext-dev (>= 4.3.0.dfsg.1-
  libmng-dev (>= 1.0.3), libpng12-dev | libpng12-0-dev, libfontconfig1-dev,
  libfreetype6-dev, libxft-dev, libiodbc2-dev (>= 3.51.2-4),
  libmysqlclient-dev, flex, libpq-dev, libaudio-dev, libcups2-dev,
- libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev, libsqlite3-dev
+ libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev, libsqlite3-dev,
+ firebird2.1-dev [i386 kfreebsd-i386 kfreebsd-amd64 knetbsd-i386 netbsd-i386 amd64 sparc powerpc] | firebird2-dev [i386 amd64]
 Section: libs
 Priority: optional
 Standards-Version: 3.8.4
@@ -64,17 +65,16 @@ Description: PostgreSQL database driver for TQt3 (Threaded)
  Install it if you intend to use or write TQt programs that are
  to access a PostgreSQL DB.
 
-#Not in Debian
-#Package: libtqt3-mt-ibase
-#Architecture: i386 kfreebsd-i386 kfreebsd-amd64 knetbsd-i386 netbsd-i386 amd64 sparc powerpc
-#Section: libs
-#Depends: ${shlibs:Depends}
-#Conflicts: libtqt3c102-mt-ibase
-#Replaces: libtqt3c102-mt-ibase
-#Description: InterBase/FireBird database driver for TQt3 (Threaded)
-# This package contains the threaded InterBase/FireBird plugin
-# for TQt3. Install it if you intend to use or write TQt programs
-# that are to access an InterBase/FireBird DB.
+Package: libtqt3-mt-ibase
+Architecture: i386 kfreebsd-i386 kfreebsd-amd64 knetbsd-i386 netbsd-i386 amd64 sparc powerpc
+Section: libs
+Depends: ${shlibs:Depends}
+Conflicts: libtqt3c102-mt-ibase
+Replaces: libtqt3c102-mt-ibase
+Description: InterBase/FireBird database driver for TQt3 (Threaded)
+ This package contains the threaded InterBase/FireBird plugin
+ for TQt3. Install it if you intend to use or write TQt programs
+ that are to access an InterBase/FireBird DB.
 
 Package: libtqt3-mt-sqlite
 Architecture: any
diff --git a/debian/squeeze/dependencies/tqt3/debian/rules b/debian/squeeze/dependencies/tqt3/debian/rules
index 93e27e91e..be33513fd 100755
--- a/debian/squeeze/dependencies/tqt3/debian/rules
+++ b/debian/squeeze/dependencies/tqt3/debian/rules
@@ -86,6 +86,7 @@ CONFIGURE_OPTS = \
 		-plugin-sql-odbc		\
 		-plugin-sql-psql		\
 		-plugin-sql-mysql		\
+		-plugin-sql-ibase		\
 		-plugin-sql-sqlite		\
 						\
 		-I/usr/include/mysql		\