[SCM] image display tool for astronomy branch, debian, updated. c428e7d78a3a362809196ceb116fb4b8ab9d7b35

[Ole Streicher]

The following commit has been merged in the debian branch:
commit 764857e064930c8c9f319a21a7117bc96ea8c185
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Mon Jan 16 14:49:52 2012 +0100

    Include repacking in download

diff --git a/debian/changelog b/debian/changelog
index b2c9406..781a4e4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-saods9 (6.2-1) unstable; urgency=low
+saods9 (6.2+dfsg-1) unstable; urgency=low
 
   * New maintainer.
   * New upstream version
diff --git a/debian/repack-dfsg.sh b/debian/repack-dfsg.sh
new file mode 100755
index 0000000..4a3e454
--- /dev/null
+++ b/debian/repack-dfsg.sh
@@ -0,0 +1,41 @@
+#!/bin/sh
+# ./debian/repack
+# Repackage the DS9 source files as a DFSG tarball, with unnecessary
+# files removed. Also, download a dfsg compliant "sla" package.
+
+# The "sla" subdir comes as a snapshot from the starlink repository.
+# This corresponds to the subdir "libraries/sla", 
+# commit 2a1ac7242eb2d595d7547b0329b066ea922d8bb7
+# from Tue, 13 Dec 2011 18:12:40 +0000 (18:12 +0000)
+h=f43889fd9da045ec93c72a0b85ae6f238b46e069
+sla_url="http://starlink.jach.hawaii.edu/git/?p=starlink.git;a=snapshot;h=$h;sf=tgz"
+
+ver=$2
+orig_tar=$3
+tardir=$(dirname orig_tar)
+wd=$(mktemp -d)
+echo $ver $orig_tar $tardir $wd
+
+tar xf $orig_tar -C $wd 
+srcdir=$wd/*
+
+cp $srcdir/tcl8.*/library/auto.tcl \
+   $srcdir/tk8.*/library/tkfbox.tcl \
+   $srcdir/tk8.*/library/xmfbox.tcl \
+   $srcdir/ds9/
+
+for subdir in blt\* funtools\* sla tcl8.\* tcllib-\* tk8.\* tkimg\* \
+              tktable\* tclxml-\* wcssubs-\* xplrpc-\* xpa-\* \
+              zip-\* zlib-\* ; do
+    rm -rf $srcdir/$subdir
+done
+
+find $srcdir/ -name config.status |xargs rm -f
+find $srcdir/ -name conf.h |xargs rm -f
+
+tar czf $tardir/saods9-$ver+dfsg.orig.tar.gz -C $wd .
+rm -rf $wd
+
+wget -O $tardir/saods9-$ver+dfsg.orig-sla.tar.gz "$sla_url" 
+
+uupdate --no-symlink "$@"
\ No newline at end of file
diff --git a/debian/watch b/debian/watch
index 5ea7a98..38b413b 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,6 @@
-version=2
-http://hea-www.harvard.edu/RD/ds9/ http://hea-www.harvard.edu/saord/download/ds9/source/ds9\.(.*)\.tar\.gz debian uupdate
+version=3
+opts=dversionmangle=s/\+dfsg// \
+    http://hea-www.harvard.edu/RD/ds9/ \
+    http://hea-www.harvard.edu/saord/download/ds9/source/ds9\.(.*)\.tar\.gz \
+    debian \
+    debian/repack-dfsg.sh

-- 
image display tool for astronomy