[Pkg-kde-commits] rev 1752 - people/chrsmrtn/qt-x11-free/debian trunk/packages/qt-x11-free/debian

[Christopher Martin]

Author: chrsmrtn-guest
Date: 2005-09-09 12:47:21 +0000 (Fri, 09 Sep 2005)
New Revision: 1752

Modified:
   people/chrsmrtn/qt-x11-free/debian/changelog
   people/chrsmrtn/qt-x11-free/debian/control
   trunk/packages/qt-x11-free/debian/changelog
   trunk/packages/qt-x11-free/debian/control
Log:
Add Replaces for the documentation that moved in -8.

Also slip in a Conflicts/Replaces for libqt3-mt-dev
over libqt3-dev. These packages have conflicted
for a long time, and now one is fully deprecated
as well.


Modified: people/chrsmrtn/qt-x11-free/debian/changelog
===================================================================
--- people/chrsmrtn/qt-x11-free/debian/changelog	2005-09-08 22:46:01 UTC (rev 1751)
+++ people/chrsmrtn/qt-x11-free/debian/changelog	2005-09-09 12:47:21 UTC (rev 1752)
@@ -2,12 +2,15 @@
 
   +++ 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)
+
   * Re-enable InterBase support. [!!! Not yet ready !!!]
 
   * Revert the versioning of our build-depends on libpq-dev, since the fixed
     package has now built on all architectures. [!!! Not yet ready !!!]
 
- -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu,  8 Sep 2005 09:22:53 -0400
+ -- 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: people/chrsmrtn/qt-x11-free/debian/control
===================================================================
--- people/chrsmrtn/qt-x11-free/debian/control	2005-09-08 22:46:01 UTC (rev 1751)
+++ people/chrsmrtn/qt-x11-free/debian/control	2005-09-09 12:47:21 UTC (rev 1752)
@@ -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, libaudio-dev, libcupsys2-dev, xlibmesa-gl-dev | libgl-dev, libglu1-xorg-dev | libglu1-mesa-dev | libglu-dev, libxft-dev, dpatch (>= 1.13), libsqlite0-dev, firebird2-dev [i386 hurd-i386 kfreebsd-i386 knetbsd-i386 netbsd-i386]
+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
 Section: libs
 Priority: optional
 Standards-Version: 3.6.2
@@ -84,9 +84,9 @@
 Package: libqt3-mt-dev
 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)
+Replaces: libqt-mt-dev, libqt3-dev, 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), 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}), xlibmesa-gl-dev | libgl-dev, libglu1-xorg-dev | libglu1-mesa-dev | libglu-dev, libxft-dev, libaudio-dev
-Conflicts: libqt-mt-dev, libqt3-emb (<= 3:3.0.3-1)
+Conflicts: libqt-mt-dev, libqt3-emb (<= 3:3.0.3-1), libqt3-dev
 Recommends: libqt3-compat-headers
 Suggests: libqt3-i18n, qt3-doc
 Description: Qt development files (Threaded)
@@ -256,7 +256,7 @@
 Architecture: all
 Section: doc
 Priority: extra
-Replaces: qt-doc
+Replaces: qt-doc, qt3-designer (<< 3:3.3.4-8), qt3-linguist (<< 3:3.3.4-8)
 Suggests: libqt3-headers, qt3-assistant | www-browser
 Description: Qt3 API documentation
  This package contains the complete API documentation for Qt3.

Modified: trunk/packages/qt-x11-free/debian/changelog
===================================================================
--- trunk/packages/qt-x11-free/debian/changelog	2005-09-08 22:46:01 UTC (rev 1751)
+++ trunk/packages/qt-x11-free/debian/changelog	2005-09-09 12:47:21 UTC (rev 1752)
@@ -1,3 +1,12 @@
+qt-x11-free (3:3.3.4-9) unstable; urgency=low
+
+  +++ 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)
+
+ -- 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
 
   +++ Changes by Christopher Martin:

Modified: trunk/packages/qt-x11-free/debian/control
===================================================================
--- trunk/packages/qt-x11-free/debian/control	2005-09-08 22:46:01 UTC (rev 1751)
+++ trunk/packages/qt-x11-free/debian/control	2005-09-09 12:47:21 UTC (rev 1752)
@@ -84,9 +84,9 @@
 Package: libqt3-mt-dev
 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)
+Replaces: libqt-mt-dev, libqt3-dev, 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), 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}), xlibmesa-gl-dev | libgl-dev, libglu1-xorg-dev | libglu1-mesa-dev | libglu-dev, libxft-dev, libaudio-dev
-Conflicts: libqt-mt-dev, libqt3-emb (<= 3:3.0.3-1)
+Conflicts: libqt-mt-dev, libqt3-emb (<= 3:3.0.3-1), libqt3-dev
 Recommends: libqt3-compat-headers
 Suggests: libqt3-i18n, qt3-doc
 Description: Qt development files (Threaded)
@@ -256,7 +256,7 @@
 Architecture: all
 Section: doc
 Priority: extra
-Replaces: qt-doc
+Replaces: qt-doc, qt3-designer (<< 3:3.3.4-8), qt3-linguist (<< 3:3.3.4-8)
 Suggests: libqt3-headers, qt3-assistant | www-browser
 Description: Qt3 API documentation
  This package contains the complete API documentation for Qt3.