[SCM] QtWebKit packaging branch, qt5, updated. debian/2.2.1-5-2-g32f8673

[Timo Jyrinki]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtwebkit.git;a=commitdiff;h=32f8673

The following commit has been merged in the qt5 branch:
commit 32f86738d4daf6fc62816808114d5716c897579c
Author: Timo Jyrinki <timo.jyrinki at canonical.com>
Date:   Tue Dec 18 15:55:48 2012 +0000

    Update for rc2
    
    Remove .la files, adapt to the fixed archdatadir.
    A functional rules file now included.
    Run chrpath on the webprocess binaries.
---
 debian/changelog                             |    2 +-
 debian/libqt5webkit5-dev.install             |    2 -
 debian/libqt5webkit5-qmlwebkitplugin.install |    8 +++---
 debian/libqt5webkit5.install                 |    4 +-
 debian/rules                                 |   28 ++++++++++++-------------
 5 files changed, 20 insertions(+), 24 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 553bc5b..39fde49 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-qtwebkit-opensource-src (5.0.0~rc1-1) UNRELEASED; urgency=low
+qtwebkit-opensource-src (5.0.0~rc2-1) UNRELEASED; urgency=low
 
   * New upstream release candidate.
   * debian/control:
diff --git a/debian/libqt5webkit5-dev.install b/debian/libqt5webkit5-dev.install
index e55bc33..89e03e3 100644
--- a/debian/libqt5webkit5-dev.install
+++ b/debian/libqt5webkit5-dev.install
@@ -77,7 +77,6 @@ usr/include/qt5/QtWebKit/qwebsecurityorigin.h
 usr/include/qt5/QtWebKitWidgets/qtwebkitwidgetsversion.h
 usr/lib/*/libQt5WebKitWidgets.prl
 usr/lib/*/libQt5WebKitWidgets.so
-usr/lib/*//libQt5WebKitWidgets.la
 usr/lib/*/pkgconfig/Qt5WebKitWidgets.pc
 usr/share/qt5/mkspecs/modules/qt_lib_webkitwidgets.pri
 usr/lib/*/libQt5WebKit.so
@@ -85,7 +84,6 @@ usr/share/qt5/mkspecs/modules/qt_lib_webkit.pri
 usr/include/qt5/QtWebKit/QtWebKit
 usr/include/qt5/QtWebKit/QtWebKitVersion
 usr/include/qt5/QtWebKit/qtwebkitversion.h
-usr/lib/*/libQt5WebKit.la
 usr/lib/*/libQt5WebKit.prl
 usr/lib/*/cmake/Qt5WebKit/Qt5WebKitConfig.cmake
 usr/lib/*/cmake/Qt5WebKit/Qt5WebKitConfigVersion.cmake
diff --git a/debian/libqt5webkit5-qmlwebkitplugin.install b/debian/libqt5webkit5-qmlwebkitplugin.install
index 1385034..ab85d9d 100644
--- a/debian/libqt5webkit5-qmlwebkitplugin.install
+++ b/debian/libqt5webkit5-qmlwebkitplugin.install
@@ -1,4 +1,4 @@
-usr/share/qt5/qml/QtWebKit/experimental/libqmlwebkitexperimentalplugin.so
-usr/share/qt5/qml/QtWebKit/experimental/qmldir
-usr/share/qt5/qml/QtWebKit/libqmlwebkitplugin.so
-usr/share/qt5/qml/QtWebKit/qmldir
+usr/lib/*/qt5/qml/QtWebKit/experimental/libqmlwebkitexperimentalplugin.so
+usr/lib/*/qt5/qml/QtWebKit/experimental/qmldir
+usr/lib/*/qt5/qml/QtWebKit/libqmlwebkitplugin.so
+usr/lib/*/qt5/qml/QtWebKit/qmldir
diff --git a/debian/libqt5webkit5.install b/debian/libqt5webkit5.install
index 08b02f6..5ce1a9b 100644
--- a/debian/libqt5webkit5.install
+++ b/debian/libqt5webkit5.install
@@ -1,4 +1,4 @@
 usr/lib/*/libQt5WebKitWidgets.so.*
 usr/lib/*/libQt5WebKit.so.*
-usr/share/qt5/libexec/QtWebPluginProcess
-usr/share/qt5/libexec/QtWebProcess
+usr/lib/*/qt5/libexec/QtWebPluginProcess
+usr/lib/*/qt5/libexec/QtWebProcess
diff --git a/debian/rules b/debian/rules
index 41214b2..40d1ec5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,7 +3,9 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-QWEBVIEW_DIR=debian/plugins/qwebview
+export CFLAGS := $(shell dpkg-buildflags --get CFLAGS) $(shell dpkg-buildflags --get CPPFLAGS)
+export CXXFLAGS := $(shell dpkg-buildflags --get CXXFLAGS) $(shell dpkg-buildflags --get CPPFLAGS)
+export LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS) -Wl,--as-needed
 
 # Filter -g from environment on troublesome arches. Replace it with -gstabs
 # See also: stabs_format_debug_info.diff
@@ -19,24 +21,20 @@ ifneq (,$(filter $(DEB_HOST_ARCH),alpha))
 endif
 
 %:
-	dh $@ --sourcedirectory=Source --buildsystem=qmake --parallel --list-missing --dbg-package=libqtwebkit4-dbg --with pkgkde_symbolshelper
+	dh $@ --parallel --list-missing --dbg-package=libqt5webkit5-dbg --with pkgkde_symbolshelper
 
 override_dh_auto_configure:
-	dh_auto_configure -- DEFINES+=ENABLE_VIDEO=1 DEFINES+=WTF_USE_GSTREAMER=1
-	dh_auto_configure --sourcedirectory=$(QWEBVIEW_DIR)
-
-override_dh_auto_build:
-	dh_auto_build
-	dh_auto_build --sourcedirectory=$(QWEBVIEW_DIR)
+	qmake
 
 override_dh_auto_install:
-	dh_auto_install
-	dh_auto_install --sourcedirectory=$(QWEBVIEW_DIR)
-
-override_dh_auto_clean:
-	rm -f Source/Makefile
-	dh_auto_clean
-	dh_auto_clean --sourcedirectory=$(QWEBVIEW_DIR)
+	make install INSTALL_ROOT=$(CURDIR)/debian/tmp
+	
+	# Remove rpath from the offending binaries
+	chrpath -r "" $(CURDIR)/debian/tmp/usr/lib/*/qt5/libexec/QtWebProcess
+	chrpath -r "" $(CURDIR)/debian/tmp/usr/lib/*/qt5/libexec/QtWebPluginProcess
+	
+	# Remove la files (http://wiki.debian.org/ReleaseGoals/LAFileRemoval)
+	rm -f debian/tmp/usr/lib/*/*.la
 
 override_dh_builddeb:
 	dh_builddeb -- -Zxz

-- 
QtWebKit packaging