[Debian-astro-commits] [starlink-ast] 02/02: Update copyright format to 1.0: use Files-Excluded

[Ole Streicher]

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

olebole pushed a commit to branch debian
in repository starlink-ast.

commit ec8f11c5ffd73663e9952a6c9cc1c55176e3c04b
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Wed Oct 14 10:53:41 2015 +0200

    Update copyright format to 1.0: use Files-Excluded
---
 debian/copyright      |  3 ++-
 debian/repack-dfsg.sh | 23 -----------------------
 debian/watch          |  6 ++----
 3 files changed, 4 insertions(+), 28 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index 2795c4e..554ba07 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,7 +1,8 @@
-Format: http://anonscm.debian.org/viewvc/dep/web/deps/dep5.mdwn?revision=202
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: AST
 Upstream-Author: David Berry, R.F. Warren-Smith
 Source: http://www.starlink.ac.uk/ast
+Files-Excluded: pal* Ers.h erfa* cminpack* sun???.htx_tar sun???.pdf
 
 Files: *
 Copyright: Copyright 1997-2009 Council for the Central Laboratory of the
diff --git a/debian/repack-dfsg.sh b/debian/repack-dfsg.sh
deleted file mode 100755
index bf444a3..0000000
--- a/debian/repack-dfsg.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-# ./debian/repack
-# Repackage the AST source files as a DFSG tarball, with unnecessary
-# files removed to avoid license conflicts.
-
-TMPDIR=$(mktemp --directory)
-trap "rm -fr ${TMPDIR} || exit 1" EXIT INT TERM
-
-ver=$2
-orig_tar=$3
-tardir=$(dirname $orig_tar)
-
-tar xf $orig_tar -C $TMPDIR 
-srcdir=$TMPDIR/*
-echo $srcdir
-rm -rf $srcdir/sofa* $srcdir/pal* $srcdir/Ers.h \
-       $srcdir/erfa* $srcdir/cminpack* \
-       $srcdir/sun???.htx_tar $srcdir/sun???.ps $srcdir/sun???.pdf
-
-dfsg_tar=$tardir/starlink-ast_$ver+dfsg.orig.tar.gz
-tar czf $dfsg_tar -C $TMPDIR .
-
-exec uupdate --no-symlink --upstream-version $ver+dfsg $dfsg_tar
diff --git a/debian/watch b/debian/watch
index 47a1d80..4a42d76 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,5 +1,3 @@
 version=3
-opts=dversionmangle=s/\+dfsg// \
- http://www.starlink.ac.uk/download/ast/ast-(.+)\.tar\.gz \
- debian \
- debian/repack-dfsg.sh
+opts=dversionmangle=s/\+dfsg//,repacksuffix=+dfsg \
+ http://www.starlink.ac.uk/download/ast/ast-(.+)\.(?:zip|tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-astro/packages/starlink-ast.git