[Pkg-kde-commits] rev 1285 - trunk/packages/qt-x11-free/debian
Adeodato Simó
adeodato@costa.debian.org
Tue, 12 Jul 2005 23:57:12 +0000
Author: adeodato
Date: 2005-07-12 23:57:12 +0000 (Tue, 12 Jul 2005)
New Revision: 1285
Modified:
trunk/packages/qt-x11-free/debian/changelog
trunk/packages/qt-x11-free/debian/control
trunk/packages/qt-x11-free/debian/rules
Log:
* PostgreSQL 8.0 transition stuff:
+ debian/control: build-depend on libpq-dev instead of postgresql-dev.
+ debian/rules: invoke pg_config to determine the include directory.
Modified: trunk/packages/qt-x11-free/debian/changelog
===================================================================
--- trunk/packages/qt-x11-free/debian/changelog 2005-07-12 23:48:02 UTC (rev 1284)
+++ trunk/packages/qt-x11-free/debian/changelog 2005-07-12 23:57:12 UTC (rev 1285)
@@ -13,6 +13,10 @@
+++ Changes by Adeodato Simó:
+ * PostgreSQL 8.0 transition stuff:
+ + debian/control: build-depend on libpq-dev instead of postgresql-dev.
+ + debian/rules: invoke pg_config to determine the include directory.
+
* Don't modify debian/control at build time, since doing it in the clean
target it's a release critical bug now:
+ debian/rules: don't invoke type-handling to generate debian/control.
Modified: trunk/packages/qt-x11-free/debian/control
===================================================================
--- trunk/packages/qt-x11-free/debian/control 2005-07-12 23:48:02 UTC (rev 1284)
+++ trunk/packages/qt-x11-free/debian/control 2005-07-12 23:57:12 UTC (rev 1285)
@@ -1,7 +1,7 @@
Source: qt-x11-free
Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
Uploaders: Martin Loschwitz <madkiss@debian.org>, Christopher Martin <chrsmrtn@freeshell.org>, Adeodato Simó <asp16@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, postgresql-dev, libaudio-dev, libcupsys2-dev, xlibmesa-gl-dev | libgl-dev, xlibmesa-glu-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
+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, xlibmesa-glu-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
Section: libs
Priority: optional
Standards-Version: 3.6.1
Modified: trunk/packages/qt-x11-free/debian/rules
===================================================================
--- trunk/packages/qt-x11-free/debian/rules 2005-07-12 23:48:02 UTC (rev 1284)
+++ trunk/packages/qt-x11-free/debian/rules 2005-07-12 23:57:12 UTC (rev 1285)
@@ -37,7 +37,7 @@
-plugin-imgfmt-jpeg -qt-imgfmt-png -plugin-imgfmt-mng \
-plugin-sql-odbc -plugin-sql-psql -plugin-sql-mysql -plugin-sql-ibase \
-plugin-sql-sqlite -I/usr/include/mysql -I/usr/include/freetype2 \
- -I/usr/include/postgresql -I/usr/include/postgresql/server -lfontconfig \
+ -I`pg_config --includedir` -lfontconfig \
-stl -xinerama -xrandr -system-nas-sound -cups -xft -xcursor -sm \
-no-exceptions -platform linux-g++ -fast