[SCM] QtWebKit packaging branch, master, updated. debian/2.1.0-2011week13-2-30-gc27298f

[Fathi Boudra]

The following commit has been merged in the master branch:
commit b2ced9fc34cfb879195f8de59732402862411eb3
Author: Fathi Boudra <fabo at debian.org>
Date:   Thu Sep 22 22:07:57 2011 +0300

    Add qwebview designer plugin and make libqtwebkit-dev depend on
    ${shlibs:Depends} as we are shipping the qwebview designer plugin.
    (Closes: #612974)
---
 debian/changelog               |   11 +++++++----
 debian/control                 |    3 ++-
 debian/libqtwebkit-dev.install |    1 +
 debian/rules                   |   12 +++++++++---
 debian/source/include-binaries |    1 +
 5 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 78b0966..6b812da 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-qtwebkit (2.2.0~rc1-1) UNRELEASED; urgency=low
+qtwebkit (2.2.0~rc1-1) UNSTABLE; urgency=low
 
   * New upstream release:
     - provides support for s390/s390x. (Closes: #637004)
@@ -21,9 +21,9 @@ qtwebkit (2.2.0~rc1-1) UNRELEASED; urgency=low
     - bump Qt build dependency to 4:4.7.4~. This version introduce multiarch.
     - add pkg-config, libgstreamer-plugins-base0.10-dev and
       libgstreamer0.10-dev build dependencies.
-    - drop libphonon-dev build and qt-mobility build dependencies.
-      (Closes: #634388) GStreamer will be used as the multimedia backend as
-      recommended by upstream.
+    - drop libphonon-dev build and qt-mobility build dependencies. GStreamer
+      will be used as the multimedia backend as recommended by upstream.
+      (Closes: #634388) 
   * Update debian/*.install files for multiarch.
   * Add debian/README.source: explain how to create a new upstream tarball.
   * Update debian/rules:
@@ -33,6 +33,9 @@ qtwebkit (2.2.0~rc1-1) UNRELEASED; urgency=low
       changed.
     - add override_dh_auto_clean to remove Source/Makefile file and avoid
       dh_clean failure.
+  * Add qwebview designer plugin and make libqtwebkit-dev depend on
+    ${shlibs:Depends} as we are shipping the qwebview designer plugin.
+    (Closes: #612974)
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Mon, 19 Sep 2011 16:32:18 +0300
 
diff --git a/debian/control b/debian/control
index eff15ac..a5e161f 100644
--- a/debian/control
+++ b/debian/control
@@ -25,7 +25,8 @@ Section: libdevel
 Architecture: any
 Depends: libqt4-dev (>= 4:4.7.4~),
          libqtwebkit4 (= ${binary:Version}),
-         ${misc:Depends}
+         ${misc:Depends},
+         ${shlibs:Depends}
 Replaces: libqt4-dev (<= 4:4.7.0~beta1)
 Description: Web content engine library for Qt - development files
  QtWebKit provides a Web browser engine that makes it easy to embed content
diff --git a/debian/libqtwebkit-dev.install b/debian/libqtwebkit-dev.install
index b618158..cb4dbaa 100644
--- a/debian/libqtwebkit-dev.install
+++ b/debian/libqtwebkit-dev.install
@@ -33,4 +33,5 @@ usr/include/qt4/QtWebKit/qwebview.h
 usr/lib/*/libQtWebKit.prl
 usr/lib/*/libQtWebKit.so
 usr/lib/*/pkgconfig/QtWebKit.pc
+usr/lib/*/qt4/plugins/designer/libqwebview.so
 usr/share/qt4/mkspecs/modules/qt_webkit_version.pri
diff --git a/debian/rules b/debian/rules
index d28a1ce..f2d4a9b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,6 +3,8 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+QWEBVIEW_DIR=debian/plugins/qwebview
+
 # Filter -g from environment on troublesome arches. Replace it with -gstabs
 # See also: stabs_format_debug_info.diff
 DEB_HOST_ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH)
@@ -12,13 +14,17 @@ ifneq (,$(filter $(DEB_HOST_ARCH),s390 s390x armel mips mipsel))
 endif
 
 %:
-	dh $@ --sourcedirectory=Source --buildsystem=qmake --parallel --list-missing --dbg-package=libqtwebkit4-dbg --with pkgkde_symbolshelper
+	dh $@ --sourcedirectory=Source --buildsystem=qmake_qt4 --parallel --list-missing --dbg-package=libqtwebkit4-dbg --with pkgkde_symbolshelper
 
 override_dh_auto_configure:
 	dh_auto_configure -- DEFINES+=ENABLE_VIDEO=1 DEFINES+=WTF_USE_GSTREAMER=1
-#	TODO: qwebview configure/build/install
+	cd $(QWEBVIEW_DIR); qmake
+
+override_dh_auto_install:
+	dh_auto_install
+	$(MAKE) -C $(QWEBVIEW_DIR) INSTALL_ROOT=$(CURDIR)/debian/tmp install
 
 override_dh_auto_clean:
 	rm -f Source/Makefile
+	[ ! -f $(QWEBVIEW_DIR)/Makefile ] || $(MAKE) -C $(QWEBVIEW_DIR) distclean
 	dh_auto_clean
-#	TODO: qwebview clean
diff --git a/debian/source/include-binaries b/debian/source/include-binaries
new file mode 100644
index 0000000..70b86b0
--- /dev/null
+++ b/debian/source/include-binaries
@@ -0,0 +1 @@
+debian/plugins/qwebview/images/qwebview.png

-- 
QtWebKit packaging