[SCM] qtbase packaging branch, kubuntu_unstable, updated. debian/5.4.1+dfsg-2-5-gf4be3fd

[Rohan Garg]

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

The following commit has been merged in the kubuntu_unstable branch:
commit 8139a6ad814841e1c10c939a343da0c2c5d5a7d4
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Tue Feb 24 16:32:01 2015 +0300

    Use Files-Excluded copyright field for repacking source tarball.
---
 debian/changelog |  1 +
 debian/copyright | 18 +++++++++++++++++-
 debian/rules     | 16 ----------------
 3 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index cb4c856..b8bde00 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ qtbase-opensource-src (5.4.1+dfsg-1) UNRELEASED; urgency=medium
     - upstream_qimage_conversions.cpp-Fix-build-on-big-endian-syste.patch.
   * Update symbols files.
   * Bump ABI version for the new release.
+  * Use Files-Excluded copyright field for repacking source tarball.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 24 Feb 2015 15:18:59 +0300
 
diff --git a/debian/copyright b/debian/copyright
index 46c80fb..a7627fd 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,6 +1,22 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: qtbase-opensource-src
-Source: http://releases.qt-project.org/qt5/*/submodules/
+Source: https://download.qt.io/official_releases/qt/*/submodules/
+Files-Excluded: src/3rdparty/zlib/doc/rfc*.txt
+                tests/auto/corelib/tools/qbytearray/rfc3252.txt
+                tests/auto/corelib/io/qtextstream/rfc3261.txt
+                tests/auto/network/access/qftp/rfc3252.txt
+                tests/auto/network/access/qnetworkreply/rfc3252.txt
+                tests/manual/network_stresstest/qtest/bigfile
+                tests/auto/network/access/qnetworkreply/bigfile
+                tests/auto/network/access/qnetworkreply/resource
+                tests/auto/network/access/qnetworkreply/resource
+                lib/fonts/l*t.pfa
+                lib/fonts/UT*.pfa
+                examples/xml/htmlinfo
+# Removed non-free files:
+# * RFCs (see QTBUG-30544 and QTBUG-30545)
+# * Luxi and Adobe Utopia fonts
+# * htmlinfo example which contains non-free websites snapshots
 
 Files: *
 Copyright: 2012-2015 Digia Plc and/or its subsidiary(-ies)
diff --git a/debian/rules b/debian/rules
index 4b35cf1..c7163e6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -344,19 +344,3 @@ override_dh_clean:
 	for pkg in $(pkgs_with_os); do \
 		rm -f debian/$$pkg.install ; \
 	done
-
-# See upstream bugs
-# https://bugreports.qt-project.org/browse/QTBUG-30544
-# https://bugreports.qt-project.org/browse/QTBUG-30545
-prune-nonfree:
-	# Delete zlib's RFCs.
-	find \( -name rfc????.txt \) -print -delete
-	rm -fv tests/manual/network_stresstest/qtest/bigfile
-	rm -fv tests/auto/network/access/qnetworkreply/bigfile
-	rm -fv tests/auto/network/access/qnetworkreply/resource
-	# Delete Luxi-font licensed fonts, they are not DFSG compatible.
-	rm -fv lib/fonts/l*
-	# Delete Adobe's Utopia fonts. They do not seem to allow modification.
-	rm -fv lib/fonts/U*
-	# Contains non-free copies of webpages like youtube.com, etc
-	rm -fv examples/xml/htmlinfo/

-- 
qtbase packaging