[Debian-astro-commits] [ftools-fv] 01/03: Adopt Files-Removed, and adjust watch file for new version

[Ole Streicher]

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

olebole pushed a commit to branch debian
in repository ftools-fv.

commit 7add7aee8aada14fa4c2950f94b2ca5ca93add72
Author: Ole Streicher <olebole at debian.org>
Date:   Mon Aug 31 09:37:52 2015 +0200

    Adopt Files-Removed, and adjust watch file for new version
---
 debian/copyright      |  3 +++
 debian/dfsg.remove    | 34 ----------------------------------
 debian/repack-dfsg.sh | 34 ----------------------------------
 debian/watch          |  6 ++----
 4 files changed, 5 insertions(+), 72 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index 8ba5dfb..0d974d8 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -2,6 +2,9 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: fv
 Upstream-Contact: William Pence, Pan Chai
 Source: http://heasarc.gsfc.nasa.gov/FTP/software/lheasoft/fv
+Files-Excluded: tcltk/tcl tcltk/tk tcltk/tix tcltk/itcl tcltk/itk tcltk/iwidgets
+ tcltk/xpa heacore ftools/guis/fitsTcl BUILD_DIR ftools/BUILD_DIR tcltk/BUILD_DIR
+ ftools/guis/fv/mac/tkMacAppInit.c  ftools/guis/fv/unix
 
 Files: *
 Copyright: 2000-2009, William Pence, Pan Chai
diff --git a/debian/dfsg.remove b/debian/dfsg.remove
deleted file mode 100644
index d69ea57..0000000
--- a/debian/dfsg.remove
+++ /dev/null
@@ -1,34 +0,0 @@
-# The following files are removed from the original tarball
-# to make the copyright files simpler and the source package smaller:
-#
-# We don't need the whole tcl/tk universe in the source file
-tcltk/tcl
-tcltk/tk
-tcltk/tix
-tcltk/itcl
-tcltk/itk
-tcltk/iwidgets
-#
-# xpa, cfitsio, readline, wcslib are in Debian as well
-tcltk/xpa
-heacore
-
-#
-# fitsTcl will be distributed separately
-#
-ftools/guis/fitsTcl
-
-#
-# We dont use the original build system
-#
-BUILD_DIR
-ftools/BUILD_DIR
-tcltk/BUILD_DIR
-
-#
-# This has an unclear license and is not needed anyway
-ftools/guis/fv/mac/tkMacAppInit.c
-#
-# This is not needed and is GPL licensed. To easy the copyright file
-# and make the distribution less restrictive, remove it.
-ftools/guis/fv/unix
diff --git a/debian/repack-dfsg.sh b/debian/repack-dfsg.sh
deleted file mode 100755
index 925a91a..0000000
--- a/debian/repack-dfsg.sh
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/sh
-# ./debian/repack
-# Repackage the source files as a DFSG tarball, with unnecessary
-# files removed. 
-
-TMPDIR=$(mktemp --directory)
-trap "rm -fr ${TMPDIR} || exit 1" EXIT INT TERM
-
-ver=$2
-orig_tar=$3
-tardir=$(dirname ${orig_tar})
-debiandir=$(dirname $0)
-pkgname=$(grep ^[^[:space:]] ${debiandir}/changelog | head -1|cut -d' ' -f1)
-
-echo $pkgname $ver $orig_tar $tardir $wd
-
-tar xf ${orig_tar} -C ${TMPDIR} 
-srcdir=$(ls -d ${TMPDIR}/*)
-
-if [ -f ${debiandir}/dfsg.move ] ; then
-  ( while read source target ; do
-      mkdir -p ${srcdir}/${target}
-      mv ${srcdir}/${source} ${srcdir}/${target}
-    done ) < ${debiandir}/dfsg.move
-fi
-
-for fname in $(cat ${debiandir}/dfsg.remove | sed s/\#.\*//); do
-    rm -rf ${srcdir}/${fname}
-done
-
-dfsg_tar=${tardir}/${pkgname}_${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 007a916..2134171 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,6 +1,4 @@
 # watch control file for uscan
 version=3
-opts=uversionmangle=s/(.)/.$1/g;s/^\.//,dversionmangle=s/\+dfsg// \
- http://heasarc.gsfc.nasa.gov/FTP/software/lheasoft/fv/fv(.+)_src\.tar\.gz \
- debian \
- debian/repack-dfsg.sh
+opts=dversionmangle=s/\+dfsg//,uversionmangle=s/$/+dfsg/ \
+ http://heasarc.gsfc.nasa.gov/FTP/software/lheasoft/fv/fv(.+\..+)_src\.tar\.gz

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