[gdal] 02/08: Drop get-orig-source script in favor of uscan + Files-Excluded.

[Sebastiaan Couwenberg]

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

sebastic pushed a commit to branch experimental
in repository gdal.

commit 58bd42d22086f46e1d8c873cfe67c6d025ebd986
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Tue Feb 17 22:32:32 2015 +0100

    Drop get-orig-source script in favor of uscan + Files-Excluded.
---
 debian/changelog       |  1 +
 debian/get-orig-source | 38 --------------------------------------
 debian/watch           |  7 ++++---
 3 files changed, 5 insertions(+), 41 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 27613ee..1ea0ae9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ gdal (1.11.1+dfsg-1~exp3) UNRELEASED; urgency=medium
   * Have python*-gdal suggest gdal-bin.
     (closes: #774243)
   * Update my email to @debian.org address.
+  * Drop get-orig-source script in favor of uscan + Files-Excluded.
 
  -- Bas Couwenberg <sebastic at debian.org>  Fri, 28 Nov 2014 22:28:07 +0100
 
diff --git a/debian/get-orig-source b/debian/get-orig-source
deleted file mode 100755
index cd4f0e0..0000000
--- a/debian/get-orig-source
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/bash -x
-# Repack tarball because of data files with unknown license
-
-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
-
-# Remove files with unclear rights
-#
-#  gdal/data/cubewerx_extra.wkt
-#   Derived from definitions distributed by Cubewerx.
-#   See http://trac.osgeo.org/gdal/ticket/2165
-# 
-#  gdal/data/ecw_cs.dat
-#   Derived via much processing from ERMapper GDT definitions.
-#   See http://trac.osgeo.org/gdal/ticket/2162
-#
-#  gdal/data/esri_extra.wkt
-#   Derived with some processing from projections definitions in ArcGIS.
-#   See http://trac.osgeo.org/gdal/ticket/2163
-
-gunzip -c ../${PACKAGE}-${VERSION}.tar.gz | tar --delete --wildcards -vf - ${PACKAGE}-${VERSION}/data/{cubewerx_extra,ecw_cs,esri_extra}.wkt | GZIP="--best --no-name" gzip -c > ../${PACKAGE}_${VERSION}+dfsg.orig.tar.gz
-
diff --git a/debian/watch b/debian/watch
index 3d26545..bd203fa 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)\d*)$/$1~$2/ \
+opts=dversionmangle=s/\+(debian|dfsg|ds|deb)\d*$//,\
+uversionmangle=s/(\d)[_\.\-\+]?((RC|rc|pre|dev|beta|alpha)\d*)$/$1~$2/,\
+repacksuffix=+dfsg \
 http://trac.osgeo.org/gdal/wiki/DownloadSource \
-(?:|.*/)gdal(?:[_\-]v?|)(\d\S*)\.(?:tar\.xz|txz|tar\.bz2|tbz2|tar\.gz|tgz) \
-debian debian/get-orig-source
+(?:|.*/)gdal(?:[_\-]v?|)(\d\S*)\.(?: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/gdal.git