[SCM] qt5webkit packaging branch, master, updated. 898b6ebb3814350d0e728222b9dfbe63bb3e034f

[Pino Toscano]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qt5webkit.git;a=commitdiff;h=898b6eb

The following commit has been merged in the master branch:
commit 898b6ebb3814350d0e728222b9dfbe63bb3e034f
Author: Pino Toscano <pino at debian.org>
Date:   Sun May 19 15:02:17 2013 +0200

    remove private headers
    
    they are not needed for now, and in case a -private-dev can be added later
---
 debian/libqt5webkit5-dev.install |   36 ------------------------------------
 debian/rules                     |    4 ++++
 2 files changed, 4 insertions(+), 36 deletions(-)

diff --git a/debian/libqt5webkit5-dev.install b/debian/libqt5webkit5-dev.install
index 8246c25..5a26488 100644
--- a/debian/libqt5webkit5-dev.install
+++ b/debian/libqt5webkit5-dev.install
@@ -1,35 +1,3 @@
-usr/include/qt5/QtWebKit/*/QtWebKit/private/bytearraytestdata.h
-usr/include/qt5/QtWebKit/*/QtWebKit/private/qhttpheader_p.h
-usr/include/qt5/QtWebKit/*/QtWebKit/private/qquicknetworkreply_p.h
-usr/include/qt5/QtWebKit/*/QtWebKit/private/qquicknetworkrequest_p.h
-usr/include/qt5/QtWebKit/*/QtWebKit/private/qquickurlschemedelegate_p.h
-usr/include/qt5/QtWebKit/*/QtWebKit/private/qquickwebpage_p.h
-usr/include/qt5/QtWebKit/*/QtWebKit/private/qquickwebpage_p_p.h
-usr/include/qt5/QtWebKit/*/QtWebKit/private/qquickwebview_p.h
-usr/include/qt5/QtWebKit/*/QtWebKit/private/qquickwebview_p_p.h
-usr/include/qt5/QtWebKit/*/QtWebKit/private/qrawwebview_p.h
-usr/include/qt5/QtWebKit/*/QtWebKit/private/qrawwebview_p_p.h
-usr/include/qt5/QtWebKit/*/QtWebKit/private/qtwebsecurityorigin_p.h
-usr/include/qt5/QtWebKit/*/QtWebKit/private/qwebdatabase_p.h
-usr/include/qt5/QtWebKit/*/QtWebKit/private/qwebdownloaditem_p.h
-usr/include/qt5/QtWebKit/*/QtWebKit/private/qwebdownloaditem_p_p.h
-usr/include/qt5/QtWebKit/*/QtWebKit/private/qwebelement_p.h
-usr/include/qt5/QtWebKit/*/QtWebKit/private/qwebhistory_p.h
-usr/include/qt5/QtWebKit/*/QtWebKit/private/qwebiconimageprovider_p.h
-usr/include/qt5/QtWebKit/*/QtWebKit/private/qwebkittest_p.h
-usr/include/qt5/QtWebKit/*/QtWebKit/private/qwebloadrequest_p.h
-usr/include/qt5/QtWebKit/*/QtWebKit/private/qwebnavigationhistory_p.h
-usr/include/qt5/QtWebKit/*/QtWebKit/private/qwebnavigationhistory_p_p.h
-usr/include/qt5/QtWebKit/*/QtWebKit/private/qwebnavigationrequest_p.h
-usr/include/qt5/QtWebKit/*/QtWebKit/private/qwebpermissionrequest_p.h
-usr/include/qt5/QtWebKit/*/QtWebKit/private/qwebplugindatabase_p.h
-usr/include/qt5/QtWebKit/*/QtWebKit/private/qwebpreferences_p.h
-usr/include/qt5/QtWebKit/*/QtWebKit/private/qwebpreferences_p_p.h
-usr/include/qt5/QtWebKit/*/QtWebKit/private/qwebscriptworld.h
-usr/include/qt5/QtWebKit/*/QtWebKit/private/qwebscriptworld_p.h
-usr/include/qt5/QtWebKit/*/QtWebKit/private/qwebsecurityorigin_p.h
-usr/include/qt5/QtWebKit/*/QtWebKit/private/testwindow.h
-usr/include/qt5/QtWebKit/*/QtWebKit/private/util.h
 usr/include/qt5/QtWebKit/QWebDatabase
 usr/include/qt5/QtWebKit/QWebElement
 usr/include/qt5/QtWebKit/QWebElementCollection
@@ -60,10 +28,6 @@ usr/include/qt5/QtWebKit/qwebkitplatformplugin.h
 usr/include/qt5/QtWebKit/qwebpluginfactory.h
 usr/include/qt5/QtWebKit/qwebsecurityorigin.h
 usr/include/qt5/QtWebKit/qwebsettings.h
-usr/include/qt5/QtWebKitWidgets/*/QtWebKitWidgets/private/qwebframe_p.h
-usr/include/qt5/QtWebKitWidgets/*/QtWebKitWidgets/private/qwebinspector_p.h
-usr/include/qt5/QtWebKitWidgets/*/QtWebKitWidgets/private/qwebpage_p.h
-usr/include/qt5/QtWebKitWidgets/*/QtWebKitWidgets/private/qwebviewaccessible_p.h
 usr/include/qt5/QtWebKitWidgets/QGraphicsWebView
 usr/include/qt5/QtWebKitWidgets/QWebFrame
 usr/include/qt5/QtWebKitWidgets/QWebHitTestResult
diff --git a/debian/rules b/debian/rules
index 494baab..8256c08 100755
--- a/debian/rules
+++ b/debian/rules
@@ -38,6 +38,10 @@ override_dh_auto_install:
 	find $(CURDIR)/debian/tmp/usr/lib/*/pkgconfig -type f -name '*.pc' \
 	-exec sed -i -e 's/$(DEB_HOST_MULTIARCH)\/$(DEB_HOST_MULTIARCH)/$(DEB_HOST_MULTIARCH)/g' {} \;
 	
+	# Remove private headers
+	rm -rf debian/tmp/usr/include/qt5/QtWebKit/*/QtWebKit
+	rm -rf debian/tmp/usr/include/qt5/QtWebKitWidgets/*/QtWebKitWidgets
+	
 	# Remove libtool-like files
 	rm -f debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/*.la
 

-- 
qt5webkit packaging