[cpl-plugin-fors] 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-fors.

commit 8a93533dc719127a905f688c6add375ae555ebf7
Merge: a8d4902 c33c388
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Tue Mar 31 12:11:23 2015 +0200

    Merge branch 'debian-template' into debian
    
    Conflicts:
    	debian/control
    	debian/patches/fix_test_fail.patch

 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 c3cb918,792c365..1e9a8b3
--- a/debian/repackage.sh
+++ b/debian/repackage.sh
@@@ -29,17 -29,23 +29,23 @@@ 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="--exclude ${PIPELINE}-${VERSION}/html --exclude ${PIPELINE}-${VERSION}/sextractor"
  if [ $INCLUDE_TEST_DATA = "no" ] ; then
 -  TAREXCLUDE=${TAREXCLUDE}" --exclude ${PIPELINE}-${VERSION}/*/tests/ref_data"
 +  TAREXCLUDE=${TAREXCLUDE}" --exclude ${PIPELINE}-${VERSION}/*/tests/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/

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