[cpl-plugin-kmos] 02/02: Merge branch 'debian-template' into debian

[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-kmos.

commit f89b17dc0dc9cb2134ca7610d6f0976f0fbefa32
Merge: ec75006 08e138d
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Tue Mar 31 11:30:42 2015 +0200

    Merge branch 'debian-template' into debian

 debian/repackage.sh | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --cc debian/repackage.sh
index f828641,792c365..4b94efd
--- a/debian/repackage.sh
+++ b/debian/repackage.sh
@@@ -29,11 -29,16 +29,17 @@@ INCLUDE_TEST_DATA="no
  
  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"
 +TAREXCLUDE=${TAREXCLUDE}" --exclude ${PIPELINE}-${VERSION}/tools/astron.lib.gz"
  if [ $INCLUDE_TEST_DATA = "no" ] ; then
    TAREXCLUDE=${TAREXCLUDE}" --exclude ${PIPELINE}-${VERSION}/*/tests/ref_data"
  fi

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