[SCM] Calligra suite packaging branch, master, updated. debian/2.7.5-1-97-gc2f86e2

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-std/calligra.git;a=commitdiff;h=c2f86e2

The following commit has been merged in the master branch:
commit c2f86e22bd8d36b97a0e60500c4a92f93d5d5809
Author: Maximiliano Curia <maxy at debian.org>
Date:   Tue Aug 12 15:42:38 2014 +0200

    Add prune-non-free rule, version to dfsg
---
 debian/changelog |  2 +-
 debian/rules     | 12 ++++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index b3eaae4..ac736d8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-calligra (1:2.8.5.repack-1) unstable; urgency=medium
+calligra (1:2.8.5+dfsg-1) unstable; urgency=medium
 
   * New upstream release. (Closes: #744291, #748990)
 
diff --git a/debian/rules b/debian/rules
index 6809337..80d1479 100755
--- a/debian/rules
+++ b/debian/rules
@@ -46,3 +46,15 @@ override_dh_shlibdeps:
 	dh_shlibdeps --remaining-packages
 
 .PHONY: override_dh_auto_test
+
+prune-nonfree:
+	# minimized extjs, not installed, nor used
+	rm -f kexi/webforms/webroot/extjs/ext-all.js
+	rm -f kexi/webforms/webroot/extjs/extjs/adapter/ext/ext-base.js
+	# copyright Sun Microsystems, 1996 unknown license
+	# Help needed to clarify the license.
+	rm -f plugins/colorengines/lcms2/colorprofiles/data/CMY.icm
+	# Claims itself as public domain, but included in non-free package
+	# icc-profiles.
+	# Help needed to clarify the license.
+	rm -f plugins/colorengines/lcms2/colorprofiles/data/fogra27l.icm

-- 
Calligra suite packaging