[SCM] image display tool for astronomy branch, debian, updated. upstream/7.0.1+dfsg-187-gbe49dfd
Ole Streicher
debian at liska.ath.cx
Tue Apr 16 09:59:32 UTC 2013
The following commit has been merged in the debian branch:
commit be49dfd13bfa07a3ded892e9565e6d82ecfbbfd6
Author: Ole Streicher <debian at liska.ath.cx>
Date: Tue Apr 16 11:52:07 2013 +0200
Update debian files to 7.2
Push standards-version t 3.9.4 (no change needed)
diff --git a/debian/changelog b/debian/changelog
index 868d9dd..7d4f62e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+saods9 (7.2+dfsg-1~exp1) experimental; urgency=low
+
+ * New upstream version
+ * Copyright changed to GPL-3+
+ * Push standards-version t 3.9.4 (no change needed)
+
+ -- Ole Streicher <debian at liska.ath.cx> Tue, 16 Apr 2013 11:28:43 +0200
+
saods9 (7.1+dfsg-1~exp3) experimental; urgency=low
* Remove explicite link to tcl8.5 in htmlwidget; fixes FTBS on alpha
diff --git a/debian/control b/debian/control
index ce7a8c3..0394310 100644
--- a/debian/control
+++ b/debian/control
@@ -18,10 +18,10 @@ Build-Depends: autotools-dev,
tcl-dev,
tk-dev,
zlib1g-dev
-Standards-Version: 3.9.3
+Standards-Version: 3.9.4
Homepage: http://hea-www.harvard.edu/RD/ds9/site/Home.html
-Vcs-Git: git://git.debian.org/git/debian-science/packages/saods9.git
-Vcs-Browser: http://git.debian.org/?p=debian-science/packages/saods9.git
+Vcs-Git: git://anonscm.debian.org/debian-science/packages/saods9.git
+Vcs-Browser: http://anonscm.debian.org/gitweb/?p=debian-science/packages/saods9.git
Package: saods9
Architecture: any
diff --git a/debian/copyright b/debian/copyright
index 2399075..5b3ce86 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,7 +4,7 @@ Upstream-Author: William Joye <wjoye at cfa.harvard.edu>
Source: http://hea-www.harvard.edu/RD/ds9/site/Download.html
Files: *
-Copyright: Copyright (C) 1999-2010 Smithsonian Astrophysical Observatory,
+Copyright: Copyright (C) 1999-2012 Smithsonian Astrophysical Observatory,
Cambridge, MA, USA
Copyright (c) 2002 Ingo Oppermann (ingo_opp at users.sourceforge.net)
Copyright (c) 1993 Association of Universities for Research in Astronomy.
@@ -15,19 +15,28 @@ Comment: Some original authors:
iis/: Doug Tody, NOAO
rice/: Richard White
xmlrpc-0.3/: Eric Yeh
-License: GPLv2+
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License as
- published by the Free Software Foundation; either version 2 of
- the License, or (at your option) any later version.
- .
- This program is distributed in the hope that it will be
- useful, but WITHOUT ANY WARRANTY; without even the implied
- warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE. See the GNU General Public License for more details.
+License: GPLv3+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
.
On Debian systems, the complete text of the GNU General Public
- License can be found in `/usr/share/common-licenses/GPL-2'.
+ License can be found in `/usr/share/common-licenses/GPL-3'.
+ .
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+ .
+ Correspondence concerning SAOImage DS9 should be addressed as follows:
+ .
+ William Joye
+ Smithsonian Astrophysical Observatory
+ 60 Garden St.
+ Cambridge, MA 02138 USA
+ wjoye at cfa.harvard.edu
+ http://hea-www.harvard.edu/RD/ds9/
Files: src/tkfbox.tcl src/xmfbox.tcl
Copyright: Copyright (c) 1994-1998 Sun Microsystems, Inc.
diff --git a/debian/patches/blt_fix_crash.patch b/debian/patches/blt_fix_crash.patch
index 898d41a..8c50f87 100644
--- a/debian/patches/blt_fix_crash.patch
+++ b/debian/patches/blt_fix_crash.patch
@@ -6,7 +6,7 @@ Description: BLT crashes when it reaches this code. This seems to be some
a better fix.
--- a/saotk/frame/frblt.C
+++ b/saotk/frame/frblt.C
-@@ -798,7 +798,7 @@
+@@ -797,7 +797,7 @@
if (Blt_GetVector(interp, xname, &xv) != TCL_OK)
goto error;
@@ -15,7 +15,7 @@ Description: BLT crashes when it reaches this code. This seems to be some
TCL_OK)
goto error;
-@@ -806,7 +806,7 @@
+@@ -805,7 +805,7 @@
if (Blt_GetVector(interp, yname, &yv) != TCL_OK)
goto error;
@@ -98,7 +98,7 @@ Description: BLT crashes when it reaches this code. This seems to be some
if (Tcl_InitStubs(interp, TCL_VERSION_LOADED, isExact) == NULL) {
--- a/saotk/frame/marker.C
+++ b/saotk/frame/marker.C
-@@ -1166,19 +1166,19 @@
+@@ -1163,19 +1163,19 @@
{
Blt_Vector* xx;
Blt_GetVector(parent->getInterp(), xname, &xx);
@@ -122,7 +122,7 @@ Description: BLT crashes when it reaches this code. This seems to be some
}
void Marker::analysisPlot3dResult(char* xname, char* yname,
-@@ -1187,11 +1187,11 @@
+@@ -1184,11 +1184,11 @@
{
Blt_Vector* xx;
Blt_GetVector(parent->getInterp(), xname, &xx);
@@ -136,7 +136,7 @@ Description: BLT crashes when it reaches this code. This seems to be some
}
void Marker::analysisPandaResult(double* x, double* y, double* e, int num)
-@@ -1208,15 +1208,15 @@
+@@ -1205,15 +1205,15 @@
{
Blt_Vector* xx;
Blt_GetVector(parent->getInterp(), xname, &xx);
diff --git a/debian/patches/ds9_add_about_debian.patch b/debian/patches/ds9_add_about_debian.patch
index 26eb143..ba86760 100644
--- a/debian/patches/ds9_add_about_debian.patch
+++ b/debian/patches/ds9_add_about_debian.patch
@@ -13,7 +13,7 @@ Description: Add the Debian packager to the "About" box
saord at cfa.harvard.edu
--- a/src/util.tcl
+++ b/src/util.tcl
-@@ -696,7 +696,7 @@
+@@ -702,7 +702,7 @@
# Param
set f [frame $w.param -background white]
diff --git a/debian/patches/ds9_fix_docdir.patch b/debian/patches/ds9_fix_docdir.patch
index efc5de0..6d68a1a 100644
--- a/debian/patches/ds9_fix_docdir.patch
+++ b/debian/patches/ds9_fix_docdir.patch
@@ -35,7 +35,7 @@ Description: Instead putting the documentation into the common shared
--- a/src/ds9.tcl
+++ b/src/ds9.tcl
-@@ -187,6 +187,7 @@
+@@ -186,6 +186,7 @@
# set to absolute path so that if -cd command is used,
# so we can still find our files
set ds9(root) "/usr/share/saods9"
@@ -45,7 +45,7 @@ Description: Instead putting the documentation into the common shared
package require msgcat
--- a/src/util.tcl
+++ b/src/util.tcl
-@@ -701,7 +701,7 @@
+@@ -707,7 +707,7 @@
# can't use -file for zvfs
# set ed(sun) [image create photo -format gif -file $ds9(root)/doc/sun.gif]
diff --git a/debian/patches/ds9_make_linux.patch b/debian/patches/ds9_make_linux.patch
index 074336a..88bdbdc 100644
--- a/debian/patches/ds9_make_linux.patch
+++ b/debian/patches/ds9_make_linux.patch
@@ -42,7 +42,7 @@ Description: Set the compile flags according to the Debian environment. We
--- a/Makefile
+++ b/Makefile
-@@ -284,7 +284,7 @@
+@@ -283,7 +283,7 @@
blt : FORCE
@echo "Installing BLT..."
@@ -51,7 +51,7 @@ Description: Set the compile flags according to the Debian environment. We
cd $(BLTDIR)/src; $(MAKE) -j $(JOBS) build_shared
cp $(BLTDIR)/src/*.so* lib/.
cd $(BLTDIR)/src; cp $(BLTINCL) ../../include/.
-@@ -316,7 +316,7 @@
+@@ -315,7 +315,7 @@
html : FORCE
@echo "Installing HTMLWIDGET..."
diff --git a/debian/patches/ds9_use_external_libs.patch b/debian/patches/ds9_use_external_libs.patch
index d776e6f..039b1ec 100644
--- a/debian/patches/ds9_use_external_libs.patch
+++ b/debian/patches/ds9_use_external_libs.patch
@@ -270,7 +270,7 @@ Description: Compile against external libraries of wcstools, funtools, ast,
return TCL_ERROR;
--- a/Makefile
+++ b/Makefile
-@@ -284,9 +284,9 @@
+@@ -283,9 +283,9 @@
blt : FORCE
@echo "Installing BLT..."
@@ -283,7 +283,7 @@ Description: Compile against external libraries of wcstools, funtools, ast,
cd $(BLTDIR)/src; cp $(BLTINCL) ../../include/.
zlib : FORCE
-@@ -301,7 +301,7 @@
+@@ -300,7 +300,7 @@
tkimg : libtiff
@echo "Installing TKIMG..."
@@ -292,7 +292,7 @@ Description: Compile against external libraries of wcstools, funtools, ast,
cd $(TKIMGDIR); $(MAKE) -j $(JOBS) all; $(MAKE) install
libtiff : FORCE
-@@ -311,18 +311,18 @@
+@@ -310,18 +310,18 @@
tkmpeg : FORCE
@echo "Installing TKMPEG..."
@@ -314,7 +314,7 @@ Description: Compile against external libraries of wcstools, funtools, ast,
cd $(XPADIR); $(MAKE) -j $(JOBS); $(MAKE) install
cd bin; strip xpa*
-@@ -377,7 +377,7 @@
+@@ -376,7 +376,7 @@
saotk : FORCE
@echo "Installing SAOTK..."
@@ -323,7 +323,7 @@ Description: Compile against external libraries of wcstools, funtools, ast,
zip : FORCE
@echo "Installing ZIP..."
-@@ -401,15 +401,9 @@
+@@ -400,15 +400,9 @@
endif
distclean : filesclean \
@@ -342,7 +342,7 @@ Description: Compile against external libraries of wcstools, funtools, ast,
filesclean: FORCE
find . -name "myconfig.cache" -exec rm {} \;
-@@ -418,59 +412,18 @@
+@@ -417,59 +411,18 @@
dirsclean: FORCE
@for d in $(DIRS); do rm -rf $$d; done
@@ -403,7 +403,7 @@ Description: Compile against external libraries of wcstools, funtools, ast,
riceclean: FORCE
cd $(RICEDIR); $(MAKE) distclean
-@@ -486,9 +439,6 @@
+@@ -485,9 +438,6 @@
zipclean: FORCE
cd $(ZIPDIR); PREFIX=$(root) $(MAKE) -f unix/Makefile clean
@@ -415,7 +415,7 @@ Description: Compile against external libraries of wcstools, funtools, ast,
--- a/src/ds9.tcl
+++ b/src/ds9.tcl
-@@ -189,29 +189,35 @@
+@@ -188,29 +188,35 @@
set ds9(root) "[pwd]/zvfsmntpt"
# tcl modules
diff --git a/debian/patches/ds9_use_filesystem.patch b/debian/patches/ds9_use_filesystem.patch
index bf43914..9989bf2 100644
--- a/debian/patches/ds9_use_filesystem.patch
+++ b/debian/patches/ds9_use_filesystem.patch
@@ -127,7 +127,7 @@ Description: Store all files in the usual FHS directories instead of
--- a/src/ds9.tcl
+++ b/src/ds9.tcl
-@@ -186,7 +186,7 @@
+@@ -185,7 +185,7 @@
# set to absolute path so that if -cd command is used,
# so we can still find our files
diff --git a/debian/patches/saotk_avoid_compile_warnings.patch b/debian/patches/saotk_avoid_compile_warnings.patch
index 8ff9198..680c092 100644
--- a/debian/patches/saotk_avoid_compile_warnings.patch
+++ b/debian/patches/saotk_avoid_compile_warnings.patch
@@ -33,7 +33,7 @@ Description: Avoid compile time warnings in the saotk subsystem
--- a/saotk/fitsy++/strm.C
+++ b/saotk/fitsy++/strm.C
-@@ -387,7 +387,7 @@
+@@ -397,7 +397,7 @@
if (!(this->pExt_ || (this->pIndex_>0))) {
// we are only looking for a primary image
@@ -42,7 +42,7 @@ Description: Avoid compile time warnings in the saotk subsystem
this->found();
return;
}
-@@ -443,7 +443,7 @@
+@@ -453,7 +453,7 @@
this->head_ = NULL;
}
diff --git a/debian/patches/saotk_fix_funtools_includes.patch b/debian/patches/saotk_fix_funtools_includes.patch
index e36a4f1..105644f 100644
--- a/debian/patches/saotk_fix_funtools_includes.patch
+++ b/debian/patches/saotk_fix_funtools_includes.patch
@@ -3,17 +3,6 @@ Description: Since the funtools include files have quite generic names, we
replace append the directory prefix "funtools/" instead of just adding
/usr/include/funtools to the include path. This should prevent from accidently
using the wrong include files.
---- a/saotk/fitsy++/compress.C
-+++ b/saotk/fitsy++/compress.C
-@@ -4,7 +4,7 @@
-
- #include "compress.h"
- #include "head.h"
--#include "NaN.h"
-+#include <funtools/NaN.h>
-
- FitsCompress::FitsCompress(FitsFile* fits)
- {
--- a/saotk/fitsy++/hist.C
+++ b/saotk/fitsy++/hist.C
@@ -13,8 +13,8 @@
@@ -27,193 +16,14 @@ Description: Since the funtools include files have quite generic names, we
#define FILTERSIZE 262144
#define MULTWCS 27
---- a/saotk/frame/fitsbin.C
-+++ b/saotk/frame/fitsbin.C
-@@ -4,7 +4,7 @@
-
- #include "fitsimage.h"
-
--#include "NaN.h"
-+#include <funtools/NaN.h>
-
- void FitsImage::initHist()
- {
---- a/saotk/frame/fitsdata.C
-+++ b/saotk/frame/fitsdata.C
-@@ -4,7 +4,7 @@
-
- #include "fitsdata.h"
- #include "colorscale.h"
--#include "NaN.h"
-+#include <funtools/NaN.h>
-
- #include "sigbus.h"
- #define INTERP (((Base*)parent)->interp)
---- a/saotk/frame/frame.C
-+++ b/saotk/frame/frame.C
-@@ -5,7 +5,7 @@
- #include "frame.h"
- #include "fitsimage.h"
- #include "ps.h"
--#include "NaN.h"
-+#include <funtools/NaN.h>
-
- #include "sigbus.h"
-
---- a/saotk/frame/frame3d.C
-+++ b/saotk/frame/frame3d.C
-@@ -5,7 +5,7 @@
- #include "frame3d.h"
- #include "fitsimage.h"
- #include "ps.h"
--#include "NaN.h"
-+#include <funtools/NaN.h>
- #include "sigbus.h"
-
- #include <pthread.h>
---- a/saotk/frame/frame3dtruecolor.C
-+++ b/saotk/frame/frame3dtruecolor.C
-@@ -9,7 +9,7 @@
- #include "frame3dtruecolor.h"
- #include "fitsimage.h"
- #include "ps.h"
--#include "NaN.h"
-+#include <funtools/NaN.h>
-
- Frame3dTrueColor::Frame3dTrueColor(Tcl_Interp* i, Tk_Canvas c, Tk_Item* item)
- : Frame3dBase(i,c,item), Frame3d(i,c,item), Frame3dTrue(i,c,item)
---- a/saotk/frame/framepseudocolor.C
-+++ b/saotk/frame/framepseudocolor.C
-@@ -5,7 +5,7 @@
- #include "framepseudocolor.h"
- #include "fitsimage.h"
- #include "ps.h"
--#include "NaN.h"
-+#include <funtools/NaN.h>
-
- #include "sigbus.h"
-
---- a/saotk/frame/framergb.C
-+++ b/saotk/frame/framergb.C
-@@ -5,7 +5,7 @@
- #include "framergb.h"
- #include "fitsimage.h"
- #include "ps.h"
--#include "NaN.h"
-+#include <funtools/NaN.h>
-
- #include "sigbus.h"
-
---- a/saotk/frame/framergbtruecolor.C
-+++ b/saotk/frame/framergbtruecolor.C
-@@ -9,7 +9,7 @@
- #include "framergbtruecolor.h"
- #include "fitsimage.h"
- #include "ps.h"
--#include "NaN.h"
-+#include <funtools/NaN.h>
-
- #include "sigbus.h"
-
---- a/saotk/frame/frametruecolor.C
-+++ b/saotk/frame/frametruecolor.C
-@@ -9,7 +9,7 @@
- #include "frametruecolor.h"
- #include "fitsimage.h"
- #include "ps.h"
--#include "NaN.h"
-+#include <funtools/NaN.h>
-
- #include "sigbus.h"
-
---- a/saotk/frame/frblt.C
-+++ b/saotk/frame/frblt.C
-@@ -5,7 +5,7 @@
- #include "base.h"
- #include "context.h"
- #include "fitsimage.h"
--#include "NaN.h"
-+#include <funtools/NaN.h>
- #include "blt.h"
- #include "bltVector.h"
- #include "projection.h"
---- a/saotk/frame/frmarker.C
-+++ b/saotk/frame/frmarker.C
-@@ -11,7 +11,7 @@
- #include "fvcontour.h"
- #include "marker.h"
- #include "basemarker.h"
--#include "NaN.h"
-+#include <funtools/NaN.h>
- #include "sigbus.h"
- #include "parser.H"
-
---- a/saotk/frame/frsave.C
-+++ b/saotk/frame/frsave.C
-@@ -9,7 +9,7 @@
- #include "outchannel.h"
- #include "outsocket.h"
-
--#include "NaN.h"
-+#include <funtools/NaN.h>
-
- #include "sigbus.h"
-
---- a/saotk/frame/fvcontour.C
-+++ b/saotk/frame/fvcontour.C
-@@ -7,7 +7,7 @@
- #include "fitsimage.h"
- #include "fvcontour.h"
-
--#include "NaN.h"
-+#include <funtools/NaN.h>
-
- #include "sigbus.h"
- #define INTERP (((Base*)parent)->interp)
---- a/saotk/frame/inversescale.C
-+++ b/saotk/frame/inversescale.C
-@@ -5,7 +5,7 @@
- #include "inversescale.h"
- #include "framebase.h"
-
--#include "NaN.h"
-+#include <funtools/NaN.h>
-
- InverseScale::InverseScale(int ss) : size_(ss)
- {
---- a/saotk/frame/fitshealpix.C
-+++ b/saotk/frame/fitshealpix.C
-@@ -5,7 +5,7 @@
- #include "fitsimage.h"
- #include "hpx.h"
-
--#include "NaN.h"
-+#include <funtools/NaN.h>
-
- int FitsImage::initHPX()
- {
---- a/saotk/util/smooth.C
-+++ b/saotk/util/smooth.C
-@@ -10,7 +10,7 @@
- #include <math.h>
-
- #include "smooth.h"
--#include "NaN.h"
-+#include <funtools/NaN.h>
-
- void boxcar(double* kernel, int r)
- {
--- a/saotk/fitsy++/hpx.C
+++ b/saotk/fitsy++/hpx.C
-@@ -17,9 +17,9 @@
-
+@@ -18,7 +18,7 @@
#include "hpx.h"
#include "util.h"
--#include "NaN.h"
-+#include <funtools/NaN.h>
-#include "fitsy.h"
-+#include <funtools/fitsy.h>
++#include "funtools/fitsy.h"
FitsHPX::FitsHPX(FitsFile* fits, Order oo, CoordSys ss, Layout ll,
int cc, int qq)
diff --git a/debian/saods9.docs b/debian/saods9.docs
index a90dfc9..99ed0d4 100644
--- a/debian/saods9.docs
+++ b/debian/saods9.docs
@@ -1,2 +1 @@
-acknowledgement
notes.txt
--
image display tool for astronomy
More information about the debian-science-commits
mailing list