[SCM] qt5webkit packaging branch, experimental, updated. debian/5.1.1-1-11-ge5685e6

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the experimental branch:
commit e357250138e528bb31dfe0e78ac4bc3ba0be4366
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Wed Dec 18 20:50:02 2013 -0300

    Remove jsmin.py from the original tarball.
    
    It is not DFSG-compatible.
---
 debian/changelog | 7 ++++++-
 debian/rules     | 5 +++++
 debian/watch     | 1 +
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 92fee03..8b298f2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-qtwebkit-opensource-src (5.2.0-1) UNRELEASED; urgency=low
+qtwebkit-opensource-src (5.2.0+dfsg-1) UNRELEASED; urgency=low
 
   [ Lisandro Damián Nicanor Pérez Meyer ]
   * New upstream release.
@@ -6,6 +6,11 @@ qtwebkit-opensource-src (5.2.0-1) UNRELEASED; urgency=low
   * Refresh 05_sparc_unaligned_access.diff, no_gc_sections.diff and hurd.diff.
   * Remove new private stuff we are not shipping.
   * Update symbols files.
+  * Remove jsmin.py from the original tarball because it is not
+    DFSG-compatible.
+    - Create a dfsg version.
+    - Add a rule to prune non-free stuff in debian/rules.
+    - Mangle the dfsg version in debian/watch.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 17 Dec 2013 11:23:02 -0300
 
diff --git a/debian/rules b/debian/rules
index 9111789..ba3b5d6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -66,3 +66,8 @@ override_dh_install:
 
 override_dh_builddeb:
 	dh_builddeb -- -Zxz
+
+prune-nonfree:
+	# See http://lists.qt-project.org/pipermail/development/2013-December/014659.html
+	# and https://wiki.debian.org/qa.debian.org/jsonevil
+	rm -fv Source/WebInspectorUI/Scripts/jsmin.py
diff --git a/debian/watch b/debian/watch
index 8c33fce..567eb64 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,3 @@
 version=3
+opts=dversionmangle=s/\+dfsg// \
 http://download.qt-project.org/official_releases/qt/([\d\.]*)/([\d\.]*)/submodules/qtwebkit-opensource-src-([^-]*)\.tar.xz

-- 
qt5webkit packaging