diff options
| author | Fathi Boudra <fabo@debian.org> | 2011-09-16 01:29:31 +0300 |
|---|---|---|
| committer | Fathi Boudra <fabo@debian.org> | 2011-09-16 01:29:31 +0300 |
| commit | 68c96c215fbafc9b166d6b72e50f83d612e2ae47 (patch) | |
| tree | 0b99f58b40ef657d68ddc8debb73cb653dc64d31 | |
| parent | 37e3439c8fff36956935b6d5e69467b7fe3a1089 (diff) | |
| download | qt4-x11-68c96c215fbafc9b166d6b72e50f83d612e2ae47.tar.gz | |
Remove_QtHelp_dependency_on_QtXml.patch - (Closes: #641753)
| -rw-r--r-- | debian/changelog | 1 | ||||
| -rw-r--r-- | debian/patches/Remove_QtHelp_dependency_on_QtXml.patch | 30 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
3 files changed, 32 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index 407d9cf..f3085e2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -19,6 +19,7 @@ qt4-x11 (4:4.7.4-1) UNRELEASED; urgency=low (Closes: #641738) - openssl_no_ssl2.patch - OpenSSL in Debian dropped the insecure SSLv2 protocol. (Closes: #640210) + - Remove_QtHelp_dependency_on_QtXml.patch - (Closes: #641753) * Break qdbus out into a separate 'qdbus' package and make it a dependency of libqt4-dbus, because some things will use this at runtime. It makes libqt4-dbus genuinely multiarch-installable. diff --git a/debian/patches/Remove_QtHelp_dependency_on_QtXml.patch b/debian/patches/Remove_QtHelp_dependency_on_QtXml.patch new file mode 100644 index 0000000..aa5a2a7 --- /dev/null +++ b/debian/patches/Remove_QtHelp_dependency_on_QtXml.patch @@ -0,0 +1,30 @@ +commit 02f55668dada4a23ab84e4d3bda1df8a4984b3ae +Author: Constantin Makshin <cmakshin@gmail.com> +Date: Mon Sep 5 19:43:00 2011 +0200 + + Removed the unnecessary dependency of the QtHelp module on the QtXml one + + Merge-request: 2669 + Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> + +--- + mkspecs/features/help.prf | 2 +- + tools/assistant/lib/lib.pro | 1 - + 2 files changed, 1 insertion(+), 2 deletions(-) + +--- a/mkspecs/features/help.prf ++++ b/mkspecs/features/help.prf +@@ -1,4 +1,4 @@ + INCLUDEPATH = $$QMAKE_INCDIR_QT/QtHelp $$INCLUDEPATH +-QT += xml sql ++QT += sql + + qtAddLibrary(QtHelp) +--- a/tools/assistant/lib/lib.pro ++++ b/tools/assistant/lib/lib.pro +@@ -1,5 +1,4 @@ + QT += sql \ +- xml \ + network + TEMPLATE = lib + TARGET = QtHelp diff --git a/debian/patches/series b/debian/patches/series index 2f9cbb9..0440c99 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -53,3 +53,4 @@ qt-multiarch-plugin-path-compat.diff s390x_jscore.diff blacklist-diginotar-cert.diff openssl_no_ssl2.patch +Remove_QtHelp_dependency_on_QtXml.patch |