[pkg-kde-commits] rev 2816 - trunk/packages/qt4-x11/debian

Brian Nelson pyro at costa.debian.org
Tue Jan 10 03:37:42 UTC 2006 

Author: pyro
Date: 2006-01-10 03:37:41 +0000 (Tue, 10 Jan 2006)
New Revision: 2816

Modified:
   trunk/packages/qt4-x11/debian/changelog
   trunk/packages/qt4-x11/debian/control
   trunk/packages/qt4-x11/debian/rules
Log:
  * Re-enabled sqlite3 support.  It's still statically linked, however,
    but that'll have to do because I really don't want to futz with the
    build system. (Closes: #330976)
  * Enabled sqlite2 support

Modified: trunk/packages/qt4-x11/debian/changelog
===================================================================
--- trunk/packages/qt4-x11/debian/changelog	2006-01-10 00:46:18 UTC (rev 2815)
+++ trunk/packages/qt4-x11/debian/changelog	2006-01-10 03:37:41 UTC (rev 2816)
@@ -22,8 +22,14 @@
     dangling if libqt4-debug isn't installed and prevents failed linking
     due to version mismatches.  (Closes: #346603, #346605)
 
- -- Brian Nelson <pyro at debian.org>  Mon,  9 Jan 2006 14:43:51 -0800
+  * Re-enabled sqlite3 support.  It's still statically linked, however,
+    but that'll have to do because I really don't want to futz with the
+    build system. (Closes: #330976)
 
+  * Enabled sqlite2 support
+
+ -- Brian Nelson <pyro at debian.org>  Mon,  9 Jan 2006 19:37:28 -0800
+
 qt4-x11 (4.1.0-1) unstable; urgency=low
 
   * New upstream release

Modified: trunk/packages/qt4-x11/debian/control
===================================================================
--- trunk/packages/qt4-x11/debian/control	2006-01-10 00:46:18 UTC (rev 2815)
+++ trunk/packages/qt4-x11/debian/control	2006-01-10 03:37:41 UTC (rev 2816)
@@ -3,13 +3,13 @@
 Priority: optional
 Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 Uploaders: Brian Nelson <pyro at debian.org>
-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, libjpeg62-dev, zlib1g-dev, libmng-dev (>= 1.0.3), libpng12-dev, libfreetype6-dev, libmysqlclient15, flex, libpq-dev, libaudio-dev, libcupsys2-dev, xlibmesa-gl-dev | libgl-dev, libglu1-xorg-dev | libglu1-mesa-dev | libglu-dev, libxft-dev, libxrender-dev, libxcursor-dev, cdbs (>= 0.4.0), dpatch, libxinerama-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, libjpeg62-dev, zlib1g-dev, libmng-dev (>= 1.0.3), libpng12-dev, libfreetype6-dev, libmysqlclient15-dev, flex, libpq-dev, libaudio-dev, libcupsys2-dev, xlibmesa-gl-dev | libgl-dev, libglu1-xorg-dev | libglu1-mesa-dev | libglu-dev, libxft-dev, libxrender-dev, libxcursor-dev, cdbs (>= 0.4.0), dpatch, libxinerama-dev, libsqlite0-dev
 Standards-Version: 3.6.2
 
 Package: libqt4-dev
 Architecture: any
 Section: libdevel
-Depends: ${shlibs:Depends}, ${misc:Depends}, libqt4-core (= ${Source-Version}), libqt4-gui (= ${Source-Version}), libqt4-sql (= ${Source-Version}), libqt4-qt3support (= ${Source-Version}), 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, libxi-dev, libmng-dev (>= 1.0.3), libpng12-0-dev, libjpeg62-dev, zlib1g-dev, libfreetype6-dev, xlibmesa-gl-dev | libgl-dev, libglu1-xorg-dev | libglu1-mesa-dev | libglu-dev, libxft-dev, libaudio-dev, xlibs-static-pic, libpq-dev, libmysqlclient15-dev
+Depends: ${misc:Depends}, libqt4-core (= ${Source-Version}), libqt4-gui (= ${Source-Version}), libqt4-sql (= ${Source-Version}), libqt4-qt3support (= ${Source-Version}), 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, libxi-dev, libmng-dev (>= 1.0.3), libpng12-0-dev, libjpeg62-dev, zlib1g-dev, libfreetype6-dev, xlibmesa-gl-dev | libgl-dev, libglu1-xorg-dev | libglu1-mesa-dev | libglu-dev, libxft-dev, libaudio-dev, xlibs-static-pic, libpq-dev, libmysqlclient15-dev
 Conflicts: qt3-dev-tools (<= 3:3.3.4-7)
 Recommends: qt4-dev-tools
 Suggests: qt4-doc, libqt4-debug-dev
@@ -73,8 +73,8 @@
  is its rich set of widgets that provide standard GUI functionality.
  .
  This package contains the SQL module for Qt.  It includes support for
- PostgreSQL and MySQL databases.  If you wish to to use the SQL module
- for development, you should install the libqt4-dev package.
+ PostgreSQL, MySQL, and SQLite databases.  If you wish to to use the SQL
+ module for development, you should install the libqt4-dev package.
  .
   Homepage: http://www.trolltech.com
 

Modified: trunk/packages/qt4-x11/debian/rules
===================================================================
--- trunk/packages/qt4-x11/debian/rules	2006-01-10 00:46:18 UTC (rev 2815)
+++ trunk/packages/qt4-x11/debian/rules	2006-01-10 03:37:41 UTC (rev 2816)
@@ -36,6 +36,8 @@
 	            -system-nas-sound \
 	            -qt-sql-psql \
 	            -qt-sql-mysql \
+	            -qt-sql-sqlite \
+	            -qt-sql-sqlite2 \
 	            -I/usr/include/mysql \
 	            -I/usr/include/freetype2 \
 	            -I`pg_config --includedir` \

More information about the pkg-kde-commits mailing list