Merge branch 'master' of git+ssh://git.debian.org/git/pkg-kde/qt/qtwebkit

5 files changed, 18 insertions, 10 deletions

diff --git a/debian/changelog b/debian/changelog
index 310a01c..525b2f1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,13 @@ qtwebkit (2.2.1-2) UNRELEASED; urgency=low
   * Build with -gstabs on armhf instead of -g, like armel.
   * Re-add adjust_symbols_visibility_for_webcore.diff.
 
+  [ Pino Toscano ]
+  * glibc_mkspec.diff: rename to glibc_hurd_mkspecs.diff, and extend to
+    apply also to the hurd-g++ mkspec.
+  * Bump Qt build dependency to 4:4.8.1~ (for the change in paths of QML
+    imports).
+    - update debian/libqtwebkit-qmlwebkitplugin.install accordingly
+
  -- Fathi Boudra <fabo@debian.org>  Tue, 01 May 2012 15:07:39 +0300
 
 qtwebkit (2.2.1-1) experimental; urgency=low
diff --git a/debian/control b/debian/control
index 203abaf..96de5dd 100644
--- a/debian/control
+++ b/debian/control
@@ -7,8 +7,8 @@ Build-Depends: debhelper (>= 9),
                libgstreamer-plugins-base0.10-dev,
                libgstreamer0.10-dev,
                libicu-dev,
-               libqt4-dev (>= 4:4.8.0~),
-               libqt4-opengl-dev (>= 4:4.8.0~),
+               libqt4-dev (>= 4:4.8.1~),
+               libqt4-opengl-dev (>= 4:4.8.1~),
                libsqlite3-dev,
                libxext-dev,
                libxrender-dev,
diff --git a/debian/libqtwebkit-qmlwebkitplugin.install b/debian/libqtwebkit-qmlwebkitplugin.install
index c9d328c..bbc8855 100644
--- a/debian/libqtwebkit-qmlwebkitplugin.install
+++ b/debian/libqtwebkit-qmlwebkitplugin.install
@@ -1,2 +1,2 @@
-usr/lib/qt4/imports/QtWebKit/libqmlwebkitplugin.so
-usr/lib/qt4/imports/QtWebKit/qmldir
+usr/lib/*/qt4/imports/QtWebKit/libqmlwebkitplugin.so
+usr/lib/*/qt4/imports/QtWebKit/qmldir
diff --git a/debian/patches/glibc_mkspec.diff b/debian/patches/glibc_hurd_mkspecs.diff
index f75b02c..797629c 100644
--- a/debian/patches/glibc_mkspec.diff
+++ b/debian/patches/glibc_hurd_mkspecs.diff
@@ -1,10 +1,11 @@
 Author: Pino Toscano <pino@debian.org>
-Description: Use the glibc mkspec when necessary.
+Description: Use the glibc and hurd mkspecs when necessary.
  - wtf.pri: enable the glib support (needed to compile the GStreamer support)
  - WebKit.pri: add -Werror on non-Linux i386/amd64 archs, and -Wno-c++0x-compat
    for all the non-Linux ones
- This is Debian-specific, as upstream does not have the glibc-g++ mkspec.
-Last-Update: 2011-09-20
+ The glibc part is Debian-specific, as upstream does not have the glibc-g++
+ mkspec, while the hurd part could be upstreamed.
+Last-Update: 2012-05-01
 Origin: vendor
 Forwarded: not-needed
 
@@ -20,7 +21,7 @@ Forwarded: not-needed
      wtf/unicode/UTF8.cpp
  
 -linux-*:!contains(DEFINES, USE_QTMULTIMEDIA=1) {
-+linux-*|glibc-*:!contains(DEFINES, USE_QTMULTIMEDIA=1) {
++linux-*|glibc-*|hurd-*:!contains(DEFINES, USE_QTMULTIMEDIA=1) {
      !contains(QT_CONFIG, no-pkg-config):system(pkg-config --exists glib-2.0 gio-2.0 gstreamer-0.10): {
          DEFINES += ENABLE_GLIB_SUPPORT=1
          PKGCONFIG += glib-2.0 gio-2.0
@@ -31,7 +32,7 @@ Forwarded: not-needed
  
  # Treat warnings as errors on x86/Linux/GCC
 -linux-g++* {
-+linux-g++*|glibc-* {
++linux-g++*|glibc-*|hurd-* {
      isEqual(QT_ARCH,x86_64)|isEqual(QT_ARCH,i386): QMAKE_CXXFLAGS += -Werror
  
      greaterThan(QT_GCC_MAJOR_VERSION, 3):greaterThan(QT_GCC_MINOR_VERSION, 5) {
diff --git a/debian/patches/series b/debian/patches/series
index 85afe41..90cfd6b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -14,5 +14,5 @@ stabs_format_debug_info.diff
 no_gc_sections.diff
 #linux_amd64_no_overcommit.diff
 defines_qt_webkit.diff
-glibc_mkspec.diff
+glibc_hurd_mkspecs.diff
 hurd.diff