rev 3627 - trunk/packages/qt-x11-free/debian

[Christopher Martin]

Author: chrsmrtn
Date: 2006-04-20 21:54:17 +0000 (Thu, 20 Apr 2006)
New Revision: 3627

Modified:
   trunk/packages/qt-x11-free/debian/changelog
   trunk/packages/qt-x11-free/debian/control
Log:
Build-deps update. Reorder as well.


Modified: trunk/packages/qt-x11-free/debian/changelog
===================================================================
--- trunk/packages/qt-x11-free/debian/changelog	2006-04-20 21:32:32 UTC (rev 3626)
+++ trunk/packages/qt-x11-free/debian/changelog	2006-04-20 21:54:17 UTC (rev 3627)
@@ -6,11 +6,14 @@
 
   +++ Changes by Christopher Martin:
 
-  * Remove obsolete xlibs-static-dev build depend. Also update mesa build deps
-    for the new X.Org 7.
+  * Remove obsolete xlibs-static-dev and x-dev build-depends. Also update the
+    Mesa build-depends for the new X.Org 7. (Closes: #363432)
 
- -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 25 Mar 2006 20:24:21 +0100
+  * Make libqt3-mt recommend OpenGL and related libraries, since they are
+    dlopened if available.
 
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 20 Apr 2006 15:40:45 -0400
+
 qt-x11-free (3:3.3.6-1) unstable; urgency=low
 
   * New upstream release.

Modified: trunk/packages/qt-x11-free/debian/control
===================================================================
--- trunk/packages/qt-x11-free/debian/control	2006-04-20 21:32:32 UTC (rev 3626)
+++ trunk/packages/qt-x11-free/debian/control	2006-04-20 21:54:17 UTC (rev 3627)
@@ -1,7 +1,7 @@
 Source: qt-x11-free
 Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 Uploaders: Christopher Martin <chrsmrtn at debian.org>, Adeodato Simó <dato at net.com.org.es>
-Build-Depends: debhelper (>= 5.0), 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, libxkbfile-dev, libxi-dev, libjpeg62-dev, zlib1g-dev, libmng-dev (>= 1.0.3), libpng12-dev | libpng12-0-dev, libfreetype6-dev, libiodbc2-dev (>= 3.51.2-4), libmysqlclient15-dev | libmysqlclient-dev, flex, libpq-dev, libaudio-dev, libcupsys2-dev, libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev, libxft-dev, dpatch (>= 1.13), libsqlite3-dev, firebird2-dev [i386 hurd-i386 kfreebsd-i386 kfreebsd-amd64 knetbsd-i386 netbsd-i386 amd64]
+Build-Depends: debhelper (>= 5.0), libxext-dev (>= 4.3.0.dfsg.1-4), libxrandr-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, zlib1g-dev, libjpeg62-dev, libmng-dev (>= 1.0.3), libpng12-dev | libpng12-0-dev, libfontconfig1-dev, libfreetype6-dev, libxft-dev, libiodbc2-dev (>= 3.51.2-4), libmysqlclient15-dev | libmysqlclient-dev, flex, libpq-dev, libaudio-dev, libcupsys2-dev, libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev, dpatch (>= 1.13), libsqlite3-dev, firebird2-dev [i386 hurd-i386 kfreebsd-i386 kfreebsd-amd64 knetbsd-i386 netbsd-i386 amd64]
 Section: libs
 Priority: optional
 Standards-Version: 3.6.2
@@ -11,6 +11,7 @@
 Section: libs
 Replaces: qt3-tools (<< 2:3.0.2-20020306-1), libqt3-helper, libqt3, libqt3c102-mt
 Depends: ${shlibs:Depends}, fontconfig
+Recommends: libgl1-mesa-glx | libgl1, libglu1-mesa | libglu1, libxmu6 (>= 4.3.0.dfsg.1-4)
 Conflicts: libqt3c102-mt, libqui1-emb, libqt3c-mt
 Suggests: libqt3-mt-psql, libqt3-mt-mysql, libqt3-mt-odbc
 Description: Qt GUI Library (Threaded runtime version), Version 3
@@ -75,7 +76,7 @@
 Architecture: any
 Section: libdevel
 Replaces: libqt-mt-dev, libqt3-dev, libqt3-helper, libqt3-headers (<= 3:3.1.1-3), libqt3-emb (<= 3:3.0.3-1)
-Depends: 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, libc6-dev, libqt3-mt (= ${Source-Version}), libqt3-headers (= ${Source-Version}), qt3-dev-tools (= ${Source-Version}), libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev, libxft-dev, libaudio-dev
+Depends: libxext-dev (>= 4.3.0.dfsg.1-4), libxrandr-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, zlib1g-dev, libjpeg62-dev, libmng-dev (>= 1.0.3), libpng12-dev | libpng12-0-dev, libfontconfig1-dev, libfreetype6-dev, libxft-dev, libaudio-dev, libcupsys2-dev, libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev, libc6-dev, libqt3-mt (= ${Source-Version}), libqt3-headers (= ${Source-Version}), qt3-dev-tools (= ${Source-Version})
 Conflicts: libqt-mt-dev, libqt3-emb (<= 3:3.0.3-1), libqt3-dev
 Recommends: libqt3-compat-headers
 Suggests: libqt3-i18n, qt3-doc