[cpl-plugin-uves] 14/14: Merge branch 'debian-template' into debian

[Ole Streicher]

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

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

commit fdbde73a98babe4a92da8897c415c7408092e576
Merge: 7acd969 987e091
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Sat Dec 7 17:54:12 2013 +0100

    Merge branch 'debian-template' into debian
    
    Conflicts:
    	debian/control
    	debian/repackage.sh

 debian/repackage.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --cc debian/repackage.sh
index 750b352,1eddf38..f4b9875
--- a/debian/repackage.sh
+++ b/debian/repackage.sh
@@@ -32,9 -32,9 +32,9 @@@ FILENAME=${BASEDIR}/${PIPELINE}-kit-${V
  tar xf ${FILENAME} -C ${BASEDIR}
  rm -f ${BASEDIR}/${DEBIAN_PACKAGE}_${VERSION}.orig*.tar.* ${FILENAME}
  
 -TAREXCLUDE="--exclude ${PIPELINE}-${VERSION}/html"
 +TAREXCLUDE="--exclude ${PIPELINE}-${VERSION}/html --exclude ${PIPELINE}-${VERSION}/qfits"
  if [ $INCLUDE_TEST_DATA = "no" ] ; then
-   TAREXCLUDE+=" --exclude ${PIPELINE}-${VERSION}/*/tests/ref_data"
+   TAREXCLUDE=${TAREXCLUDE}" --exclude ${PIPELINE}-${VERSION}/*/tests/ref_data"
  fi
  
  tar xf ${BASEDIR}/${PIPELINE}-kit-${VERSION}/${PIPELINE}-${VERSION}.tar.gz\

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