[SCM] qtscript packaging branch, experimental, updated. debian/5.3.2+dfsg-2-7-ge9e474e

Dmitry Shachnev mitya57 at moszumanska.debian.org
Tue Dec 16 14:12:38 UTC 2014


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

The following commit has been merged in the experimental branch:
commit e9e474eb5c0f816a184507ad2dd6ae6549c725e6
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Tue Dec 16 17:12:01 2014 +0300

    Use Files-Excluded instead of prune-nonfree.
---
 debian/changelog | 1 +
 debian/copyright | 2 ++
 debian/rules     | 4 ----
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4fdec69..6c6ed9a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ qtscript-opensource-src (5.4.0+dfsg-1) UNRELEASED; urgency=medium
   * Update Vcs-Git URL to point to cgit interface.
   * Bump Standards-Version to 3.9.6, no changes needed.
   * Update debian/copyright.
+  * Use Files-Excluded instead of prune-nonfree.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 16 Dec 2014 16:46:41 +0300
 
diff --git a/debian/copyright b/debian/copyright
index 69f02d8..b2532f2 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,6 +1,8 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: qtscript-opensource-src
 Source: http://releases.qt-project.org/qt5/*/submodules/
+Files-Excluded: tests/benchmarks/script/sunspider/
+                tests/benchmarks/script/v8/
 
 Files: *
 Copyright: 2012-2013 Digia Plc and/or its subsidiary(-ies)
diff --git a/debian/rules b/debian/rules
index 29fbd8e..20c9a5c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -35,10 +35,6 @@ override_dh_makeshlibs:
 	# Check for private symbols not marked as such. Be verbose.
 	DEBUG=1 debian/mark_private_symbols.sh
 
-prune-nonfree:
-	rm -rfv tests/benchmarks/script/sunspider/*
-	rm -rfv tests/benchmarks/script/v8/*
-
 override_dh_auto_test:
 	# Do not run tests at least until we get the transition sorted out.
 	#xvfb-run -a dh_auto_test

-- 
qtscript packaging



More information about the pkg-kde-commits mailing list