[cpl-plugin-template] 46/58: Merge all source files into one and compress with xz

[Ole Streicher]

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

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

commit 68523465d147163db6351b1f9010a25643001082
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Tue Dec 3 21:27:14 2013 +0100

    Merge all source files into one and compress with xz
---
 debian/repackage.sh | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/debian/repackage.sh b/debian/repackage.sh
index 089636a..fa9c13f 100755
--- a/debian/repackage.sh
+++ b/debian/repackage.sh
@@ -30,7 +30,7 @@ INCLUDE_TEST_DATA="yes"
 BASEDIR=$(dirname $3)
 FILENAME=${BASEDIR}/${PIPELINE}-kit-${VERSION}.tar.gz
 tar xf ${FILENAME} -C ${BASEDIR}
-rm -f ${BASEDIR}/${DEBIAN_PACKAGE}_${VERSION}.orig*.tar.gz ${FILENAME}
+rm -f ${BASEDIR}/${DEBIAN_PACKAGE}_${VERSION}.orig*.tar.* ${FILENAME}
 
 TAREXCLUDE="--exclude ${PIPELINE}-${VERSION}/html"
 if [ $INCLUDE_TEST_DATA = "no" ] ; then
@@ -39,21 +39,19 @@ fi
 
 tar xf ${BASEDIR}/${PIPELINE}-kit-${VERSION}/${PIPELINE}-${VERSION}.tar.gz\
     -C ${BASEDIR} ${TAREXCLUDE}
-tar czf ${BASEDIR}/${DEBIAN_PACKAGE}_${VERSION}+dfsg.orig.tar.gz \
-    -C ${BASEDIR} ${PIPELINE}-${VERSION}/
-rm -rf ${BASEDIR}/${PIPELINE}-${VERSION}/
-
 tar xf ${BASEDIR}/${PIPELINE}-kit-${VERSION}/${PIPELINE}-calib-${VERSION}.tar.gz\
-    -C ${BASEDIR}
+    -C ${BASEDIR}/${PIPELINE}-${VERSION}/
+mv ${BASEDIR}/${PIPELINE}-${VERSION}/${PIPELINE}-calib-${VERSION}/ \
+   ${BASEDIR}/${PIPELINE}-${VERSION}/calib/
 if [ $INCLUDE_CALIB = "no" ] ; then
-  du -s ${BASEDIR}/${PIPELINE}-calib-${VERSION}/cal | cut -f1 \
-     > ${BASEDIR}/${PIPELINE}-calib-${VERSION}/cal_size
-  rm -rf ${BASEDIR}/${PIPELINE}-calib-${VERSION}/cal
+  du -s ${BASEDIR}/${PIPELINE}-${VERSION}/calib/cal | cut -f1 \
+      > ${BASEDIR}/${PIPELINE}-${VERSION}/calib/cal_size
+  rm -rf ${BASEDIR}/${PIPELINE}-${VERSION}/calib/cal
 fi
-tar czf ${BASEDIR}/${DEBIAN_PACKAGE}_${VERSION}+dfsg.orig-calib.tar.gz \
-    -C ${BASEDIR} ${PIPELINE}-calib-${VERSION}/
-rm -rf ${BASEDIR}/${PIPELINE}-calib-${VERSION}/
 
+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}/ 
 exec uupdate --no-symlink "$@"

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