[postgis] 01/08: Use uscan repacking to exclude CITE tests from upstream source.

[Sebastiaan Couwenberg]

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

sebastic pushed a commit to branch master
in repository postgis.

commit 17daf89e9af7a88bbe6b1fccd69cd5d1263cdd26
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sat Mar 21 02:05:29 2015 +0100

    Use uscan repacking to exclude CITE tests from upstream source.
---
 debian/changelog       |  1 +
 debian/get-orig-source | 25 -------------------------
 debian/watch           |  7 ++++---
 3 files changed, 5 insertions(+), 28 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 050a050..7b0a2a3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 postgis (2.1.5+dfsg-1~exp3) UNRELEASED; urgency=medium
 
   * Skip tests on mipsel too, due to persistent buildd issues.
+  * Use uscan repacking to exclude CITE tests from upstream source.
 
  -- Bas Couwenberg <sebastic at debian.org>  Mon, 09 Feb 2015 23:58:57 +0100
 
diff --git a/debian/get-orig-source b/debian/get-orig-source
deleted file mode 100755
index 1a3446c..0000000
--- a/debian/get-orig-source
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/sh -x
-# Repack tarball because of data files with unclear license,
-# probably non-free OGC Document Notice licesed.
-
-set -e
-
-# Remark: A new uscan that enables easier handling of removing files can be
-#         obtained via
-#   git clone git://tille@git.debian.org/git/users/tille/devscripts.git
-#         and then copy scripts/uscan.pl as uscan at the beginning of your PATH
-if uscan --help | grep -q -- --repack-compression ; then
-    echo "Use new enhanced uscan"
-    uscan --verbose --force-download
-    exit
-fi
-
-# Falling back to manually removing files
-
-PACKAGE=`dpkg-parsechangelog | sed -n 's/^Source: //p'`
-VERSION=`dpkg-parsechangelog | sed -ne 's/^Version: \(.*\)-.*/\1/p' | sed -e 's/\+.*//'`
-
-uscan --verbose --force-download --no-symlink
-
-gunzip -c ../${PACKAGE}-${VERSION}.tar.gz | tar --delete --wildcards -vf - ${PACKAGE}-${VERSION}/extras/ogc_test_suite/\* | GZIP="--best --no-name" gzip -c > ../${PACKAGE}_${VERSION}+dfsg.orig.tar.gz
-
diff --git a/debian/watch b/debian/watch
index 7b55420..d193602 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,5 +1,6 @@
 version=3
-opts=dversionmangle=s/\+(debian|dfsg|ds|deb)\d*$//,uversionmangle=s/(\d)[_\.\-\+]?((RC|rc|pre|dev|beta|alpha|b|a)\d*)$/$1~$2/ \
+opts=dversionmangle=s/\+(debian|dfsg|ds|deb)\d*$//,\
+uversionmangle=s/(\d)[_\.\-\+]?((RC|rc|pre|dev|beta|alpha|b|a)\d*)$/$1~$2/,\
+repacksuffix=+dfsg \
 http://download.osgeo.org/postgis/source/ \
-(?:.*/|)postgis[\-\._]?([\d\.]+(?:(?:RC|rc|pre|dev|beta|alpha|b|a)\d+)?)\.(?:tar\.xz|txz|tar\.bz2|tbz2|tar\.gz|tgz) \
-debian debian/get-orig-source
+(?:.*/|)postgis[\-\._]?([\d\.]+(?:(?:RC|rc|pre|dev|beta|alpha|b|a)\d+)?)\.(?:tar\.xz|txz|tar\.bz2|tbz2|tar\.gz|tgz)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/postgis.git