[SCM] Qt 4 packaging branch, master, updated. debian/4.8.5+git121-g2a9ea11+dfsg-1-6-g2efeb73

Lisandro Damián Nicanor Pérez lisandro at alioth.debian.org
Thu Oct 10 00:52:53 UTC 2013


Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qt4-x11.git;a=commitdiff;h=05f8034

The following commit has been merged in the master branch:
commit 05f8034b858846ecb19a732c147bd0705382f0f5
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Wed Oct 9 16:44:48 2013 -0300

    Remove sources wich contain minified javascript libs without sources.
---
 debian/changelog |    4 +++-
 debian/rules     |    6 ++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 3c35ac1..063b78a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,10 @@
-qt4-x11 (4:4.8.5+git121-g2a9ea11+dfsg-2) UNRELEASED; urgency=low
+qt4-x11 (4:4.8.5+git121-g2a9ea11+dfsg1-1) UNRELEASED; urgency=low
 
   [ Lisandro Damián Nicanor Pérez Meyer ]
   * Add Fix_JavaScriptCore_ftbfs_on_mips64_el.patch. It just needs to be
     approved upstream, but it has been already ACKed (Closes: #719763).
+  * Remove sources with minified javascript libs without source.
+    - Increase DFSG revision number.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Mon, 16 Sep 2013 18:25:26 -0300
 
diff --git a/debian/rules b/debian/rules
index b8c0700..61ac6d5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -405,5 +405,11 @@ override_dh_builddeb:
 prune-nonfree:
 	# Delete RFCs.
 	find \( -name rfc????.txt \) -print -delete
+	# Delete files that contain minified javascript libs without source
+	# In it's preferred form of modification.
+	rm -fv tests/benchmarks/script/sunspider/tests/string-unpack-code.js
+	rm -fv doc/src/template/scripts/jquery.js
+	rm -fv tools/qdoc3/doc/config/scripts/jquery.js
+	rm -fv examples/webkit/fancybrowser/jquery.min.js
 
 .PHONY: override_dh_auto_test

-- 
Qt 4 packaging



More information about the pkg-kde-commits mailing list