[gdal] 02/03: Simplify repacking with tar --delete.

[Bas Couwenberg]

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

sebastic-guest pushed a commit to branch experimental
in repository gdal.

commit 17edfcd1b8fd89dfb8d7f72b366da02e481478e2
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Thu May 8 22:56:21 2014 +0200

    Simplify repacking with tar --delete.
---
 debian/changelog       |  6 ++++++
 debian/get-orig-source | 20 +-------------------
 2 files changed, 7 insertions(+), 19 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2b08092..bc83319 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+gdal (1.11.0+dfsg-1~exp2) UNRELEASED; urgency=low
+
+  * Simplify repacking with tar --delete.
+
+ -- Bas Couwenberg <sebastic at xs4all.nl>  Thu, 08 May 2014 22:59:02 +0200
+
 gdal (1.11.0+dfsg-1~exp1) experimental; urgency=low
 
   * New upstream release.
diff --git a/debian/get-orig-source b/debian/get-orig-source
index 010a838..a4322d6 100755
--- a/debian/get-orig-source
+++ b/debian/get-orig-source
@@ -20,16 +20,6 @@ VERSION=`dpkg-parsechangelog | sed -ne 's/^Version: \(.*\)-.*/\1/p' | sed -e 's/
 
 uscan --verbose --force-download --no-symlink
 
-mkdir -p ../tarballs
-cd ../tarballs
-
-tar -xaf ../${PACKAGE}-${VERSION}.tar.*
-
-# Directory in upstream tarball can contain the project name twice
-if [ -d "${PACKAGE}-${PACKAGE}-${VERSION}" ]; then
-	mv ${PACKAGE}-${PACKAGE}-${VERSION} ${PACKAGE}-${VERSION}
-fi
-
 # Remove files with unclear rights
 #
 #  gdal/data/cubewerx_extra.wkt
@@ -44,13 +34,5 @@ fi
 #   Derived with some processing from projections definitions in ArcGIS.
 #   See http://trac.osgeo.org/gdal/ticket/2163
 
-rm ${PACKAGE}-${VERSION}/data/cubewerx_extra.wkt
-rm ${PACKAGE}-${VERSION}/data/ecw_cs.wkt
-rm ${PACKAGE}-${VERSION}/data/esri_extra.wkt
-
-mv ${PACKAGE}-${VERSION} ${PACKAGE}-${VERSION}+dfsg.orig
-
-GZIP="--best --no-name" tar --owner=root --group=root --mode=a+rX -caf ../"${PACKAGE}"_"${VERSION}"+dfsg.orig.tar.gz "${PACKAGE}-${VERSION}"+dfsg.orig
-
-rm -rf "${PACKAGE}-${VERSION}"+dfsg.orig
+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
 

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