[SCM] Qt 4 Debian packaging branch, master, updated. debian/4.6.0-1-78-gbc38178

[Pino Toscano]

The following commit has been merged in the master branch:
commit bc3817862cbe909c3532ab2bb073b201af4f8756
Author: Pino Toscano <pino at kde.org>
Date:   Mon Feb 15 17:02:18 2010 +0100

    suggest qt4-doc-html in qt4-dev-tools (#498701)
---
 debian/changelog |    4 +++-
 debian/control   |    1 +
 2 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 82feaeb..5cefa9b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -65,8 +65,10 @@ qt4-x11 (4:4.6.2-1) UNRELEASED; urgency=low
   * Adapt watch file to the new file names of the Qt/X11 tarballs.
   * Polish a bit qdbus manpage.
   * Add x-www-browser as alternative in qt4-doc-html's browser suggestion.
+  * Suggest qt4-doc-html in qt4-dev-tools, as the latter contains assistant_adp
+    which uses such HTML documentation. (Closes: #498701)
 
- -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Mon, 15 Feb 2010 16:49:38 +0100
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Mon, 15 Feb 2010 17:00:35 +0100
 
 qt4-x11 (4:4.6.0-1) experimental; urgency=low
 
diff --git a/debian/control b/debian/control
index 128da4c..6016c84 100644
--- a/debian/control
+++ b/debian/control
@@ -504,6 +504,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, libqt4-sql-sqlite
 Conflicts: qt3-assistant (<= 3:3.3.4-7), qt3-designer (<= 3:3.3.4-7), qt3-linguist (<= 3:3.3.4-7)
 Replaces: libqt4-core (<< 4.4.0~beta1-1)
 Recommends: libqt4-dev, qt4-doc, qt4-designer
+Suggests: qt4-doc-html
 Description: Qt 4 development tools
  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 Debian packaging