[SCM] Qt 4 packaging branch, master, updated. debian/4.7.2-3-12-g12ead55

[Pino Toscano]

The following commit has been merged in the master branch:
commit 12ead5513fe63b7bd766ec3781ece8761fc3925a
Author: Pino Toscano <pino at kde.org>
Date:   Thu Apr 28 16:30:23 2011 +0200

    qt4-dev-tools: suggest qt-assistant-compat instead of qt4-dev-tools
    
    ... as the former now contains the old assistant with uses HTML documentation
---
 debian/changelog |    3 +++
 debian/control   |    2 +-
 2 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6701df3..b5782bb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,6 +20,9 @@ qt4-x11 (4:4.7.2-4) UNRELEASED; urgency=low
   * Add patches:
     - powerpcspe.diff: identify PowerPCSPE as PowerPC. (Closes: #623185)
     - sh.diff: identify correctly sh4 CPUs. (Closes: #623281)
+  * Update debian/control:
+    - qt4-dev-tools: suggest qt-assistant-compat instead of qt4-dev-tools,
+      as the former now contains the old assistant with uses HTML documentation.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 15 Apr 2011 22:42:35 +0200
 
diff --git a/debian/control b/debian/control
index 7783b55..a368a7c 100644
--- a/debian/control
+++ b/debian/control
@@ -596,7 +596,7 @@ Package: qt4-doc-html
 Architecture: all
 Section: doc
 Depends: ${misc:Depends}
-Suggests: w3m | www-browser | x-www-browser, libqt4-dev, qt4-dev-tools
+Suggests: w3m | www-browser | x-www-browser, libqt4-dev, qt-assistant-compat
 Description: Qt 4 API documentation (HTML format)
  Qt is a cross-platform C++ application framework. Qt's primary feature
  is its rich set of widgets that provide standard GUI functionality.

-- 
Qt 4 packaging