[SCM] image display tool for astronomy branch, master, updated. d3ff81c590b4c1de08dfe5a255d6efb6cf4f5db3
Ole Streicher
debian at liska.ath.cx
Wed Feb 29 13:00:46 UTC 2012
The following commit has been merged in the master branch:
commit d3ff81c590b4c1de08dfe5a255d6efb6cf4f5db3
Author: Ole Streicher <debian at liska.ath.cx>
Date: Wed Feb 29 13:59:06 2012 +0100
Remove patches for ast, als and htmlwidget: they are separate packages
diff --git a/debian/patches/ast.patch b/debian/patches/ast.patch
deleted file mode 100644
index 0b60aca..0000000
--- a/debian/patches/ast.patch
+++ /dev/null
@@ -1,193 +0,0 @@
---- a/ast-5.3-1/makeh
-+++ b/ast-5.3-1/makeh
-@@ -270,6 +270,9 @@ line: while ( <INCLUDE> ) {
- s/__LINE__/___LINE__/g;
- s/__FILE__/___FILE__/g;
-
-+# protect backslashes at the end of a line
-+ s/\\$/\\ \\/;
-+
- # Write the modified include file.
- print( TEMP );
- }
---- a/ast-5.3-1/Makefile.am
-+++ b/ast-5.3-1/Makefile.am
-@@ -100,6 +100,7 @@ GRP_C_ROUTINES = \
- skyaxis.c \
- skyframe.c \
- slamap.c \
-+ sla.c \
- specfluxframe.c \
- specframe.c \
- specmap.c \
---- a/ast-5.3-1/fitschan.c
-+++ b/ast-5.3-1/fitschan.c
-@@ -1090,6 +1090,7 @@ f - AST_TESTFITS: Test if a keyword has a defined value in a FitsChan
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
-+#include <math.h>
-
- /* Type Definitions */
- /* ================ */
---- a/ast-5.3-1/plot.c
-+++ b/ast-5.3-1/plot.c
-@@ -13667,6 +13667,7 @@ static int GetLabelUnits( AstPlot *this, int axis, int *status ) {
- return ret;
- }
-
-+#if 0
- static void GFlush( AstPlot *this, const char *method,
- const char *class, int *status ) {
- /*
-@@ -13743,6 +13744,7 @@ static void GFlush( AstPlot *this, const char *method,
- }
-
- }
-+#endif
-
- static void GLine( AstPlot *this, int n, const float *x,
- const float *y, const char *method,
---- a/ast-5.3-1/slamap.c
-+++ b/ast-5.3-1/slamap.c
-@@ -199,6 +199,7 @@ f - AST_SLAADD: Add a celestial coordinate conversion to an SlaMap
- #include <stddef.h>
- #include <stdio.h>
- #include <string.h>
-+#include <math.h>
-
- /* Module Variables. */
- /* ================= */
---- a/ast-5.3-1/sphmap.c
-+++ b/ast-5.3-1/sphmap.c
-@@ -114,6 +114,7 @@ f The SphMap class does not define any new routines beyond those
- #include <stddef.h>
- #include <stdio.h>
- #include <string.h>
-+#include <math.h>
-
- /* Module Variables. */
- /* ================= */
---- /dev/null
-+++ a/ast-5.3-1/slalib.h
-@@ -0,0 +1,120 @@
-+// This is a generated file; see ./debian/README.sla for information.
-+void slaAddet ( double rm, double dm, double eq, double *rc, double *dc ) ;
-+void slaAmpqk ( double ra, double da, double amprms[21],
-+ double *rm, double *dm ) ;
-+void slaCaldj ( int iy, int im, int id, double *djm, int *j ) ;
-+void slaDaf2r ( int ideg, int iamin, double asec, double *rad, int *j ) ;
-+void slaDav2m ( double axvec[3], double rmat[3][3] ) ;
-+double slaDbear ( double a1, double b1, double a2, double b2 ) ;
-+void slaDcc2s ( double v[3], double *a, double *b ) ;
-+void slaDcs2c ( double a, double b, double v[3] ) ;
-+void slaDd2tf ( int ndp, double days, char *sign, int ihmsf[4] ) ;
-+void slaDimxv ( double dm[3][3], double va[3], double vb[3] ) ;
-+void slaDjcal ( int ndp, double djm, int iymdf[ 4 ], int *j ) ;
-+void slaDjcl ( double djm, int *iy, int *im, int *id, double *fd, int *j ) ;
-+void slaDmat ( int n, double *a, double *y, double *d, int *jf, int *iw ) ;
-+void slaDmxm ( double a[3][3], double b[3][3], double c[3][3] ) ;
-+void slaDmxv ( double dm[3][3], double va[3], double vb[3] ) ;
-+double slaDrange ( double angle ) ;
-+double slaDranrm ( double angle ) ;
-+double slaDsep ( double a1, double b1, double a2, double b2 ) ;
-+void slaDtf2d ( int ihour, int imin, double sec, double *days, int *j ) ;
-+void slaDtf2r ( int ihour, int imin, double sec, double *rad, int *j ) ;
-+double slaDvdv( double va[3], double vb[3] ) ;
-+void slaDvn ( double v[3], double uv[3], double *vm ) ;
-+void slaDvxv ( double va[3], double vb[3], double vc[3] ) ;
-+void slaEcmat ( double date, double rmat[3][3] ) ;
-+double slaEpb ( double date ) ;
-+double slaEpb2d ( double epb ) ;
-+double slaEpj ( double date ) ;
-+double slaEpj2d ( double epj ) ;
-+double slaEqeqx ( double date ) ;
-+void slaEqgal ( double dr, double dd, double *dl, double *db ) ;
-+void slaEvp ( double date, double deqx, double dvb[3], double dpb[3],
-+ double dvh[3], double dph[3] ) ;
-+void slaFk45z ( double r1950, double d1950, double bepoch,
-+ double *r2000, double *d2000 ) ;
-+void slaFk54z ( double r2000, double d2000, double bepoch,
-+ double *r1950, double *d1950,
-+ double *dr1950, double *dd1950 ) ;
-+void slaFk5hz ( double r5, double d5, double jepoch,
-+ double *rh, double *dh ) ;
-+void slaGaleq ( double dl, double db, double *dr, double *dd ) ;
-+void slaGalsup ( double dl, double db, double *dsl, double *dsb ) ;
-+void slaGeoc ( double p, double h, double *r, double *z ) ;
-+double slaGmst ( double ut1 ) ;
-+void slaHfk5z ( double rh, double dh, double jepoch,
-+ double *r5, double *d5,
-+ double *dr5, double *dd5 ) ;
-+void slaMappa ( double eq, double date, double amprms[21] ) ;
-+void slaMapqkz ( double rm, double dm, double amprms[21],
-+ double *ra, double *da ) ;
-+void slaPrebn ( double bep0, double bep1, double rmatp[3][3] ) ;
-+void slaPrec ( double ep0, double ep1, double rmatp[3][3] ) ;
-+float slaRverot ( float phi, float ra, float dec, float st ) ;
-+float slaRvgalc ( float ra, float dec ) ;
-+float slaRvlg ( float ra, float dec ) ;
-+float slaRvlsrd ( float ra, float dec ) ;
-+float slaRvlsrk ( float ra, float dec ) ;
-+void slaSubet ( double rc, double dc, double eq, double *rm, double *dm ) ;
-+void slaSupgal ( double dsl, double dsb, double *dl, double *db ) ;
-+// This is a generated file; see ./debian/README.sla for information.
-+void slaAddet ( double rm, double dm, double eq, double *rc, double *dc ) ;
-+void slaAmpqk ( double ra, double da, double amprms[21],
-+ double *rm, double *dm ) ;
-+void slaCaldj ( int iy, int im, int id, double *djm, int *j ) ;
-+void slaDaf2r ( int ideg, int iamin, double asec, double *rad, int *j ) ;
-+void slaDav2m ( double axvec[3], double rmat[3][3] ) ;
-+double slaDbear ( double a1, double b1, double a2, double b2 ) ;
-+void slaDcc2s ( double v[3], double *a, double *b ) ;
-+void slaDcs2c ( double a, double b, double v[3] ) ;
-+void slaDd2tf ( int ndp, double days, char *sign, int ihmsf[4] ) ;
-+void slaDimxv ( double dm[3][3], double va[3], double vb[3] ) ;
-+void slaDjcal ( int ndp, double djm, int iymdf[ 4 ], int *j ) ;
-+void slaDjcl ( double djm, int *iy, int *im, int *id, double *fd, int *j ) ;
-+void slaDmat ( int n, double *a, double *y, double *d, int *jf, int *iw ) ;
-+void slaDmxm ( double a[3][3], double b[3][3], double c[3][3] ) ;
-+void slaDmxv ( double dm[3][3], double va[3], double vb[3] ) ;
-+double slaDrange ( double angle ) ;
-+double slaDranrm ( double angle ) ;
-+double slaDsep ( double a1, double b1, double a2, double b2 ) ;
-+void slaDtf2d ( int ihour, int imin, double sec, double *days, int *j ) ;
-+void slaDtf2r ( int ihour, int imin, double sec, double *rad, int *j ) ;
-+double slaDvdv( double va[3], double vb[3] ) ;
-+void slaDvn ( double v[3], double uv[3], double *vm ) ;
-+void slaDvxv ( double va[3], double vb[3], double vc[3] ) ;
-+void slaEcmat ( double date, double rmat[3][3] ) ;
-+double slaEpb ( double date ) ;
-+double slaEpb2d ( double epb ) ;
-+double slaEpj ( double date ) ;
-+double slaEpj2d ( double epj ) ;
-+double slaEqeqx ( double date ) ;
-+void slaEqgal ( double dr, double dd, double *dl, double *db ) ;
-+void slaEvp ( double date, double deqx, double dvb[3], double dpb[3],
-+ double dvh[3], double dph[3] ) ;
-+void slaFk45z ( double r1950, double d1950, double bepoch,
-+ double *r2000, double *d2000 ) ;
-+void slaFk54z ( double r2000, double d2000, double bepoch,
-+ double *r1950, double *d1950,
-+ double *dr1950, double *dd1950 ) ;
-+void slaFk5hz ( double r5, double d5, double jepoch,
-+ double *rh, double *dh ) ;
-+void slaGaleq ( double dl, double db, double *dr, double *dd ) ;
-+void slaGalsup ( double dl, double db, double *dsl, double *dsb ) ;
-+void slaGeoc ( double p, double h, double *r, double *z ) ;
-+double slaGmst ( double ut1 ) ;
-+void slaHfk5z ( double rh, double dh, double jepoch,
-+ double *r5, double *d5,
-+ double *dr5, double *dd5 ) ;
-+void slaMappa ( double eq, double date, double amprms[21] ) ;
-+void slaMapqkz ( double rm, double dm, double amprms[21],
-+ double *ra, double *da ) ;
-+void slaPrebn ( double bep0, double bep1, double rmatp[3][3] ) ;
-+void slaPrec ( double ep0, double ep1, double rmatp[3][3] ) ;
-+float slaRverot ( float phi, float ra, float dec, float st ) ;
-+float slaRvgalc ( float ra, float dec ) ;
-+float slaRvlg ( float ra, float dec ) ;
-+float slaRvlsrd ( float ra, float dec ) ;
-+float slaRvlsrk ( float ra, float dec ) ;
-+void slaSubet ( double rc, double dc, double eq, double *rm, double *dm ) ;
-+void slaSupgal ( double dsl, double dsb, double *dl, double *db ) ;
diff --git a/debian/patches/htmlwidget.patch b/debian/patches/htmlwidget.patch
deleted file mode 100644
index 382b926..0000000
--- a/debian/patches/htmlwidget.patch
+++ /dev/null
@@ -1,106 +0,0 @@
-Author: Ole Streicher <debian at liska.ath.cx>
-Description: Make htmlwidget compileable.
---- a/Makefile
-+++ b/Makefile
-@@ -36,6 +36,9 @@ ifeq ($(OS),unix)
- BLTFLAGS = $(XFLAGS)
- TKIMGFLAGS = $(XFLAGS)
- XPAFLAGS = $(XFLAGS)
-+ PREHTMLFLAGS = config_BUILD_TCLSH=tclsh \
-+ config_TARGET_TK_SCRIPT_DIR=$(root)/share/tcltk/tk8.5 \
-+ config_TARGET_TCL_INC=/usr/include/tcl
-
- SIGNAL= signal
- SIGNALCLEAN= signalclean
-
---- a/htmlwidget/makemake.tcl.in
-+++ b/htmlwidget/makemake.tcl.in
-@@ -109,18 +109,18 @@ proc MakeProg {name obj {libs {tk}}} {
- set n "${PFX}${name}$TEXE"
- switch $libs {
- tcl {
-- set link "@TARGET_CC@ @TARGET_CFLAGS@ -I. @TARGET_TCL_INC@"
-+ set link "@TARGET_CC@ @TARGET_CFLAGS@ -I. -I at TARGET_TCL_INC@"
- append link " @TARGET_X_INC@"
- set lib "@TARGET_TCL_LIBS@ @TARGET_LIBS@"
- }
- tk {
-- set link "@TARGET_CC@ @TARGET_CFLAGS@ -I. @TARGET_TCL_INC@"
-+ set link "@TARGET_CC@ @TARGET_CFLAGS@ -I. -I at TARGET_TCL_INC@"
- append link " @TARGET_X_INC@"
- append link " @TARGET_TK_INC@"
- set lib "@TARGET_TK_LIBS@ @TARGET_X_LIBS@ @TARGET_TCL_LIBS@ @TARGET_LIBS@"
- }
- blt {
-- set link "@TARGET_CC@ @TARGET_CFLAGS@ -I. @TARGET_TCL_INC@"
-+ set link "@TARGET_CC@ @TARGET_CFLAGS@ -I. -I at TARGET_TCL_INC@"
- append link " @TARGET_X_INC@"
- append link " @TARGET_TK_INC@ @TARGET_BLT_INC@"
- set lib "@TARGET_BLT_LIBS@ @TARGET_TK_LIBS@ @TARGET_TCL_LIBS@"
-@@ -148,7 +148,7 @@ proc MakeProg {name obj {libs {tk}}} {
- proc MakeShObj {name src {dep {}}} {
- if {"@ENABLE_SHLIB@"!=1} return
- set n sh$name
-- set cc "@TARGET_CC@ @TARGET_SHLIB_CFLAGS@ -I. @TARGET_TCL_INC@"
-+ set cc "@TARGET_CC@ @TARGET_SHLIB_CFLAGS@ -I. -I at TARGET_TCL_INC@"
- append cc " @TARGET_X_INC@"
- append cc " @TARGET_TK_INC@ @TARGET_BLT_INC@"
- puts "$n: $src $dep"
-@@ -196,7 +196,7 @@ proc MakeShLib {name obj {libs tk}} {
- #
- proc MakeObj {name src {dep {}}} {
- set n $name
-- set cc "@TARGET_CC@ @TARGET_CFLAGS@ -I. @TARGET_TCL_INC@"
-+ set cc "@TARGET_CC@ @TARGET_CFLAGS@ -I. -I at TARGET_TCL_INC@"
- append cc " @TARGET_X_INC@"
- append cc " @TARGET_TK_INC@ @TARGET_BLT_INC@"
- puts "$n: $src $dep"
---- a/htmlwidget/tools/mktclapp.c
-+++ b/htmlwidget/tools/mktclapp.c
-@@ -1261,9 +1261,6 @@ char zTail[] =
- "** Define the ET_HAVE_INSERTPROC macro if and only if we are dealing\n"
- "** with Tcl8.0.3 or later.\n"
- "*/\n"
--"#if TCL_MAJOR_VERSION==8 && (TCL_MINOR_VERSION>0 || TCL_RELEASE_SERIAL>=3)\n"
--"# define ET_HAVE_INSERTPROC\n"
--"#endif\n"
- "\n"
- "/*\n"
- "** Don't allow Win32 applications to read from stdin. Nor do\n"
---- saods9-4.0b7.orig/htmlwidget/src/htmlindex.c
-+++ saods9-4.0b7/htmlwidget/src/htmlindex.c
-@@ -24,6 +24,7 @@
- ** http://www.hwaci.com/drh/
- */
- #include <ctype.h>
-+#include <string.h>
- #include <tk.h>
- #include "htmlindex.h"
-
---- saods9-4.0b7.orig/htmlwidget/src/htmldraw.c
-+++ saods9-4.0b7/htmlwidget/src/htmldraw.c
-@@ -404,14 +404,12 @@
- }else{
- /* We are dealing with a single HtmlElement which contains something
- ** other than plain text. */
-- int top, btm, cntr;
- int cnt, w;
- char zBuf[30];
- switch( src->base.type ){
- case Html_LI:
- x = src->li.x;
- y = src->li.y;
-- cntr = (top+btm)/2;
- switch( src->li.type ){
- case LI_TYPE_Enum_1:
- sprintf(zBuf,"%d.",src->li.cnt);
---- saods9-4.0b7.orig/htmlwidget/src/htmlcmd.c
-+++ saods9-4.0b7/htmlwidget/src/htmlcmd.c
-@@ -25,6 +25,7 @@
- */
- #include <tk.h>
- #include <stdlib.h>
-+#include <string.h>
- #include "htmlcmd.h"
-
- /*
diff --git a/debian/patches/series b/debian/patches/series
index cc43460..584fbef 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,7 +1,4 @@
-ast.patch
checkdns.patch
-htmlwidget.patch
iis.patch
-sla.patch
saotk.patch
main-ds9.patch
diff --git a/debian/patches/sla.patch b/debian/patches/sla.patch
deleted file mode 100644
index e819068..0000000
--- a/debian/patches/sla.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- a/sla/Makefile
-+++ b/sla/Makefile
-@@ -1,3 +1,20 @@
-+# ./sla/Makefile
-+# A work of Justin Pryzby during the year of 2005.
-+# Hereby placed into the public domain.
-+SRC=$(wildcard *.f)
-+OBJ=$(SRC:.f=.o)
-+STLIB=libsla.a
-+LIBDIR=../lib/
-+FCFLAGS=$(FLAGS)
-+FC=gfortran
-+
-+install: $(STLIB)
-+ mkdir -p $(LIBDIR);
-+ cp $^ $(LIBDIR);
-+
-+$(STLIB): $(OBJ)
-+ ar q $@ $^;
-+ ranlib $@
- include ../make.include
-
- CFLAGS = $(CCOPT) -I.
--
image display tool for astronomy
More information about the debian-science-commits
mailing list