[SCM] Calligra suite packaging branch, master, updated. debian/2.8.5+dfsg-1-19-g00dcd4a

[Dmitry Smirnov]

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

The following commit has been merged in the master branch:
commit 93dcb877ccdfe361bda7e8183b921d881d6a5ae4
Author: Dmitry Smirnov <onlyjob at member.fsf.org>
Date:   Fri Jun 5 21:55:38 2015 +1000

    drop "prune-nonfree" target in favour of copyright/Files-Excluded;
    
     Added "repacksuffix=+dfsg" to "debian/watch".
---
 debian/copyright | 10 +++++++++-
 debian/rules     | 22 ----------------------
 debian/watch     |  8 ++++++--
 3 files changed, 15 insertions(+), 25 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index d23f2d4..d99b677 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,7 +1,15 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: calligra
 Source: http://www.calligra-suite.org/get-calligra/
-Disclaimer: Autogenerated by CDBS
+Comment:
+ Disclaimer: Autogenerated by CDBS
+Files-Excluded:
+ filters/libmso/generated/mso.jar
+ filters/plan/mpxj/planconvert/jar/PlanConvert.jar
+ 3rdparty/google-breakpad/src/client/mac/gcov/libgcov.a
+ 3rdparty/google-breakpad/src/third_party/linux/lib/glog/libglog.a
+ 3rdparty/google-breakpad/src/third_party/linux/lib/gflags/libgflags.a
+ 3rdparty/google-breakpad/src/tools/windows/binaries/*.exe
 
 Files: ./3rdparty/google-breakpad/android/*
  ./3rdparty/google-breakpad/android/sample_app/jni/*
diff --git a/debian/rules b/debian/rules
index 2fc2877..6809337 100755
--- a/debian/rules
+++ b/debian/rules
@@ -46,25 +46,3 @@ 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
-	# Remove precompiled files
-	rm -f 3rdparty/google-breakpad/src/client/mac/gcov/libgcov.a
-	rm -f 3rdparty/google-breakpad/src/third_party/linux/lib/glog/libglog.a
-	rm -f 3rdparty/google-breakpad/src/third_party/linux/lib/gflags/libgflags.a
-	# Remove binary files
-	rm -f 3rdparty/google-breakpad/src/tools/windows/binaries/symupload.exe
-	rm -f 3rdparty/google-breakpad/src/tools/windows/binaries/dump_syms.exe
-	# Remove java generated files
-	rm -f filters/libmso/generated/mso.jar
-	rm -f filters/plan/mpxj/planconvert/jar/PlanConvert.jar
diff --git a/debian/watch b/debian/watch
index 643505c..b9b8141 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,11 +1,14 @@
 version=3
 
 ## latest version:
-opts=dversionmangle=s/\+dfsg\d*$// \
-http://download.kde.org/stable/calligra-([\d\.]+)/calligra-([\d\.]+)\.tar\.(?:bz2|xz)
+opts=\
+repacksuffix=+dfsg,\
+dversionmangle=s/\+dfsg\d*$// \
+ http://download.kde.org/stable/calligra-([\d\.]+)/calligra-([\d\.]+)\.tar\.(?:bz2|xz)
 
 ## all available versions:
 opts=\
+repacksuffix=+dfsg,\
 dversionmangle=s/\+dfsg\d*$//,\
 downloadurlmangle=s/([0-9.]+)\//$1\/source\/calligra-$1\.tar\.xz/,\
 filenamemangle=s/.*/orig.tar.xz/,\
@@ -13,6 +16,7 @@ filenamemangle=s/.*/orig.tar.xz/,\
 
 ## mirror:
 opts=\
+repacksuffix=+dfsg,\
 dversionmangle=s/\+dfsg\d*$//,\
 downloadurlmangle=s/([0-9.]+)\//$1\/source\/calligra-$1\.tar\.xz/,\
 filenamemangle=s/.*/orig.tar.xz/,\

-- 
Calligra suite packaging