[SCM] QtWebKit packaging branch, qt5, updated. debian/2.2.1-5-3-gb322489

[Timo Jyrinki]

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

The following commit has been merged in the qt5 branch:
commit b3224891e769dc756c3a32d594fb4f5444076b34
Author: Timo Jyrinki <timo.jyrinki at canonical.com>
Date:   Fri Jan 11 09:25:30 2013 +0000

    Update for the final release
---
 debian/changelog |   11 +++++++----
 debian/control   |    8 +++++---
 debian/copyright |    4 ++--
 debian/rules     |    4 ++--
 4 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 39fde49..770847b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,15 +1,18 @@
-qtwebkit-opensource-src (5.0.0~rc2-1) UNRELEASED; urgency=low
+qtwebkit-opensource-src (5.0.0-1) UNRELEASED; urgency=low
 
-  * New upstream release candidate.
+  * New upstream release.
   * debian/control:
     - Add missing Pre-Depends for xz compression
     - Rename packages by appending the major version
   * debian/*.install:
-    - Adjust to library renames
+    - Adjust to the new version and library renames
+  * debian/rules:
+    - Remove .la files
+    - Remove rpath from QtWebProcess/QtWebPluginProcess
   * debian/copyright:
     - Fix invalid UTF-8
 
- -- Timo Jyrinki <timo at debian.org>  Tue, 11 Dec 2012 12:23:01 +0000
+ -- Timo Jyrinki <timo at debian.org>  Thu, 10 Jan 2013 05:55:52 +0000
 
 qtwebkit (2.2.1-5) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 6522cfb..c78df34 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: qtwebkit-opensource-src
 Priority: optional
 Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
-Uploaders: Fathi Boudra <fabo at debian.org>
+Uploaders: Fathi Boudra <fabo at debian.org>,
+           Timo Jyrinki <timo at debian.org>
 Build-Depends: debhelper (>= 9.0.0),
                flex,
                bison,
@@ -21,16 +22,17 @@ Build-Depends: debhelper (>= 9.0.0),
                libglu1-mesa-dev [!armel !armhf] | libglu-dev [!armel !armhf],
                libxrender-dev,
                libxslt1-dev,
+               qt5-default,
                libqt5xmlpatterns5-private-dev,
                qtbase5-private-dev,
                libqt5opengl5-dev,
                libqt5v8-5-private-dev,
-               libqt5script5-private-dev,
+               qtscript5-private-dev,
                qtdeclarative5-private-dev,
                pkg-config,
                pkg-kde-tools (>= 0.6.4),
                chrpath,
-Standards-Version: 3.9.3
+Standards-Version: 3.9.4
 Section: libs
 Homepage: http://trac.webkit.org/wiki/QtWebKit
 Vcs-Git: git://git.debian.org/pkg-kde/qt/qtwebkit.git
diff --git a/debian/copyright b/debian/copyright
index 6c5a0a5..2370cdf 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -7,8 +7,8 @@ License: BSD-2-clause
 
 Files: debian/*
 Copyright: 2010 Fathi Boudra <fabo at debian.org>
-           2012 Zoltán Balogh <zoltan.balogh at ubuntu.com>
-           2012 Timo Jyrinki <timo at debian.org>
+           2012 Zoltán Balogh <zoltan.balogh at canonical.com>
+           2012-2013 Timo Jyrinki <timo.jyrinki at canonical.com>
 License: LGPL-2+
 
 Files: WebKitLibraries/WebCoreSQLite3/*
diff --git a/debian/rules b/debian/rules
index 40d1ec5..cc0b415 100755
--- a/debian/rules
+++ b/debian/rules
@@ -30,8 +30,8 @@ override_dh_auto_install:
 	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
+	chrpath -d $(CURDIR)/debian/tmp/usr/lib/*/qt5/libexec/QtWebProcess
+	chrpath -d $(CURDIR)/debian/tmp/usr/lib/*/qt5/libexec/QtWebPluginProcess
 	
 	# Remove la files (http://wiki.debian.org/ReleaseGoals/LAFileRemoval)
 	rm -f debian/tmp/usr/lib/*/*.la

-- 
QtWebKit packaging