[Pkg-kde-commits] rev 1288 - people/chrsmrtn/qt-x11-free/debian
Christopher Martin
chrsmrtn-guest@costa.debian.org
Wed, 13 Jul 2005 04:40:19 +0000
Author: chrsmrtn-guest
Date: 2005-07-13 04:40:18 +0000 (Wed, 13 Jul 2005)
New Revision: 1288
Modified:
people/chrsmrtn/qt-x11-free/debian/changelog
people/chrsmrtn/qt-x11-free/debian/control
people/chrsmrtn/qt-x11-free/debian/rules
Log:
Sync with dato's Qt work.
Modified: people/chrsmrtn/qt-x11-free/debian/changelog
===================================================================
--- people/chrsmrtn/qt-x11-free/debian/changelog 2005-07-13 01:26:11 UTC (rev 1287)
+++ people/chrsmrtn/qt-x11-free/debian/changelog 2005-07-13 04:40:18 UTC (rev 1288)
@@ -1,7 +1,6 @@
-qt-x11-free (3:3.3.4-4) unstable; urgency=low
+qt-x11-free (3:3.3.4-5) unstable; urgency=low
- * Move the package to the Debian Qt/KDE team. Thanks to Martin Loschwitz for
- all his work over the years.
+ !!! Sync with the next gcc4 upload !!!
+++ Changes by Christopher Martin:
Modified: people/chrsmrtn/qt-x11-free/debian/control
===================================================================
--- people/chrsmrtn/qt-x11-free/debian/control 2005-07-13 01:26:11 UTC (rev 1287)
+++ people/chrsmrtn/qt-x11-free/debian/control 2005-07-13 04:40:18 UTC (rev 1288)
@@ -1,7 +1,7 @@
Source: qt-x11-free
Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
-Uploaders: Isaac Clerencia <isaac@debian.org>, Pierre Habouzit <madcoder@debian.org>, Christopher Martin <chrsmrtn@freeshell.org>, Brian Nelson <pyro@debian.org>, Adeodato Simó <asp16@alu.ua.es>, Riku Voipio <riku.voipio@iki.fi>
-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 (>= 2.1.10), 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], libsqlite0-dev, type-handling (>= 0.2.1), binutils (>= 2.14.90.0.7)
+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 (>= 2.1.10), libiodbc2-dev (>= 3.51.2-4), libmysqlclient12-dev | libmysqlclient-dev, flex, libpq-dev, libaudio-dev, libcupsys2-dev, xlibmesa-gl-dev | libgl-dev, libglu1-xorg-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, binutils (>= 2.14.90.0.7)
Section: libs
Priority: optional
Standards-Version: 3.6.1
@@ -60,7 +60,7 @@
to access a PostgreSQL DB.
Package: libqt3c102-mt-ibase
-Architecture: i386
+Architecture: i386 hurd-i386 kfreebsd-i386 knetbsd-i386 netbsd-i386
Section: libs
Depends: ${shlibs:Depends}
Description: InterBase/FireBird database driver for Qt3 (Threaded)
@@ -81,7 +81,7 @@
Architecture: any
Section: libdevel
Replaces: libqt-mt-dev, libqt3-dev (>= 3.0.5-4), libqt3-helper, libqt3-headers (<= 3:3.1.1-3), libqt3-emb (<= 3:3.0.3-1)
-Depends: 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), libmng-dev (>= 1.0.3), libpng12-0-dev, libjpeg62-dev, zlib1g-dev, libfreetype6-dev, libc6-dev, libqt3c102-mt (= ${Source-Version}), libqt3-headers (= ${Source-Version}), qt3-dev-tools (= ${Source-Version}), xlibmesa-gl-dev | libgl-dev, xlibmesa-glu-dev | libglu1-mesa-dev | libglu-dev, libxft-dev, libxrender-dev, libxcursor-dev, libaudio-dev
+Depends: 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), libmng-dev (>= 1.0.3), libpng12-0-dev, libjpeg62-dev, zlib1g-dev, libfreetype6-dev, libc6-dev, libqt3c102-mt (= ${Source-Version}), libqt3-headers (= ${Source-Version}), qt3-dev-tools (= ${Source-Version}), xlibmesa-gl-dev | libgl-dev, libglu1-xorg-dev | libglu1-mesa-dev | libglu-dev, libxft-dev, libxrender-dev, libxcursor-dev, libaudio-dev
Conflicts: libqt-mt-dev, libqt3-emb (<= 3:3.0.3-1)
Recommends: libqt3-compat-headers
Suggests: libqt3-i18n, qt3-doc
Modified: people/chrsmrtn/qt-x11-free/debian/rules
===================================================================
--- people/chrsmrtn/qt-x11-free/debian/rules 2005-07-13 01:26:11 UTC (rev 1287)
+++ people/chrsmrtn/qt-x11-free/debian/rules 2005-07-13 04:40:18 UTC (rev 1288)
@@ -36,7 +36,7 @@
-qt-imgfmt-jpeg -qt-imgfmt-png -qt-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 -thread -xft -xcursor -sm \
-no-exceptions -platform linux-g++ -fast -enable-opengl -dlopen-opengl \
-xkb -tablet -xrender -xshape -nis -debug