[cod-tools] 07/08: Undoing repacking attempt using debian/watch and debian/repack files. Adding Files-Excluded stanza to debian/copyright instead.

[Andrius Merkys]

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

merkys-guest pushed a commit to branch 2.0
in repository cod-tools.

commit 9f84e78e8ea0c089cee7e3eae2ce3ee8daf41ec3
Author: Andrius Merkys <andrius.merkys at gmail.com>
Date:   Fri Dec 15 10:45:41 2017 +0200

    Undoing repacking attempt using debian/watch and debian/repack files. Adding Files-Excluded stanza to debian/copyright instead.
---
 debian/copyright |  2 ++
 debian/repack    | 23 -----------------------
 debian/watch     |  4 +---
 3 files changed, 3 insertions(+), 26 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index 16d2996..a181456 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,6 +1,8 @@
 Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Files-Excluded: src/lib/perl5/STAR
 Upstream-Name: cod-tools
 Source: <http://www.crystallography.net/cod/archives/2017/software/cod-tools/cod-tools-2.0.tar.gz>
+Comment: Non-DFSG-free STAR::Parser files are removed.
 
 Files: *
 Copyright: 2008 Saulius Gražulis <grazulis at ibt.lt>
diff --git a/debian/repack b/debian/repack
deleted file mode 100755
index fae93d1..0000000
--- a/debian/repack
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/bash
-
-set -e
-
-UPSTREAM_VERSION=$2
-ORIG_TARBALL=$3
-
-REAL_TARBALL=`readlink -f ${ORIG_TARBALL}`
-
-WORKING_DIR=`dirname ${ORIG_TARBALL}`
-
-ORIG_TARBALL_DFSG=`echo ${ORIG_TARBALL} | sed -e "s/\(${UPSTREAM_VERSION}\)\(\.orig\)/\1+dfsg\2/g"`
-ORIG_TARBALL_DIR=`echo ${ORIG_TARBALL_DFSG} | sed -e "s/_\(${UPSTREAM_VERSION}\)/-\1/g" -e "s/\.tar\.gz//g"`
-ORIG_TARBALL_DIR_STRIP=`basename ${ORIG_TARBALL_DIR}`
-
-mkdir -p ${ORIG_TARBALL_DIR}
-tar --directory=${ORIG_TARBALL_DIR} --strip 1 -xzf ${REAL_TARBALL} || exit 1
-rm -f ${ORIG_TARBALL} ${REAL_TARBALL}
-
-# Delete STAR::Parser files:
-rm -rf ${ORIG_TARBALL_DIR}/src/lib/perl5/STAR/
-
-GZIP=-9 tar --remove-files --directory ${WORKING_DIR} -czf ${ORIG_TARBALL_DFSG} ${ORIG_TARBALL_DIR_STRIP} || exit 1
diff --git a/debian/watch b/debian/watch
index 6473616..8d7c01b 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,5 +1,3 @@
 version=4
 
-opts=dversionmangle=s/\+dfsg$// \
-    http://www.crystallography.net/cod/archives/(\d{4})/software/cod-tools/cod-tools-(\d+(?:\.\d+){0,2})\.(?:tbz2|tar\.gz) \
-    debian debian/repack
+http://www.crystallography.net/cod/archives/(\d{4})/software/cod-tools/cod-tools-(\d+(?:\.\d+){0,2})\.(?:tbz2|tar\.gz)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/cod-tools.git