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

Pino Toscano pino-guest at alioth.debian.org
Mon Feb 15 15:50:15 UTC 2010


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

    Add x-www-browser as alternative in qt4-doc-html's browser suggestion.
---
 debian/changelog |    3 ++-
 debian/control   |    2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 832b101..82feaeb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -64,8 +64,9 @@ qt4-x11 (4:4.6.2-1) UNRELEASED; urgency=low
     usage of SA_SIGINFO.
   * 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.
 
- -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Mon, 15 Feb 2010 16:04:13 +0100
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Mon, 15 Feb 2010 16:49:38 +0100
 
 qt4-x11 (4:4.6.0-1) experimental; urgency=low
 
diff --git a/debian/control b/debian/control
index c6e4f25..128da4c 100644
--- a/debian/control
+++ b/debian/control
@@ -575,7 +575,7 @@ Package: qt4-doc-html
 Architecture: all
 Section: doc
 Depends: ${misc:Depends}
-Suggests: w3m | www-browser, libqt4-dev, qt4-dev-tools
+Suggests: w3m | www-browser | x-www-browser, libqt4-dev, qt4-dev-tools
 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 Debian packaging



More information about the pkg-kde-commits mailing list