[cpl-plugin-vimos] 04/04: 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-vimos.

commit 82799d3e3c8c34eae4583230a502b1b91121e7ba
Merge: 9fca227 3d6a148
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Tue Mar 31 11:49:51 2015 +0200

    Merge branch 'debian-template' into debian
    
    Conflicts:
    	debian/control

 debian/README.Debian.in |  2 +-
 debian/README.Source    |  2 +-
 debian/repackage.sh     | 14 ++++++++++----
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --cc debian/repackage.sh
index 0b397ae,792c365..95a1590
--- a/debian/repackage.sh
+++ b/debian/repackage.sh
@@@ -29,13 -29,16 +29,19 @@@ 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"
 +TAREXCLUDE=${TAREXCLUDE}" --exclude ${PIPELINE}-${VERSION}/external/sextractor"
 +TAREXCLUDE=${TAREXCLUDE}" --exclude ${PIPELINE}-${VERSION}/external/psfex"
 +TAREXCLUDE=${TAREXCLUDE}" --exclude ${PIPELINE}-${VERSION}/libpil/html"
  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-vimos.git