[SCM] QtWebKit packaging branch, master, updated. debian/2.1.0-2011week13-1-5-g35103b5

Fathi Boudra fabo at alioth.debian.org
Mon Jun 20 13:03:54 UTC 2011


The following commit has been merged in the master branch:
commit caa8b5623bbf4d6be5de29b99efee7ae997fcf35
Author: Fathi Boudra <fabo at debian.org>
Date:   Mon Jun 20 16:00:18 2011 +0300

    Add defines_qt_webkit.diff to display correctly documentation in Qt Creator Help plugin. (Closes: #619443)
---
 debian/changelog                      |    5 +++--
 debian/patches/defines_qt_webkit.diff |   15 +++++++++++++++
 debian/patches/series                 |    1 +
 3 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7bcba7e..e4d4ddf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
-qtwebkit (2.1.1~beta1-1) UNRELEASED; urgency=low
+qtwebkit (2.1.0~2011week13-2) unstable; urgency=low
 
-  * New upstream release.
+  * Add defines_qt_webkit.diff to display correctly documentation in Qt Creator
+    Help plugin. (Closes: #619443)
 
  -- Fathi Boudra <fabo at debian.org>  Sun, 19 Jun 2011 12:35:00 +0300
 
diff --git a/debian/patches/defines_qt_webkit.diff b/debian/patches/defines_qt_webkit.diff
new file mode 100644
index 0000000..7f6472c
--- /dev/null
+++ b/debian/patches/defines_qt_webkit.diff
@@ -0,0 +1,15 @@
+Description: defines QT_WEBKIT to display correctly documentation in Qt Creator Help plugin.
+Author: Fathi Boudra <fabo at debian.org>
+Debian-Bug: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=619443
+Bug: http://bugreports.qt.nokia.com/browse/QTBUG-13608
+---
+ WebKit/qt/qt_webkit_version.pri |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/WebKit/qt/qt_webkit_version.pri
++++ b/WebKit/qt/qt_webkit_version.pri
+@@ -3,3 +3,4 @@ QT_WEBKIT_MAJOR_VERSION = 4
+ QT_WEBKIT_MINOR_VERSION = 8
+ QT_WEBKIT_PATCH_VERSION = 0
+ QT_CONFIG += webkit
++DEFINES += QT_WEBKIT
diff --git a/debian/patches/series b/debian/patches/series
index edef33c..cb8cf87 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -12,3 +12,4 @@ stabs_format_debug_info.diff
 no_gc_sections.diff
 09_hurd.diff
 linux_amd64_no_overcommit.diff
+defines_qt_webkit.diff

-- 
QtWebKit packaging



More information about the pkg-kde-commits mailing list