[Pkg-kde-commits] rev 1761 - trunk/packages/qt-x11-free/debian

Christopher Martin chrsmrtn-guest at costa.debian.org
Sat Sep 10 23:42:48 UTC 2005


Author: chrsmrtn-guest
Date: 2005-09-10 23:42:47 +0000 (Sat, 10 Sep 2005)
New Revision: 1761

Modified:
   trunk/packages/qt-x11-free/debian/changelog
   trunk/packages/qt-x11-free/debian/control
Log:
Changelog and updated control for Qt. This should take care
of the qt3-doc file mess.


Modified: trunk/packages/qt-x11-free/debian/changelog
===================================================================
--- trunk/packages/qt-x11-free/debian/changelog	2005-09-10 23:41:55 UTC (rev 1760)
+++ trunk/packages/qt-x11-free/debian/changelog	2005-09-10 23:42:47 UTC (rev 1761)
@@ -1,10 +1,20 @@
-qt-x11-free (3:3.3.4-9) unstable; urgency=low
+qt-x11-free (3:3.3.5-1) unstable; urgency=low
 
+  * New upstream release. Drop patches merged upstream, and sync those that
+    remain.
+
   +++ Changes by Christopher Martin:
 
-  * Add qt3-doc versioned Replaces for qt3-designer and qt3-linguist, since
-    the last upload centralized documentation in qt3-doc. (Closes: #327291)
+  * Move documention from qt3-doc back to qt3-designer and qt3-linguist, since
+    the last upload centralized it all in qt3-doc. The reason for this
+    inadvertent change was a years-old bug (just now noticed and fixed) in
+    debian/rules, wherein portions of it would fail if sh where something
+    other than bash. Add all the appropriate Replaces to cope with these
+    moves. (Closes: #327291)
 
+  * Revert the versioning of our build-depends on libpq-dev, since the fixed
+    package has now built on all architectures.
+
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri,  9 Sep 2005 08:35:43 -0400
 
 qt-x11-free (3:3.3.4-8) unstable; urgency=low

Modified: trunk/packages/qt-x11-free/debian/control
===================================================================
--- trunk/packages/qt-x11-free/debian/control	2005-09-10 23:41:55 UTC (rev 1760)
+++ trunk/packages/qt-x11-free/debian/control	2005-09-10 23:42:47 UTC (rev 1761)
@@ -1,7 +1,7 @@
 Source: qt-x11-free
 Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 Uploaders: Martin Loschwitz <madkiss at debian.org>, Christopher Martin <chrsmrtn at debian.org>, Adeodato Simó <asp16 at 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), 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), libmysqlclient12-dev | libmysqlclient-dev, flex, libpq-dev (>= 8.0.3-15), libaudio-dev, libcupsys2-dev, xlibmesa-gl-dev | libgl-dev, libglu1-xorg-dev | libglu1-mesa-dev | libglu-dev, libxft-dev, dpatch (>= 1.13), 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), 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), 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), libsqlite0-dev
 Section: libs
 Priority: optional
 Standards-Version: 3.6.2
@@ -145,7 +145,7 @@
 Section: devel
 Depends: ${shlibs:Depends}
 Recommends: qt3-dev-tools
-Replaces: qt3-tools, libqt3-dev, libqt3-mt-dev
+Replaces: qt3-tools, libqt3-dev, libqt3-mt-dev, qt3-doc (<< 3:3.3.5-1)
 Suggests: qt3-assistant, qt3-doc
 Conflicts: qt-designer (<= 3:2.3.2-9), qt-designer-doc
 Description: Qt3 Designer
@@ -177,7 +177,7 @@
 Section: devel
 Suggests: qt3-assistant
 Depends: ${shlibs:Depends}
-Replaces: qt3-tools, libqt3-dev, libqt3-mt-dev
+Replaces: qt3-tools, libqt3-dev, libqt3-mt-dev, qt3-doc (<< 3:3.3.5-1)
 Description: The Qt3 Linguist
  This package contains the Qt3 Linguist which provides translators a
  tool perfect for translating any Qt-based application into other




More information about the pkg-kde-commits mailing list