[libvigraimpex] 03/03: build with different upstream tarball

[Daniel Stender]

This is an automated email from the git hooks/post-receive script.

danstender-guest pushed a commit to branch master
in repository libvigraimpex.

commit 78ed05aa5de1b12dcb67d4e735bee970d79ea687
Author: Daniel Stender <debian at danielstender.com>
Date:   Fri Oct 30 00:46:52 2015 +0100

    build with different upstream tarball
---
 debian/changelog          | 12 +++++++++++-
 debian/copyright          | 10 ++++++++++
 debian/get-orig-source.sh | 35 -----------------------------------
 debian/rules              |  9 ---------
 debian/watch              |  5 +++--
 5 files changed, 24 insertions(+), 47 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1150c5c..54298d6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,18 @@
+libvigraimpex (1.10.0+dfsg-12) UNRELEASED; urgency=medium
+
+  * Build with different upstream tarball (the flavour without doc/):
+    + deb/watch: changed regex pattern for tarball, added repacksuffix.
+    + dropped deb/get-orig.source.sh.
+    + deb/copyright: added Files-Excluded with remaining strip patterns.
+    + deb/rules: dropped build target get-orig-source, updated clean target.
+
+ -- Daniel Stender <debian at danielstender.com>  Fri, 30 Oct 2015 00:29:24 +0100
+
 libvigraimpex (1.10.0+dfsg-11) unstable; urgency=medium
 
   * Upload to unstable.
 
- -- Daniel Stender <debian at danielstender.com>  Fri, 02 Oct 2015 00:23:56 +0200
+ -- Daniel Stender <debian at danielstender.com>  Thu, 29 Oct 2015 22:31:53 +0100
 
 libvigraimpex (1.10.0+dfsg-10) experimental; urgency=medium
 
diff --git a/debian/copyright b/debian/copyright
index 304b6e3..1764d30 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -2,6 +2,16 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: VIGRA
 Upstream-Contact: Ullrich Köthe <ullrich.koethe at iwr.uni-heidelberg.de>
 Source: https://github.com/ukoethe/vigra/
+Files-Excluded: .gitignore
+                .hgignore
+                .hgtags
+                .travis.yml
+                vigra-dependencies-win32-vs8.zip
+                docsrc/documents/viff.ps
+                docsrc/documents/DataAccessors.ps
+                docsrc/documents/GenericProg2D.ps
+                docsrc/documents/FunctorFactory.ps
+                vigranumpy/docsrc/_static
 
 Files: *
 Comment:
diff --git a/debian/get-orig-source.sh b/debian/get-orig-source.sh
deleted file mode 100755
index 6df3ff9..0000000
--- a/debian/get-orig-source.sh
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/sh
-set -e
-export GZIP="-9 -n"
-export TAR_OPTIONS="--owner root --group root --mode a+rX"
-pwd=`pwd`
-dfsgversion="$1"
-version="${1%+dfsg*}"
-if [ -z "$version" ]
-then
-    printf 'Usage: %s <version>\n' "$0"
-    exit 1
-fi
-cd "`dirname "$0"`/../"
-tmpdir=`mktemp -d get-orig-source.XXXXXX`
-uscan --noconf --force-download --rename --download-version="$version" --destdir="$tmpdir"
-cd "$tmpdir"
-tar -xzf libvigraimpex_*.orig.tar.gz
-rm *.tar.gz
-# Remove documentation without source:
-find vigra-* -name '*.ps' -delete
-# Remove not-for-us stuff:
-rm -v vigra-*/*win32*.zip
-# Remove documentation that we'll rebuild anyway:
-rm -v vigra-*/doc/vigra/*.html
-rm -v vigra-*/doc/vigra/*.png
-rm -rv vigra-*/doc/vigranumpy/
-rm -rv vigra-*/vigranumpy/docsrc/_static/
-# Remove Mercurial artifacts:
-rm -v vigra-*/.hg*
-mv vigra-*/ "vigra-${version%+dfsg*}.orig"
-tar -cJf "$pwd/libvigraimpex_$dfsgversion.orig.tar.xz" vigra-*.orig/
-cd ..
-rm -Rf "$tmpdir"
-
-# vim:ts=4 sw=4 et
diff --git a/debian/rules b/debian/rules
index f65f5c0..cd8c2cd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -208,14 +208,5 @@ clean:
 	dh_testdir
 	dh_clean
 	rm -rf obj*/
-	find doc/ -type f -delete
-
-# get-orig-source target
-# ======================
-
-.PHONY: get-orig-source
-get-orig-source:
-	sh $(here)/debian/get-orig-source.sh 1.10.0+dfsg
-	#sh $(here)/debian/get-orig-source.sh $(upstream_version)
 
 .NOTPARALLEL:
diff --git a/debian/watch b/debian/watch
index 6bd0512..362c5e0 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,4 +1,5 @@
 version=3
 opts=uversionmangle=s/-/./g,\
-dversionmangle=s/\+dfsg\d*$// \
-https://github.com/ukoethe/vigra/releases (?:.*/)vigra-([\d.]+)-src(?:-with-docu|).tar.gz
+dversionmangle=s/\+dfsg\d*$//,\
+repacksuffix=+dfsg \
+https://github.com/ukoethe/vigra/releases (?:.*/)Version-([\d-]+).tar.gz

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/libvigraimpex.git