[cpl-plugin-fors] 01/04: Correctly process updated kit releases like visir-kit-3.5.1-2

[Ole Streicher]

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

olebole pushed a commit to branch debian
in repository cpl-plugin-fors.

commit 08e138dd750e4e4d12b2208d44745e676b7288f3
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Tue Mar 31 11:12:18 2015 +0200

    Correctly process updated kit releases like visir-kit-3.5.1-2
---
 debian/repackage.sh | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/debian/repackage.sh b/debian/repackage.sh
index 1eddf38..792c365 100755
--- a/debian/repackage.sh
+++ b/debian/repackage.sh
@@ -29,17 +29,23 @@ INCLUDE_TEST_DATA="yes"
 
 BASEDIR=$(dirname $3)
 FILENAME=${BASEDIR}/${PIPELINE}-kit-${VERSION}.tar.gz
+if [ ! -f ${FILENAME} ] ; then
+  FILENAME=${BASEDIR}/${PIPELINE}-kit-${VERSION}-*.tar.gz
+  UVERSION=$(echo ${FILENAME} | sed "s/.*-kit-\(.*\)\.tar.gz/\1/")
+else
+  UVERSION=${VERSION}
+fi
 tar xf ${FILENAME} -C ${BASEDIR}
-rm -f ${BASEDIR}/${DEBIAN_PACKAGE}_${VERSION}.orig*.tar.* ${FILENAME}
+rm -f ${BASEDIR}/${DEBIAN_PACKAGE}_${UVERSION}.orig*.tar.* ${FILENAME}
 
 TAREXCLUDE="--exclude ${PIPELINE}-${VERSION}/html"
 if [ $INCLUDE_TEST_DATA = "no" ] ; then
   TAREXCLUDE=${TAREXCLUDE}" --exclude ${PIPELINE}-${VERSION}/*/tests/ref_data"
 fi
 
-tar xf ${BASEDIR}/${PIPELINE}-kit-${VERSION}/${PIPELINE}-${VERSION}.tar.gz\
+tar xf ${BASEDIR}/${PIPELINE}-kit-${UVERSION}/${PIPELINE}-${VERSION}.tar.gz\
     -C ${BASEDIR} ${TAREXCLUDE}
-tar xf ${BASEDIR}/${PIPELINE}-kit-${VERSION}/${PIPELINE}-calib-${VERSION}.tar.gz\
+tar xf ${BASEDIR}/${PIPELINE}-kit-${UVERSION}/${PIPELINE}-calib-${VERSION}.tar.gz\
     -C ${BASEDIR}/${PIPELINE}-${VERSION}/
 mv ${BASEDIR}/${PIPELINE}-${VERSION}/${PIPELINE}-calib-${VERSION}/ \
    ${BASEDIR}/${PIPELINE}-${VERSION}/calib/
@@ -53,5 +59,5 @@ tar cJf ${BASEDIR}/${DEBIAN_PACKAGE}_${VERSION}+dfsg.orig.tar.xz \
     -C ${BASEDIR} ${PIPELINE}-${VERSION}/
 rm -rf ${BASEDIR}/${PIPELINE}-${VERSION}/
 
-rm -rf ${BASEDIR}/${PIPELINE}-kit-${VERSION}/ 
+rm -rf ${BASEDIR}/${PIPELINE}-kit-${UVERSION}/ 
 exec uupdate --no-symlink "$@"

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-astro/packages/cpl-plugin-fors.git