[SCM] QtWebKit packaging branch, qt5, updated. debian/2.2.1-5-10-g1f13366

Timo Jyrinki timo at alioth.debian.org
Tue Feb 26 06:07:19 UTC 2013 

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

The following commit has been merged in the qt5 branch:
commit e26f05f728d94cefbf81222252cbc3933d2735a4
Author: Timo Jyrinki <timo.jyrinki at canonical.com>
Date:   Tue Feb 26 05:58:13 2013 +0000

    Update for qtwebkit-opensource-src 5.0.1
---
 debian/changelog                 |    3 +-
 debian/control                   |    1 +
 debian/libqt5webkit5-dev.install |   72 +++++++++++++++++++-------------------
 debian/rules                     |    4 ++
 4 files changed, 43 insertions(+), 37 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 21df905..b2030e0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,11 @@
-qtwebkit-opensource-src (5.0.0-1) UNRELEASED; urgency=low
+qtwebkit-opensource-src (5.0.1-1) UNRELEASED; urgency=low
 
   * New upstream release. (Closes: #697509)
   * debian/control:
     - Add missing Pre-Depends for xz compression
     - Rename packages by appending the major version
     - Depend on system png/jpeg libraries
+    - Depend on libfontconfig1-dev
   * debian/*.install:
     - Adjust to the new version and library renames
   * debian/rules:
diff --git a/debian/control b/debian/control
index ba3def5..9a1fd8f 100644
--- a/debian/control
+++ b/debian/control
@@ -34,6 +34,7 @@ Build-Depends: debhelper (>= 9.0.0),
                chrpath,
                libpng12-dev,
                libjpeg-dev,
+               libfontconfig1-dev,
 Standards-Version: 3.9.4
 Section: libs
 Homepage: http://trac.webkit.org/wiki/QtWebKit
diff --git a/debian/libqt5webkit5-dev.install b/debian/libqt5webkit5-dev.install
index 89e03e3..31ccd7e 100644
--- a/debian/libqt5webkit5-dev.install
+++ b/debian/libqt5webkit5-dev.install
@@ -17,42 +17,42 @@ usr/include/qt5/QtWebKitWidgets/QtWebKitWidgetsVersion
 usr/include/qt5/QtWebKit/QWebFullScreenVideoHandler
 usr/include/qt5/QtWebKitWidgets/QWebHitTestResult
 usr/include/qt5/QtWebKitWidgets/QWebFrame
-usr/include/qt5/QtWebKit/5.0.0/QtWebKit/private/qrawwebview_p_p.h
-usr/include/qt5/QtWebKit/5.0.0/QtWebKit/private/qwebpermissionrequest_p.h
-usr/include/qt5/QtWebKit/5.0.0/QtWebKit/private/qwebscriptworld.h
-usr/include/qt5/QtWebKit/5.0.0/QtWebKit/private/qquicknetworkrequest_p.h
-usr/include/qt5/QtWebKitWidgets/5.0.0/QtWebKitWidgets/private/qwebinspector_p.h
-usr/include/qt5/QtWebKitWidgets/5.0.0/QtWebKitWidgets/private/qwebframe_p.h
-usr/include/qt5/QtWebKit/5.0.0/QtWebKit/private/qwebpreferences_p_p.h
-usr/include/qt5/QtWebKit/5.0.0/QtWebKit/private/qwebplugindatabase_p.h
-usr/include/qt5/QtWebKit/5.0.0/QtWebKit/private/qwebiconimageprovider_p.h
-usr/include/qt5/QtWebKit/5.0.0/QtWebKit/private/qquickwebview_p_p.h
-usr/include/qt5/QtWebKit/5.0.0/QtWebKit/private/qquickwebpage_p.h
-usr/include/qt5/QtWebKit/5.0.0/QtWebKit/private/qwebdatabase_p.h
-usr/include/qt5/QtWebKit/5.0.0/QtWebKit/private/util.h
-usr/include/qt5/QtWebKitWidgets/5.0.0/QtWebKitWidgets/private/qwebviewaccessible_p.h
-usr/include/qt5/QtWebKit/5.0.0/QtWebKit/private/qtwebsecurityorigin_p.h
-usr/include/qt5/QtWebKit/5.0.0/QtWebKit/private/testwindow.h
-usr/include/qt5/QtWebKit/5.0.0/QtWebKit/private/qwebscriptworld_p.h
-usr/include/qt5/QtWebKit/5.0.0/QtWebKit/private/qwebelement_p.h
-usr/include/qt5/QtWebKit/5.0.0/QtWebKit/private/qwebnavigationrequest_p.h
-usr/include/qt5/QtWebKit/5.0.0/QtWebKit/private/qwebloadrequest_p.h
-usr/include/qt5/QtWebKit/5.0.0/QtWebKit/private/qquickwebview_p.h
-usr/include/qt5/QtWebKit/5.0.0/QtWebKit/private/qwebhistory_p.h
-usr/include/qt5/QtWebKit/5.0.0/QtWebKit/private/qhttpheader_p.h
-usr/include/qt5/QtWebKit/5.0.0/QtWebKit/private/qwebdownloaditem_p_p.h
-usr/include/qt5/QtWebKit/5.0.0/QtWebKit/private/qquickurlschemedelegate_p.h
-usr/include/qt5/QtWebKit/5.0.0/QtWebKit/private/qwebpreferences_p.h
-usr/include/qt5/QtWebKit/5.0.0/QtWebKit/private/qquickwebpage_p_p.h
-usr/include/qt5/QtWebKit/5.0.0/QtWebKit/private/qwebnavigationhistory_p_p.h
-usr/include/qt5/QtWebKit/5.0.0/QtWebKit/private/qrawwebview_p.h
-usr/include/qt5/QtWebKit/5.0.0/QtWebKit/private/qwebkittest_p.h
-usr/include/qt5/QtWebKit/5.0.0/QtWebKit/private/qwebsecurityorigin_p.h
-usr/include/qt5/QtWebKit/5.0.0/QtWebKit/private/qquicknetworkreply_p.h
-usr/include/qt5/QtWebKit/5.0.0/QtWebKit/private/bytearraytestdata.h
-usr/include/qt5/QtWebKit/5.0.0/QtWebKit/private/qwebdownloaditem_p.h
-usr/include/qt5/QtWebKitWidgets/5.0.0/QtWebKitWidgets/private/qwebpage_p.h
-usr/include/qt5/QtWebKit/5.0.0/QtWebKit/private/qwebnavigationhistory_p.h
+usr/include/qt5/QtWebKit/5.0.1/QtWebKit/private/qrawwebview_p_p.h
+usr/include/qt5/QtWebKit/5.0.1/QtWebKit/private/qwebpermissionrequest_p.h
+usr/include/qt5/QtWebKit/5.0.1/QtWebKit/private/qwebscriptworld.h
+usr/include/qt5/QtWebKit/5.0.1/QtWebKit/private/qquicknetworkrequest_p.h
+usr/include/qt5/QtWebKitWidgets/5.0.1/QtWebKitWidgets/private/qwebinspector_p.h
+usr/include/qt5/QtWebKitWidgets/5.0.1/QtWebKitWidgets/private/qwebframe_p.h
+usr/include/qt5/QtWebKit/5.0.1/QtWebKit/private/qwebpreferences_p_p.h
+usr/include/qt5/QtWebKit/5.0.1/QtWebKit/private/qwebplugindatabase_p.h
+usr/include/qt5/QtWebKit/5.0.1/QtWebKit/private/qwebiconimageprovider_p.h
+usr/include/qt5/QtWebKit/5.0.1/QtWebKit/private/qquickwebview_p_p.h
+usr/include/qt5/QtWebKit/5.0.1/QtWebKit/private/qquickwebpage_p.h
+usr/include/qt5/QtWebKit/5.0.1/QtWebKit/private/qwebdatabase_p.h
+usr/include/qt5/QtWebKit/5.0.1/QtWebKit/private/util.h
+usr/include/qt5/QtWebKitWidgets/5.0.1/QtWebKitWidgets/private/qwebviewaccessible_p.h
+usr/include/qt5/QtWebKit/5.0.1/QtWebKit/private/qtwebsecurityorigin_p.h
+usr/include/qt5/QtWebKit/5.0.1/QtWebKit/private/testwindow.h
+usr/include/qt5/QtWebKit/5.0.1/QtWebKit/private/qwebscriptworld_p.h
+usr/include/qt5/QtWebKit/5.0.1/QtWebKit/private/qwebelement_p.h
+usr/include/qt5/QtWebKit/5.0.1/QtWebKit/private/qwebnavigationrequest_p.h
+usr/include/qt5/QtWebKit/5.0.1/QtWebKit/private/qwebloadrequest_p.h
+usr/include/qt5/QtWebKit/5.0.1/QtWebKit/private/qquickwebview_p.h
+usr/include/qt5/QtWebKit/5.0.1/QtWebKit/private/qwebhistory_p.h
+usr/include/qt5/QtWebKit/5.0.1/QtWebKit/private/qhttpheader_p.h
+usr/include/qt5/QtWebKit/5.0.1/QtWebKit/private/qwebdownloaditem_p_p.h
+usr/include/qt5/QtWebKit/5.0.1/QtWebKit/private/qquickurlschemedelegate_p.h
+usr/include/qt5/QtWebKit/5.0.1/QtWebKit/private/qwebpreferences_p.h
+usr/include/qt5/QtWebKit/5.0.1/QtWebKit/private/qquickwebpage_p_p.h
+usr/include/qt5/QtWebKit/5.0.1/QtWebKit/private/qwebnavigationhistory_p_p.h
+usr/include/qt5/QtWebKit/5.0.1/QtWebKit/private/qrawwebview_p.h
+usr/include/qt5/QtWebKit/5.0.1/QtWebKit/private/qwebkittest_p.h
+usr/include/qt5/QtWebKit/5.0.1/QtWebKit/private/qwebsecurityorigin_p.h
+usr/include/qt5/QtWebKit/5.0.1/QtWebKit/private/qquicknetworkreply_p.h
+usr/include/qt5/QtWebKit/5.0.1/QtWebKit/private/bytearraytestdata.h
+usr/include/qt5/QtWebKit/5.0.1/QtWebKit/private/qwebdownloaditem_p.h
+usr/include/qt5/QtWebKitWidgets/5.0.1/QtWebKitWidgets/private/qwebpage_p.h
+usr/include/qt5/QtWebKit/5.0.1/QtWebKit/private/qwebnavigationhistory_p.h
 usr/include/qt5/QtWebKitWidgets/qwebframe.h
 usr/include/qt5/QtWebKitWidgets/QtWebKitWidgets
 usr/include/qt5/QtWebKitWidgets/QWebInspector
diff --git a/debian/rules b/debian/rules
index cc0b415..82b1580 100755
--- a/debian/rules
+++ b/debian/rules
@@ -35,6 +35,10 @@ override_dh_auto_install:
 	
 	# Remove la files (http://wiki.debian.org/ReleaseGoals/LAFileRemoval)
 	rm -f debian/tmp/usr/lib/*/*.la
+	
+	# Fix wrong path in pkgconfig files
+	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' {} \;
 
 override_dh_builddeb:
 	dh_builddeb -- -Zxz

-- 
QtWebKit packaging

More information about the pkg-kde-commits mailing list