[SCM] qtbase packaging branch, master, updated. 578b17e2b685e91390e31fc6b896be6b935ebf07

[Felix Geyer]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtbase.git;a=commitdiff;h=fec0e25

The following commit has been merged in the master branch:
commit fec0e252b7741b130541d80b766b804c4ee9aad4
Author: Felix Geyer <fgeyer at debian.org>
Date:   Thu Oct 4 15:49:07 2012 +0200

    Remove all traces of sqlite2.
---
 debian/control                   |    4 +---
 debian/libqtsql5-sqlite2.install |    1 -
 debian/rules                     |    7 +------
 3 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/debian/control b/debian/control
index 8d3ff8e..75614af 100644
--- a/debian/control
+++ b/debian/control
@@ -28,7 +28,6 @@ Build-Depends: debhelper (>= 9),
                libmysqlclient-dev,
                libpng12-dev,
                libpq-dev,
-               libsqlite0-dev,
                libsqlite3-dev,
                libssl-dev,
                libudev-dev,
@@ -110,7 +109,7 @@ Architecture: any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends}, ${shlibs:Depends}
-Recommends: libqtsql5-mysql | libqtsql5-odbc | libqtsql5-psql | libqtsql5-sqlite | libqtsql5-sqlite2 | libqtsql5-ibase [amd64 armel i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sh4 sparc]
+Recommends: libqtsql5-mysql | libqtsql5-odbc | libqtsql5-psql | libqtsql5-sqlite | libqtsql5-ibase [amd64 armel i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sh4 sparc]
 Suggests: qtbase5-dev
 Description: Qt 5 SQL module
  Qt is a cross-platform C++ application framework. Qt's primary feature
@@ -280,7 +279,6 @@ Recommends: libqtopengl5-dev (= ${binary:Version})
 Suggests: firebird-dev,
           libmysqlclient-dev,
           libpq-dev,
-          libsqlite0-dev,
           libsqlite3-dev,
           unixodbc-dev
 Description: Qt 5 base development files
diff --git a/debian/libqtsql5-sqlite2.install b/debian/libqtsql5-sqlite2.install
deleted file mode 100644
index 4f4fc93..0000000
--- a/debian/libqtsql5-sqlite2.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/*/qt5/plugins/sqldrivers/libqsqlite2.so
diff --git a/debian/rules b/debian/rules
index c5b56b7..cc85f32 100755
--- a/debian/rules
+++ b/debian/rules
@@ -27,12 +27,6 @@ else
 	extra_configure_opts += -no-sql-ibase
 endif
 
-ifneq (,$(filter %-sql-sqlite2,$(shell dh_listpackages)))
-	extra_configure_opts += -plugin-sql-sqlite2
-else
-	extra_configure_opts += -no-sql-sqlite2
-endif
-
 ifeq ($(DEB_HOST_ARCH),arm)
 	extra_configure_opts += -no-pch
 endif
@@ -118,6 +112,7 @@ endif
 	            -plugin-sql-odbc \
 	            -plugin-sql-psql \
 	            -plugin-sql-sqlite \
+	            -no-sql-sqlite2 \
 	            -plugin-sql-tds \
 	            -system-sqlite \
 	            -platform $(platform_arg) \

-- 
qtbase packaging