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

[Ole Streicher]

The following commit has been merged in the debian branch:
commit 90dfc076cfa19207c65068ff453c13396e5304e2
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Thu Feb 9 11:35:31 2012 +0100

    Remove "sla" subdir completely: it is built independently.

diff --git a/debian/control b/debian/control
index d2429dd..5d517dc 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Debian Science Maintainers <debian-science-maintainers at lists.alioth.
 Uploaders: Ole Streicher <debian at liska.ath.cx>
 Build-Depends: debhelper (>= 4.0.0), libtk-img-dev, zlib1g-dev, blt-dev,
  tcl-dev, tcllib, tk-dev, libxt-dev, tk-table (>= 2.9), libxml2-dev, 
- wcstools-dev, funtools-dev, gfortran, autotools-dev, zip
+ wcstools-dev, funtools-dev, slalib-dev, autotools-dev, zip
 Standards-Version: 3.9.2
 Homepage: http://hea-www.harvard.edu/RD/ds9/
 Vcs-Git: git://git.debian.org/git/debian-science/packages/saods9.git
diff --git a/debian/copyright b/debian/copyright
index be7026c..2ae9915 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -168,17 +168,6 @@ Copyright: Copyright 2002 Ingo Oppermann (ingo_opp at users.sourceforge.net)
  Cambridge, MA, USA 
 License: GPLv2+
 
-Files: sla/*
-Copyright: Copyright P.T.Wallace.
-License: GPLv2+
- The C implementation of SLA lib is proprietary and available
- commercially from the author.
- .
- The C files distributed by SAO are obfuscated.
- .
- The fortran implementation distributed by starlink CVS is GPL;
- this is the copy that is used. See  debian/rules:get_orig_source.
-
 Files: win/*
 Copyright: Copyright (C) 1999-2005 Smithsonian Astrophysical Observatory,
  Cambridge, MA, USA
diff --git a/debian/repack-dfsg.sh b/debian/repack-dfsg.sh
index 918b37d..a21cba7 100755
--- a/debian/repack-dfsg.sh
+++ b/debian/repack-dfsg.sh
@@ -1,14 +1,7 @@
 #!/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"
+# files removed. 
 
 ver=$2
 orig_tar=$3
@@ -37,6 +30,4 @@ dfsg_tar=$tardir/saods9_$ver+dfsg.orig.tar.gz
 tar czf $dfsg_tar -C $wd .
 rm -rf $wd
 
-wget -O $tardir/saods9_$ver+dfsg.orig-sla.tar.gz "$sla_url" 
-
 exec uupdate --no-symlink --upstream-version $ver+dfsg $dfsg_tar

-- 
image display tool for astronomy