[SCM] QtWebKit packaging branch, master, updated. debian/2.2.1-7-53-g03fb5cb

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the master branch:
commit 59daf5abd1b88d2c15f6eb99c9a8a5fdad99e1d2
Author: Andreas Cord-Landwehr <cordlandwehr at kde.org>
Date:   Sat Aug 16 11:57:44 2014 +0200

    Make use of install files.
---
 debian/libqtwebkit-dev.install             | 46 ++++++++++++++++++++++++++++++
 debian/libqtwebkit-qmlwebkitplugin.install |  2 ++
 debian/libqtwebkit4.install                |  3 ++
 debian/rules                               | 19 ++----------
 4 files changed, 54 insertions(+), 16 deletions(-)

diff --git a/debian/libqtwebkit-dev.install b/debian/libqtwebkit-dev.install
new file mode 100644
index 0000000..cf40e20
--- /dev/null
+++ b/debian/libqtwebkit-dev.install
@@ -0,0 +1,46 @@
+usr/include/qt4/QtWebKit/QGraphicsWebView
+usr/include/qt4/QtWebKit/QWebDatabase
+usr/include/qt4/QtWebKit/QWebElement
+usr/include/qt4/QtWebKit/QWebElementCollection
+usr/include/qt4/QtWebKit/QWebFrame
+usr/include/qt4/QtWebKit/QWebFullScreenVideoHandler
+usr/include/qt4/QtWebKit/QWebHapticFeedbackPlayer
+usr/include/qt4/QtWebKit/QWebHistory
+usr/include/qt4/QtWebKit/QWebHistoryInterface
+usr/include/qt4/QtWebKit/QWebHistoryItem
+usr/include/qt4/QtWebKit/QWebHitTestResult
+usr/include/qt4/QtWebKit/QWebInspector
+usr/include/qt4/QtWebKit/QWebKitPlatformPlugin
+usr/include/qt4/QtWebKit/QWebNotificationData
+usr/include/qt4/QtWebKit/QWebNotificationPresenter
+usr/include/qt4/QtWebKit/QWebPage
+usr/include/qt4/QtWebKit/QWebPluginFactory
+usr/include/qt4/QtWebKit/QWebScriptWorld
+usr/include/qt4/QtWebKit/QWebSecurityOrigin
+usr/include/qt4/QtWebKit/QWebSelectData
+usr/include/qt4/QtWebKit/QWebSelectMethod
+usr/include/qt4/QtWebKit/QWebSettings
+usr/include/qt4/QtWebKit/QWebSpellChecker
+usr/include/qt4/QtWebKit/QWebTouchModifier
+usr/include/qt4/QtWebKit/QWebView
+usr/include/qt4/QtWebKit/QtWebKit
+usr/include/qt4/QtWebKit/qgraphicswebview.h
+usr/include/qt4/QtWebKit/qwebdatabase.h
+usr/include/qt4/QtWebKit/qwebelement.h
+usr/include/qt4/QtWebKit/qwebframe.h
+usr/include/qt4/QtWebKit/qwebhistory.h
+usr/include/qt4/QtWebKit/qwebhistoryinterface.h
+usr/include/qt4/QtWebKit/qwebinspector.h
+usr/include/qt4/QtWebKit/qwebkitglobal.h
+usr/include/qt4/QtWebKit/qwebkitplatformplugin.h
+usr/include/qt4/QtWebKit/qwebkitversion.h
+usr/include/qt4/QtWebKit/qwebpage.h
+usr/include/qt4/QtWebKit/qwebpluginfactory.h
+usr/include/qt4/QtWebKit/qwebscriptworld.h
+usr/include/qt4/QtWebKit/qwebsecurityorigin.h
+usr/include/qt4/QtWebKit/qwebsettings.h
+usr/include/qt4/QtWebKit/qwebview.h
+usr/lib/*/libQtWebKit.prl
+usr/lib/*/libQtWebKit.so
+usr/lib/*/pkgconfig/QtWebKit.pc
+usr/share/qt4/mkspecs/modules/qt_webkit.pri
\ No newline at end of file
diff --git a/debian/libqtwebkit-qmlwebkitplugin.install b/debian/libqtwebkit-qmlwebkitplugin.install
index e69de29..0bb1955 100644
--- a/debian/libqtwebkit-qmlwebkitplugin.install
+++ b/debian/libqtwebkit-qmlwebkitplugin.install
@@ -0,0 +1,2 @@
+usr/lib/*/qt4/imports/QtWebKit/qmldir
+usr/lib/*/qt4/imports/QtWebKit/libqmlwebkitplugin.so
diff --git a/debian/libqtwebkit4.install b/debian/libqtwebkit4.install
new file mode 100644
index 0000000..0d95f13
--- /dev/null
+++ b/debian/libqtwebkit4.install
@@ -0,0 +1,3 @@
+usr/lib/*/libQtWebKit.so.4
+usr/lib/*/libQtWebKit.so.4.10
+usr/lib/*/libQtWebKit.so.4.10.2
\ No newline at end of file
diff --git a/debian/rules b/debian/rules
index 0b49373..d8588dc 100755
--- a/debian/rules
+++ b/debian/rules
@@ -34,20 +34,7 @@ override_dh_auto_configure:
 override_dh_auto_build:
 	./Tools/Scripts/build-webkit --qt
 
-override_dh_auto_install:
-	mkdir -p debian/libqtwebkit4/usr/lib/$(DEB_HOST_MULTIARCH)/
-	cp --no-dereference WebKitBuild/Release/lib/libQtWebKit.so.* debian/libqtwebkit4/usr/lib/$(DEB_HOST_MULTIARCH)/
-
-	mkdir -p debian/libqtwebkit-dev/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig/
-	cp WebKitBuild/Release/lib/libQtWebKit.prl debian/libqtwebkit-dev/usr/lib/$(DEB_HOST_MULTIARCH)/libQtWebKit.prl
-	cp WebKitBuild/Release/lib/pkgconfig/QtWebKit.pc debian/libqtwebkit-dev/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig/QtWebKit.pc
-	mkdir -p debian/libqtwebkit-dev/usr/include/qt4/QtWebKit/
-	cp Source/WebKit/qt/Api/*h debian/libqtwebkit-dev/usr/include/qt4/QtWebKit/
-	cp WebKitBuild/Release/include/QtWebKit/Q* debian/libqtwebkit-dev/usr/include/qt4/QtWebKit/
-	rm debian/libqtwebkit-dev/usr/include/qt4/QtWebKit/*_p.h
-	cp --no-dereference WebKitBuild/Release/lib/libQtWebKit.so debian/libqtwebkit-dev/usr/lib/$(DEB_HOST_MULTIARCH)/
-
-	mkdir -p debian/libqtwebkit-qmlwebkitplugin/usr/lib/$(DEB_HOST_MULTIARCH)/qt4/imports/QtWebKit/
-	cp WebKitBuild/Release/imports/QtWebKit/libqmlwebkitplugin.so debian/libqtwebkit-qmlwebkitplugin/usr/lib/$(DEB_HOST_MULTIARCH)/qt4/imports/QtWebKit/
-	cp WebKitBuild/Release/imports/QtWebKit/qmldir debian/libqtwebkit-qmlwebkitplugin/usr/lib/$(DEB_HOST_MULTIARCH)/qt4/imports/QtWebKit/
+override_dh_install:
+	make INSTALL_ROOT=$(CURDIR)/debian/tmp -C WebKitBuild/Release install
+	dh_install
 

-- 
QtWebKit packaging