summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Rosewarne <mrosewarne@inoutbox.com>2008-04-15 07:40:08 +0000
committerMatthew Rosewarne <mrosewarne@inoutbox.com>2008-04-15 07:40:08 +0000
commit456f007c40e2ce6a31ddb92194b99063ffd0eb96 (patch)
treeda9683ea143784456f8222c28b631348eabb7045
parent91613de4a458256014eb0c49172bf030abdfa427 (diff)
downloadqt4-x11-456f007c40e2ce6a31ddb92194b99063ffd0eb96.tar.gz
* demos recommend docs
-rw-r--r--debian/changelog8
-rw-r--r--debian/control1
2 files changed, 8 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index 52c40a8..86e4bc7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,7 @@
qt4-x11 (4.4.0~rc1-4) unstable; urgency=low
+ +++ Changes by Sune Vuorela:
+
* Have libqt4-dev conflict/replace libqtwebkit-dev.
* Fix qmake to generate a bit better pkg-config files. Those should usually
not be generated - as it ends up being crackful. After a bit of patching
@@ -11,7 +13,11 @@ qt4-x11 (4.4.0~rc1-4) unstable; urgency=low
much of qt4 build process relies on on it and is not yet fixed, but it is
saved for later use.
- -- Sune Vuorela <debian@pusling.com> Sat, 12 Apr 2008 18:14:01 +0200
+ +++ Changes by Matthew Rosewarne:
+
+ * Add Recommends: qt4-doc to qt4-demos.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Sat, 12 Apr 2008 18:14:01 +0200
qt4-x11 (4.4.0~rc1-3) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 5b5600c..d05457e 100644
--- a/debian/control
+++ b/debian/control
@@ -408,6 +408,7 @@ Package: qt4-demos
Architecture: any
Section: x11
Depends: ${shlibs:Depends}, ${misc:Depends}
+Recommends: qt4-doc (= ${source:Version}
Description: Qt 4 examples and demos
Qt is a cross-platform C++ application framework. Qt's primary feature
is its rich set of widgets that provide standard GUI functionality.