[SCM] qt5webkit packaging branch, master, updated. debian/5.2.1+dfsg-5-6-g54db6e3

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the master branch:
commit 54db6e36e190dded290b401f665231d9a03cfd98
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Sun Apr 27 16:35:11 2014 -0300

    Use Files-Excluded and remove dygraph-combined.js.
---
 debian/changelog | 4 ++++
 debian/copyright | 8 ++++++++
 debian/rules     | 7 -------
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 357934e..4c184e6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,10 @@ qtwebkit-opensource-src (5.2.1+dfsg-6) UNRELEASED; urgency=medium
   * Add qtdeclarative5-dev as a dependency of libqt5webkit5-dev as it seems
     to be a requirement for stuff building with webkit.
   * Update symbols files with buildd's logs.
+  * Remove prune-nonfree from debian/rules and instead use Files-Excluded in
+    debian/copyright.
+  * Remove dygraph-combined.js from the original tarball: minified javascript
+    without source.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 06 Apr 2014 10:04:08 -0300
 
diff --git a/debian/copyright b/debian/copyright
index f2c7d84..abb227b 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,5 +1,13 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Source: http://releases.qt-project.org/qt5/5.0.1/submodules_tar/
+Files-Excluded: Source/WebInspectorUI/Scripts/jsmin.py
+                Source/WebInspectorUI/Tools/PrettyPrinting/populate/jquery.min.js
+                Tools/TestResultServer/static-dashboards/dygraph-combined.js
+# jsmin.py: see
+# http://lists.qt-project.org/pipermail/development/2013-December/014659.html
+# and https://wiki.debian.org/qa.debian.org/jsonevil
+#
+# jquery.min.js and dygraph-combined.js: minified javascript without source.
 
 Files: *
 Copyright: 2010 Apple Inc.
diff --git a/debian/rules b/debian/rules
index 9bb7781..d9578a0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -82,10 +82,3 @@ 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
-	# Minified jquery without source.
-	rm -vf Source/WebInspectorUI/Tools/PrettyPrinting/populate/jquery.min.js

-- 
qt5webkit packaging