[saods9] 02/02: Adjust for new beta version
Ole Streicher
olebole at moszumanska.debian.org
Tue Jun 23 12:44:06 UTC 2015
This is an automated email from the git hooks/post-receive script.
olebole pushed a commit to branch experimental
in repository saods9.
commit cbb393536d3e2a1d58914abe5e1dff7c3c72cc42
Author: Ole Streicher <debian at liska.ath.cx>
Date: Tue Jun 23 14:44:19 2015 +0200
Adjust for new beta version
---
debian/changelog | 6 +
debian/copyright | 2 +-
debian/patches/ds9_make_linux.patch | 59 +-----
debian/patches/ds9_support_blt.patch | 2 +-
debian/patches/ds9_use_external_libs.patch | 112 ++++++++---
debian/patches/ds9_use_filesystem.patch | 2 +-
debian/patches/saotk_add_ksearch.patch | 2 +-
debian/patches/saotk_avoid_compile_warnings.patch | 231 ++++++++++++++++++++++
debian/rules | 3 +-
debian/watch | 4 +-
10 files changed, 334 insertions(+), 89 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index eff0cb2..4ecac0c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+saods9 (7.4~b3+repack-1) experimental; urgency=low
+
+ * New upstream beta version
+
+ -- Ole Streicher <olebole at debian.org> Tue, 23 Jun 2015 14:43:50 +0200
+
saods9 (7.4~b2+repack-1) experimental; urgency=low
* New upstream beta version
diff --git a/debian/copyright b/debian/copyright
index f80c849..5294de8 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,7 +3,7 @@ Upstream-Name: SAOImage DS9
Upstream-Author: William Joye <wjoye at cfa.harvard.edu>
Source: http://ds9.si.edu/site/Download.html
Files-Excluded: funtools* tcl8.* tcllib-* tk8.* tkimg* signal_ext*
- tktable* tkcon-* tclxml-* wcssubs-* xpa-* tkblt* win zip-* zlib-*
+ tktable* tkcon-* tclxml-* saotk/wcssubs* xpa-* tkblt* win zlib-*
compilers ast-* zvfs tkmacosx*
Files: *
diff --git a/debian/patches/ds9_make_linux.patch b/debian/patches/ds9_make_linux.patch
index e1bc17d..c9c02c4 100644
--- a/debian/patches/ds9_make_linux.patch
+++ b/debian/patches/ds9_make_linux.patch
@@ -26,7 +26,7 @@ Description: Set the compile flags according to the Debian environment. We
CXXOPT = ${OPTS} ${AA}
--- a/Makefile.unix
+++ b/Makefile.unix
-@@ -79,10 +79,10 @@
+@@ -87,10 +87,10 @@
tkhtml : $(HTMLDIR)
@echo "Installing $@..."
cd $(HTMLDIR); CC='$(CC)' CFLAGS='$(OPTS) -DUSE_INTERP_RESULT' \
@@ -39,7 +39,7 @@ Description: Set the compile flags according to the Debian environment. We
--prefix $(root) --exec-prefix $(root) \
--enable-shared=no
$(MAKE) -C $(HTMLDIR) headers libtkhtml.a
-@@ -91,6 +91,8 @@
+@@ -99,6 +99,8 @@
tkimg : libtiff
@echo "Installing $@..."
cd $(TKIMGDIR); CFLAGS='-DPNG_NO_WRITE_gAMA' \
@@ -48,17 +48,6 @@ Description: Set the compile flags according to the Debian environment. We
./configure \
--prefix $(root) --exec-prefix $(root) \
--disable-shared \
---- a/Makefile
-+++ b/Makefile
-@@ -165,7 +165,7 @@
-
- saotk : FORCE
- @echo "Installing SAOTK..."
-- $(MAKE) -C $(SAOTKDIR) -j $(JOBS) install
-+ $(MAKE) -C $(SAOTKDIR) CXX="$(CXX)" CXXOPT='$(CXXOPT)' -j $(JOBS) install
-
- zvfs : FORCE
- @echo "Installing ZVFS..."
--- a/ds9/Makefile
+++ b/ds9/Makefile
@@ -9,7 +9,7 @@
@@ -70,50 +59,6 @@ Description: Set the compile flags according to the Debian environment. We
-DTK_LOCAL_MAIN_HOOK=SAOLocalMainHook -c $(MAIN).c -o $@
$(MAIN).c : $(MAINDIR)/$(MAIN).c
---- a/hcompress/Makefile
-+++ b/hcompress/Makefile
-@@ -1,7 +1,7 @@
- include ../make.include
-
- # no ./configure
--CFLAGS = $(CCOPT) -I.
-+CFLAGS += $(CCOPT) -I.
-
- SRC = hdecompress.c
-
---- a/plio/Makefile
-+++ b/plio/Makefile
-@@ -1,7 +1,7 @@
- include ../make.include
-
- # no ./configure
--CFLAGS = $(CCOPT) -I.
-+CFLAGS += $(CCOPT) -I.
-
- SRC = pliocomp.c
-
---- a/rice/Makefile
-+++ b/rice/Makefile
-@@ -1,7 +1,7 @@
- include ../make.include
-
- # no ./configure
--CFLAGS = $(CCOPT) -I.
-+CFLAGS += $(CCOPT) -I.
-
- SRC = ricecomp.c
-
---- a/saotk/Makefile
-+++ b/saotk/Makefile
-@@ -5,7 +5,7 @@
-
- #--------------------------defines
-
--CXXFLAGS = $(CXXOPT) -I../include -I$(X11INCLUDE)
-+CXXFLAGS += $(CXXOPT) -I../include -I$(X11INCLUDE)
-
- DIRS = widget frame colorbar panner magnifier vector list fitsy++ util
-
--- a/htmlwidget/makemake.tcl.in
+++ b/htmlwidget/makemake.tcl.in
@@ -91,7 +91,7 @@
diff --git a/debian/patches/ds9_support_blt.patch b/debian/patches/ds9_support_blt.patch
index 30c5577..acd3c25 100644
--- a/debian/patches/ds9_support_blt.patch
+++ b/debian/patches/ds9_support_blt.patch
@@ -61,7 +61,7 @@ Description: Allow the use of a standard BLT 2.X instead of tkblt
--- a/src/scale.tcl
+++ b/src/scale.tcl
-@@ -295,9 +295,9 @@
+@@ -293,9 +293,9 @@
]
$dscale(hist) legend configure -hide yes
diff --git a/debian/patches/ds9_use_external_libs.patch b/debian/patches/ds9_use_external_libs.patch
index bd7dff7..c13bc93 100644
--- a/debian/patches/ds9_use_external_libs.patch
+++ b/debian/patches/ds9_use_external_libs.patch
@@ -25,11 +25,11 @@ Description: Compile against external libraries of wcstools, funtools, ast,
$(ZDIR)/src \
$(ZDIR)/msgs \
$(ZDIR)/doc \
-@@ -23,41 +16,14 @@
+@@ -23,37 +16,11 @@
$(ZDIR)/template
LIBS = \
-- ../lib/libsaotk.a \
+- ../lib/$(SAOTKVER)/libsaotk1.0.a \
../lib/libtkhtml.a \
- ../lib/$(TKMPEGDIR)/libtkmpeg1.0.a \
- ../lib/$(TCLXMLVER)/libTclxml3.2.a \
@@ -46,15 +46,11 @@ Description: Compile against external libraries of wcstools, funtools, ast,
- ../lib/$(TKIMGVER)/libtkimg1.4.a \
- ../lib/libtiff.a \
- ../lib/libfuntools.a \
-+ ../lib/libtkmpeg1.0.a \
- ../lib/librice.a \
- ../lib/libhcomp.a \
- ../lib/libplio.a \
- ../lib/libast.a \
- ../lib/libast_err.a \
- ../lib/libast_pal.a \
- ../lib/libsaotk.a \
-- ../lib/libwcs.a \
++ ../lib/libtkmpeg1.0.a \
+ ../lib/$(SAOTKVER)/libsaotk1.0.a \
- ../lib/libzvfs.a \
- ../lib/libxpa.a \
- ../lib/$(TCLIISDIR)/libtcliis1.0.a \
@@ -70,7 +66,7 @@ Description: Compile against external libraries of wcstools, funtools, ast,
#--------------------------main
-@@ -85,11 +51,12 @@
+@@ -81,11 +48,12 @@
ds9Base : $(OBJS) $(LIBS)
$(RM) $@
@@ -79,9 +75,9 @@ Description: Compile against external libraries of wcstools, funtools, ast,
- -L$(X11LIB) -lX11 -lXext -lXft -lXrender -lXss \
- -lxml2 \
- -lz -lpthread
-+ $(CXX) $(OPTS) $(LDFLAGS) -o $@ ds9.o tkAppInit.o ../lib/libsaotk.a \
++ $(CXX) $(OPTS) $(LDFLAGS) -o $@ ds9.o tkAppInit.o \
+ -Wl,-Bdynamic -lstarlink_ast -lstarlink_ast_err \
-+ -lstdc++ -Wl,-Bstatic -L../lib -lsaotk -lhcomp -lrice -lplio \
++ -lstdc++ -Wl,-Bstatic -L../lib/$(SAOTKVER) -l$(SAOTKVER) -L../lib \
+ -ltcliis1.0 -ltkmpeg1.0 -ltkhtml -ltclcheckdns1.1 -Wl,-Bdynamic \
+ -lBLT -lwcstools -lfuntools -ltk -ltcl -lz \
+ -L/usr/X11R6/lib -lX11 -ldl -lpthread -lxml2 -lXrandr
@@ -231,7 +227,7 @@ Description: Compile against external libraries of wcstools, funtools, ast,
}
--- a/Makefile.unix
+++ b/Makefile.unix
-@@ -116,14 +116,10 @@
+@@ -124,13 +124,9 @@
--enable-symbols
$(MAKE) -C $(XPADIR) -j $(JOBS) install
@@ -239,20 +235,18 @@ Description: Compile against external libraries of wcstools, funtools, ast,
- tktableclean tkbltclean \
- tclxmlclean tkimgclean tkmpegclean tkhtmlclean \
- xpaclean tcliisclean tclcheckdnsclean signalclean funtoolsclean \
-- astclean wcssubsclean \
-- riceclean hcompressclean plioclean \
+- astclean \
- saotkclean zvfsclean ds9clean srcclean \
- filesclean dirsclean
+distclean : filesclean \
+ tkmpegclean tkhtmlclean tcliisclean tclcheckdnsclean \
-+ riceclean hcompressclean plioclean $(OPTDIRCLEAN) \
+ saotkclean ds9clean srcclean dirsclean
#--------------------------distribution
--- a/Makefile
+++ b/Makefile
-@@ -204,32 +204,6 @@
+@@ -181,32 +181,6 @@
dirsclean: FORCE
@for d in $(DIRS); do rm -rf $$d; done
@@ -276,7 +270,7 @@ Description: Compile against external libraries of wcstools, funtools, ast,
-
-tkimgclean: libtiffclean
- rm -fr $(TKIMGDIR)/Img/*
-- rm -fr $(LIB)/Img1.*
+- rm -fr lib/Img1.*
- $(MAKE) -C $(TKIMGDIR) distclean
-
-libtiffclean: FORCE
@@ -285,7 +279,7 @@ Description: Compile against external libraries of wcstools, funtools, ast,
tkmpegclean: FORCE
$(MAKE) -C $(TKMPEGDIR) distclean
-@@ -237,27 +211,12 @@
+@@ -214,30 +188,15 @@
# cd $(HTMLDIR); $(MAKE) distclean
rm -rf $(HTMLDIR)
@@ -307,13 +301,6 @@ Description: Compile against external libraries of wcstools, funtools, ast,
-astclean: FORCE
- $(MAKE) -C $(ASTDIR) distclean
-
--wcssubsclean: FORCE
-- $(MAKE) -C $(WCSSUBSDIR) distclean
--
- riceclean: FORCE
- $(MAKE) -C $(RICEDIR) distclean
-
-@@ -270,9 +229,6 @@
saotkclean : FORCE
$(MAKE) -C $(SAOTKDIR) distclean
@@ -453,3 +440,78 @@ Description: Compile against external libraries of wcstools, funtools, ast,
SHLIB_LD_LIBS='${LIBS} -lstdc++'
#--------------------------------------------------------------------
+--- a/saotk/Makefile.org
++++ b/saotk/Makefile.org
+@@ -7,7 +7,7 @@
+
+ CXXFLAGS = $(CXXOPT) -I../include -I$(X11INCLUDE)
+
+-DIRS = widget frame colorbar panner magnifier vector list fitsy++ util wcssubs
++DIRS = widget frame colorbar panner magnifier vector list fitsy++ util
+
+ OBJS = \
+ widget/*.o \
+@@ -18,8 +18,7 @@
+ vector/*.o \
+ list/*.o \
+ fitsy++/*.o \
+- util/*.o \
+- wcssubs/*.o
++ util/*.o
+
+ LIB = libsaotk.a
+
+@@ -62,9 +61,6 @@
+ util : FORCE
+ cd util; $(MAKE)
+
+-wcssubs : FORCE
+- cd wcssubs; $(MAKE)
+-
+ clean : FORCE
+ cd frame; $(MAKE) clean
+ cd colorbar; $(MAKE) clean
+@@ -75,7 +71,6 @@
+ cd list; $(MAKE) clean
+ cd fitsy++; $(MAKE) clean
+ cd util; $(MAKE) clean
+- cd wcssubs; $(MAKE) clean
+
+ distclean : FORCE
+ rm -f *.o *.a *.so
+@@ -88,7 +83,6 @@
+ cd list; $(MAKE) distclean
+ cd fitsy++; $(MAKE) distclean
+ cd util; $(MAKE) distclean
+- cd wcssubs; $(MAKE) distclean
+
+ parsers : FORCE
+ cd frame; $(MAKE) parsers
+--- a/saotk/configure.in
++++ b/saotk/configure.in
+@@ -266,25 +266,6 @@
+ util/util.C
+ vector/vector.C
+ vector/vector3d.C
+-wcssubs/cel.c
+-wcssubs/distort.c
+-wcssubs/dsspos.c
+-wcssubs/hget.c
+-wcssubs/hput.c
+-wcssubs/iget.c
+-wcssubs/lin.c
+-wcssubs/platepos.c
+-wcssubs/poly.c
+-wcssubs/proj.c
+-wcssubs/sph.c
+-wcssubs/tnxpos.c
+-wcssubs/wcs.c
+-wcssubs/wcscon.c
+-wcssubs/wcsinit.c
+-wcssubs/wcslib.c
+-wcssubs/wcstrig.c
+-wcssubs/worldpos.c
+-wcssubs/zpxpos.c
+ widget/truecolor16.C
+ widget/truecolor24.C
+ widget/truecolor8.C
diff --git a/debian/patches/ds9_use_filesystem.patch b/debian/patches/ds9_use_filesystem.patch
index 0af19b6..234f692 100644
--- a/debian/patches/ds9_use_filesystem.patch
+++ b/debian/patches/ds9_use_filesystem.patch
@@ -8,7 +8,7 @@ Description: Store all files in the usual FHS directories
ds9, which is used for testing.
--- a/ds9/Makefile.unix
+++ b/ds9/Makefile.unix
-@@ -35,13 +35,8 @@
+@@ -32,13 +32,8 @@
CXXFLAGS = $(CXXOPT) -I. -I../include -I$(X11INCLUDE)
diff --git a/debian/patches/saotk_add_ksearch.patch b/debian/patches/saotk_add_ksearch.patch
index 69eb0c1..4c12f7f 100644
--- a/debian/patches/saotk_add_ksearch.patch
+++ b/debian/patches/saotk_add_ksearch.patch
@@ -3,7 +3,7 @@ Description: Insert the "ksearchh" routine that was originated by Doub Mink
in wcssubs so that fitsImage.c will compile.
--- a/saotk/frame/fitsimage.C
+++ b/saotk/frame/fitsimage.C
-@@ -32,7 +32,97 @@
+@@ -29,7 +29,97 @@
extern "C" {
FitsHead* wcshead = NULL;
FitsHead* wcsprim = NULL;
diff --git a/debian/patches/saotk_avoid_compile_warnings.patch b/debian/patches/saotk_avoid_compile_warnings.patch
index b8171b5..bed449a 100644
--- a/debian/patches/saotk_avoid_compile_warnings.patch
+++ b/debian/patches/saotk_avoid_compile_warnings.patch
@@ -36,3 +36,234 @@ Description: Avoid compile time warnings in the saotk subsystem
// and now create astGrid
astGrid2dPtr = this;
+--- a/saotk/frame/fitsimage.C
++++ b/saotk/frame/fitsimage.C
+@@ -1170,7 +1170,7 @@
+ if (ast[0] && ast[ii]) {
+ AstFrameSet* dep = (AstFrameSet*)astCopy(ast[ii]);
+ astInvert(ast[0]);
+- astAddFrame(dep,2,astUnitMap(2,""),ast[0]);
++ astAddFrame(dep,2,astUnitMap(2,"%s",""),ast[0]);
+ astSetI(dep,"current",4);
+ astAnnul(ast[0]);
+ ast[0] = dep;
+@@ -3021,24 +3021,24 @@
+ if (ii>=0 && ast && ast[ii]) {
+ if (astIsASkyFrame(astGetFrame(ast[ii], AST__CURRENT))) {
+ setAstSkyFrame(ast[ii],sky);
+- for (int ii=0; ii<num; ii++) {
+- xin[ii] *= M_PI/180.;
+- yin[ii] *= M_PI/180.;
++ for (int ii2=0; ii2<num; ii2++) {
++ xin[ii2] *= M_PI/180.;
++ yin[ii2] *= M_PI/180.;
+ }
+ astTran2(ast[ii], num, xin, yin, 0, xout, yout);
+ if (astOK) {
+- for (int ii=0; ii<num; ii++)
+- if (checkAst(xout[ii],yout[ii]))
+- out[ii] = Vector(xout[ii],yout[ii]);
++ for (int ii2=0; ii2<num; ii2++)
++ if (checkAst(xout[ii2],yout[ii2]))
++ out[ii2] = Vector(xout[ii2],yout[ii2]);
+ return out;
+ }
+ }
+ else {
+ astTran2(ast[ii], num, xin, yin, 0, xout, yout);
+ if (astOK) {
+- for (int ii=0; ii<num; ii++)
+- if (checkAst(xout[ii],yout[ii]))
+- out[ii] = Vector(xout[ii],yout[ii]);
++ for (int ii2=0; ii2<num; ii2++)
++ if (checkAst(xout[ii2],yout[ii2]))
++ out[ii2] = Vector(xout[ii2],yout[ii2]);
+ return out;
+ }
+ }
+@@ -3253,7 +3253,7 @@
+
+ ostringstream str;
+ str << "Format(" << id << ")=" << format << ends;
+- astSet(aa, str.str().c_str());
++ astSet(aa, "%s", str.str().c_str());
+ }
+
+ void FitsImage::setAstSkyFrame(AstFrameSet* aa, Coord::SkyFrame sky)
+@@ -3324,7 +3324,7 @@
+ astClearStatus;
+
+ // new fitschan
+- AstFitsChan* chan = astFitsChan(NULL, NULL, "");
++ AstFitsChan* chan = astFitsChan(NULL, NULL, "%s", "");
+ if (!astOK || chan == AST__NULL)
+ return NULL;
+
+@@ -3386,7 +3386,7 @@
+ astClearStatus;
+
+ // new fitschan
+- AstFitsChan* chan = astFitsChan(NULL, NULL, "");
++ AstFitsChan* chan = astFitsChan(NULL, NULL, "%s", "");
+ if (!astOK || chan == AST__NULL)
+ return NULL;
+
+--- a/saotk/frame/grid25d.C
++++ b/saotk/frame/grid25d.C
+@@ -114,7 +114,7 @@
+ // and now create astGrid
+ astGrid25dPtr = this;
+
+- AstPlot* plot = astPlot(frameSet, gbox, pbox, option_);
++ AstPlot* plot = astPlot(frameSet, gbox, pbox, "%s", option_);
+ astGrid(plot);
+
+ astEnd; // now, clean up memory
+@@ -128,14 +128,14 @@
+ mx.matrix(0,1),mx.matrix(1,1)};
+ double tt[] = {mx.matrix(2,0),mx.matrix(2,1)};
+
+- AstMatrixMap* mm = astMatrixMap(2, 2, 0, ss, "");
+- AstShiftMap* sm = astShiftMap(2, tt, "");
+- AstCmpMap* cmap = astCmpMap(mm, sm, 1, "");
++ AstMatrixMap* mm = astMatrixMap(2, 2, 0, ss, "%s", "");
++ AstShiftMap* sm = astShiftMap(2, tt, "%s", "");
++ AstCmpMap* cmap = astCmpMap(mm, sm, 1, "%s", "");
+
+ AstFrame* in = astFrame(2,"Domain=REF");
+- AstFrame* out = astFrame(2,str);
++ AstFrame* out = astFrame(2,"%s", str);
+
+- AstFrameSet* frameSet = astFrameSet(in,"");
++ AstFrameSet* frameSet = astFrameSet(in,"%s", "");
+ astAddFrame(frameSet,AST__CURRENT,cmap,out);
+
+ return frameSet;
+--- a/saotk/frame/grid2d.C
++++ b/saotk/frame/grid2d.C
+@@ -46,7 +46,7 @@
+ AstFrameSet* frameSet = NULL;
+ AstPlot* plot = NULL;
+
+- if (!(frameSet = astFrameSet(astFrame(2,"Domain=WIDGET"),""))) {
++ if (!(frameSet = astFrameSet(astFrame(2,"Domain=WIDGET"),"%s",""))) {
+ astEnd;
+ return 0;
+ }
+@@ -78,7 +78,7 @@
+ // this will link frame 2 of frameset to frame 3 wcs with unitMap
+ // set the current of frameset to last
+ astInvert(wcsfs);
+- astAddFrame(frameSet,2,astUnitMap(2,""),wcsfs);
++ astAddFrame(frameSet,2,astUnitMap(2,"%s",""),wcsfs);
+ astSetI(frameSet,"current",astGetI(frameSet,"nframe"));
+ }
+ }
+@@ -124,7 +124,7 @@
+ // and now create astGrid
+ astGrid2dPtr = this;
+
+- plot = astPlot(frameSet, gbox, pbox, option_);
++ plot = astPlot(frameSet, gbox, pbox, "%s", option_);
+ astGrid(plot);
+
+ astEnd; // now, clean up memory
+@@ -141,18 +141,18 @@
+ double tt[] = {mx.matrix(2,0),mx.matrix(2,1)};
+
+ AstMatrixMap* mm;
+- if (!(mm= astMatrixMap(2, 2, 0, ss, "")))
++ if (!(mm= astMatrixMap(2, 2, 0, ss, "%s", "")))
+ return 0;
+
+ AstShiftMap* sm;
+- if (!(sm = astShiftMap(2, tt, "")))
++ if (!(sm = astShiftMap(2, tt, "%s", "")))
+ return 0;
+
+ AstCmpMap* cmp;
+- if (!(cmp = astCmpMap(mm, sm, 1, "")))
++ if (!(cmp = astCmpMap(mm, sm, 1, "%s", "")))
+ return 0;
+
+- astAddFrame(frameSet, AST__CURRENT, cmp, astFrame(2, str));
++ astAddFrame(frameSet, AST__CURRENT, cmp, astFrame(2, "%s", str));
+
+ return 1;
+ }
+--- a/saotk/frame/grid3d.C
++++ b/saotk/frame/grid3d.C
+@@ -118,16 +118,16 @@
+ astSetI(wcs, "Base", idata);
+
+ // Create two 1D Frames and a 1D Mapping describing the third axis
+- AstFrame* zbase = astFrame(1,"");
+- AstFrame* zcurr = astFrame(1,"");
++ AstFrame* zbase = astFrame(1,"%s", "");
++ AstFrame* zcurr = astFrame(1,"%s", "");
+ AstMapping* zmap;
+ if (fits->hasWCSx(system_,2)) {
+ astIntraReg("foo",1,1,bar,0,"testing","me","you");
+- if (!(zmap = (AstMapping*)astIntraMap("foo",1,1,"")))
++ if (!(zmap = (AstMapping*)astIntraMap("foo",1,1,"%s", "")))
+ return 0;
+ }
+ else
+- zmap = (AstMapping*)astUnitMap(1,"");
++ zmap = (AstMapping*)astUnitMap(1,"%s", "");
+
+ // Use astGetFrame and astGetMapping to get the base and current
+ // Frames from the 2D FrameSet, and the base->current Mapping.
+@@ -136,14 +136,14 @@
+ AstMapping* wcsmap = (AstMapping*)astGetMapping(wcs,AST__BASE,AST__CURRENT);
+ // Combine the 2D and 1D base Frames into a 3D CmpFrame
+ // Likewise, combine the 2D and 1D current Frames into a 3D CmpFrame
+- AstCmpFrame* cmpwcsbase = astCmpFrame(wcsbase,zbase,"");
+- AstCmpFrame* cmpwcscurr = astCmpFrame(wcscurr,zcurr,"");
++ AstCmpFrame* cmpwcsbase = astCmpFrame(wcsbase,zbase,"%s", "");
++ AstCmpFrame* cmpwcscurr = astCmpFrame(wcscurr,zcurr,"%s", "");
+
+ // Combine the 2D and 1D Mappings into a 3D CmpMap
+- AstCmpMap* cmpwcsmap = astCmpMap(wcsmap,zmap,0,"");
++ AstCmpMap* cmpwcsmap = astCmpMap(wcsmap,zmap,0,"%s", "");
+
+ // Construct the 3D FrameSet from the new 3D Frames and Mapping
+- frameSet = astFrameSet(cmpwcsbase,"");
++ frameSet = astFrameSet(cmpwcsbase,"%s", "");
+ astAddFrame(frameSet, AST__CURRENT, cmpwcsmap, cmpwcscurr);
+ }
+ }
+@@ -186,26 +186,26 @@
+ double ss[] = {mx.matrix(0,0),mx.matrix(1,0),
+ mx.matrix(0,1),mx.matrix(1,1)};
+ AstMatrixMap* mm;
+- if (!(mm= astMatrixMap(2,2,0,ss,"")))
++ if (!(mm= astMatrixMap(2,2,0,ss,"%s", "")))
+ return NULL;
+
+ double tt[] = {mx.matrix(2,0),mx.matrix(2,1)};
+ AstShiftMap* sm;
+- if (!(sm = astShiftMap(2,tt,"")))
++ if (!(sm = astShiftMap(2,tt,"%s", "")))
+ return NULL;
+
+ AstCmpMap* mapxy;
+- if (!(mapxy = astCmpMap(mm,sm,1,"")))
++ if (!(mapxy = astCmpMap(mm,sm,1,"%s", "")))
+ return NULL;
+
+ AstFrame* in = astFrame(3,"Domain=REF");
+- AstFrame* out = astFrame(3,str);
++ AstFrame* out = astFrame(3,"%s", str);
+
+ double uu =.5;
+- AstShiftMap* mapz = astShiftMap(1,&uu,"");
+- AstCmpMap* cmap = astCmpMap(mapxy,mapz,0,"");
++ AstShiftMap* mapz = astShiftMap(1,&uu,"%s", "");
++ AstCmpMap* cmap = astCmpMap(mapxy,mapz,0,"%s", "");
+
+- AstFrameSet* frameSet = astFrameSet(in,"");
++ AstFrameSet* frameSet = astFrameSet(in,"%s", "");
+ astAddFrame(frameSet,AST__CURRENT,cmap,out);
+
+ return frameSet;
diff --git a/debian/rules b/debian/rules
index 06a41c7..1a34cb2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,7 +2,7 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-BUILDPARTS:=dirs tclcheckdns tkmpeg tkhtml tcliis rice hcompress plio xmlrpc saotk ds9
+BUILDPARTS:=dirs tclcheckdns tkmpeg tkhtml tcliis xmlrpc saotk ds9
get-orig-source:
sh ./debian/repack.sh
@@ -18,6 +18,7 @@ override_dh_autoreconf:
(cd tkmpeg1.0; autoreconf -i -f)
(cd tcliis1.0; autoreconf -i -f)
(cd tclcheckdns1.1; autoreconf -i -f)
+ (cd saotk; autoreconf -i -f)
override_dh_auto_build: make.include
dh_auto_build -- $(BUILDPARTS)
diff --git a/debian/watch b/debian/watch
index 9f9b37a..74b5881 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,6 +1,6 @@
version=3
-#opts=dversionmangle=s/\+repack//,repacksuffix=+dfsg \
+#opts=dversionmangle=s/\+repack//,repacksuffix=+repack \
# http://ds9.si.edu/site/Download.html \
-opts=dversionmangle=s/\+repack//,repacksuffix=+dfsg,uversionmangle=s/(.+)([ab].+)/$1~$2/ \
+opts=dversionmangle=s/\+repack//,repacksuffix=+repack,uversionmangle=s/(.+)([ab].+)/$1~$2/ \
http://ds9.si.edu/site/Beta.html \
http://ds9.si.edu/.+/source/ds9\.(.*)\.(?: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/saods9.git
More information about the debian-science-commits
mailing list