[cpl-plugin-sinfo] 04/05: Add +dfsg to version to indicate repackaging

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

commit c1cb556b9295ec7b41ad94e0bfbc11c55f563587
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Tue Dec 3 09:47:27 2013 +0100

    Add +dfsg to version to indicate repackaging
---
 debian/README.Source | 6 ++++++
 debian/repackage.sh  | 6 +++---
 debian/watch         | 1 +
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/debian/README.Source b/debian/README.Source
new file mode 100644
index 0000000..6dbc21d
--- /dev/null
+++ b/debian/README.Source
@@ -0,0 +1,6 @@
+The original -kit tar file contains a number of additional components which
+are not DFSG-free (namely gasgano), or already included in Debian (like cpl,
+esorex, and additional libraries). Only the pipeline sources and calibration
+files are extracted from this -kit tar file.
+
+ -- Ole Streicher <debian at liska.ath.cx>  Tue, 01 Dec 2013 09:18:46 +0100
diff --git a/debian/repackage.sh b/debian/repackage.sh
index 649e8d0..1cc9e11 100755
--- a/debian/repackage.sh
+++ b/debian/repackage.sh
@@ -51,17 +51,17 @@ fi
 
 tar xf ${BASEDIR}/${PIPELINE}-kit-${VERSION}/${PIPELINE}-${VERSION}.tar.gz\
     -C ${BASEDIR} ${TAREXCLUDE}
-tar czf ${BASEDIR}/${DEBIAN_PACKAGE}_${VERSION}.orig.tar.gz \
+tar czf ${BASEDIR}/${DEBIAN_PACKAGE}_${VERSION}+dfsg.orig.tar.gz \
     -C ${BASEDIR} ${PIPELINE}-${VERSION}/
 rm -rf ${BASEDIR}/${PIPELINE}-${VERSION}/
 
 if [ $INCLUDE_CALIB = "yes" ] ; then
   mv ${BASEDIR}/${PIPELINE}-kit-${VERSION}/${PIPELINE}-calib-${VERSION}.tar.gz \
-     ${BASEDIR}/${DEBIAN_PACKAGE}_${VERSION}.orig-calib.tar.gz
+     ${BASEDIR}/${DEBIAN_PACKAGE}_${VERSION}+dfsg.orig-calib.tar.gz
 else
   tar xf ${BASEDIR}/${PIPELINE}-kit-${VERSION}/${PIPELINE}-calib-${VERSION}.tar.gz\
       -C ${BASEDIR} --exclude ${PIPELINE}-calib-${VERSION}/cal
-  tar czf ${BASEDIR}/${DEBIAN_PACKAGE}_${VERSION}.orig-calib.tar.gz \
+  tar czf ${BASEDIR}/${DEBIAN_PACKAGE}_${VERSION}+dfsg.orig-calib.tar.gz \
       -C ${BASEDIR} ${PIPELINE}-calib-${VERSION}/
   rm -rf ${BASEDIR}/${PIPELINE}-calib-${VERSION}/ 
 fi
diff --git a/debian/watch b/debian/watch
index bea4dd6..4c88b7c 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,4 +1,5 @@
 version=3
+opts=dversionmangle=s/\+dfsg// \
 http://www.eso.org/sci/software/pipelines/ \
  .*/sinfo-kit-(.*).tar.gz \
  debian debian/repackage.sh

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