[SCM] image display tool for astronomy branch, master, updated. cf612aa82c120472364d40f039d108868e4469aa

Ole Streicher debian at liska.ath.cx
Thu Apr 5 07:40:05 UTC 2012


The following commit has been merged in the master branch:
commit cf612aa82c120472364d40f039d108868e4469aa
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Thu Apr 5 09:39:16 2012 +0200

    Cleanup and split the patches, add patch descriptions

diff --git a/debian/patches/add_ksearch.patch b/debian/patches/add_ksearch.patch
new file mode 100644
index 0000000..a90edb5
--- /dev/null
+++ b/debian/patches/add_ksearch.patch
@@ -0,0 +1,108 @@
+Author: Sergio Pascual <sergiopr at fedoraproject.org>
+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
+@@ -23,10 +23,101 @@
+ 
+ // wcs coordinate system strings (for use with wcssubs)
+ 
++
+ // this is kluge to speed up doug minks wcssubs 'ksearch' routine
+ extern "C" {
+   FitsHead* wcshead = NULL;
+-  char* ksearchh(char*, char*);
++  char* ksearchh(char* hstring, char* keyword)
++  {
++/* Find entry for keyword keyword in FITS header string hstring.
++   (the keyword may have a maximum of eight letters)
++   NULL is returned if the keyword is not found */
++
++/* char *hstring; character string containing fits-style header
++               information in the format <keyword>= <value> {/ <comment>}
++               the default is that each entry is 80 characters long;
++               however, lines may be of arbitrary length terminated by
++               nulls, carriage returns or linefeeds, if packed is true.  */
++/*char *keyword; character string containing the name of the variable
++               to be returned.  ksearch searches for a line beginning
++               with this string.  The string may be a character
++               literal or a character variable terminated by a null
++               or '$'.  it is truncated to 8 characters. */
++    char *loc, *headnext, *headlast, *pval, *lc, *line;
++    int icol, nextchar, lkey, nleft, lhead, lmax;
++
++#ifdef USE_SAOLIB
++       int iel=1, ip=1, nel, np, ier;
++       char *get_fits_head_str();
++
++       if( !use_saolib ){
++#endif
++
++    pval = 0;
++static int lhead0 = 0;
++/* Find current length of header string */
++    if (lhead0)
++       lmax = lhead0;
++    else
++       lmax = 256000;
++    for (lhead = 0; lhead < lmax; lhead++) {
++       if (hstring[lhead] == (char) 0)
++           break;
++       }
++
++/* Search header string for variable name */
++    headlast = hstring + lhead;
++    headnext = hstring;
++    pval = NULL;
++    while (headnext < headlast) {
++       nleft = headlast - headnext;
++       loc = strncsrch (headnext, keyword, nleft);
++
++       /* Exit if keyword is not found */
++       if (loc == NULL) {
++           break;
++           }
++
++       icol = (loc - hstring) % 80;
++       lkey = strlen (keyword);
++       nextchar = (int) *(loc + lkey);
++
++       /* If this is not in the first 8 characters of a line, keep searching */
++       if (icol > 7)
++           headnext = loc + 1;
++
++       /* If parameter name in header is longer, keep searching */
++       else if (nextchar != 61 && nextchar > 32 && nextchar < 127)
++           headnext = loc + 1;
++
++       /* If preceeding characters in line are not blanks, keep searching */
++       else {
++           line = loc - icol;
++           for (lc = line; lc < loc; lc++) {
++               if (*lc != ' ')
++                   headnext = loc + 1;
++               }
++
++       /* Return pointer to start of line if match */
++           if (loc >= headnext) {
++               pval = line;
++               break;
++               }
++           }
++       }
++/* Return pointer to calling program */
++       return (pval);
++
++#ifdef USE_SAOLIB
++       }
++       else {
++           if (get_fits_head_str(keyword,iel,ip,&nel,&np,&ier,hstring) != NULL)
++               return(hstring);
++           else
++               return(NULL);
++           }
++#endif
++  }
+ 
+   char* findit(char* cards, char* key)
+   {
diff --git a/debian/patches/add_missing_grf.patch b/debian/patches/add_missing_grf.patch
new file mode 100644
index 0000000..da29296
--- /dev/null
+++ b/debian/patches/add_missing_grf.patch
@@ -0,0 +1,17 @@
+Author: Ole Streicher <debian at liska.ath.cx>
+Description: The new AST library defines a few more routines for which we 
+ just need to create dummies.
+--- a/saotk/util/grf.C
++++ b/saotk/util/grf.C
+@@ -534,3 +534,11 @@ int astGCap(int cap, int value)
+ {
+   return astGridPtr->gCap(cap,value);
+ }
++
++int astGBBuf( void ){
++   return 0;
++}
++
++int astGEBuf( void ){
++   return 0;
++}
diff --git a/debian/patches/add_psscale.patch b/debian/patches/add_psscale.patch
new file mode 100644
index 0000000..c244860
--- /dev/null
+++ b/debian/patches/add_psscale.patch
@@ -0,0 +1,16 @@
+Author: Ole Streicher <debian at liska.ath.cx>
+Description: The original code from ds9 uses a patched postscript code to allow
+ scaling. Since we use standard Tk, we cannor support this (postscript scaling
+ is silently ignored), but we need to support the global variable "psScale" 
+ which Doug Mink hacked into to get the scaling.
+--- a/saotk/widget/widget.C
++++ b/saotk/widget/widget.C
+@@ -5,6 +5,8 @@
+ #include "widget.h"
+ #include "util.h"
+ 
++float psScale = 1.0;
++
+ // Tk Canvas Widget Functions Declaration
+ 
+ int WidgetConfigProc(Tcl_Interp* interp, Tk_Canvas canvas, Tk_Item* item, 
diff --git a/debian/patches/avoid_compile_warnings_saotk.patch b/debian/patches/avoid_compile_warnings_saotk.patch
new file mode 100644
index 0000000..b9ea584
--- /dev/null
+++ b/debian/patches/avoid_compile_warnings_saotk.patch
@@ -0,0 +1,66 @@
+Author: Justin Pryzby <justinpryzby at users.sf.net>
+Description: Avoid compile time warnings in the saotk subsystem
+--- a/saotk/fitsy++/outchannel.C
++++ b/saotk/fitsy++/outchannel.C
+@@ -7,7 +7,7 @@
+ OutFitsChannel::OutFitsChannel(Tcl_Interp* interp, const char* ch)
+ {
+   int tclMode;
+-  if (ch_ = Tcl_GetChannel(interp, (char*)ch, &tclMode))
++  if ((ch_ = Tcl_GetChannel(interp, (char*)ch, &tclMode)))
+     valid_ = 1;
+ }
+ 
+--- a/saotk/fitsy++/outfile.C
++++ b/saotk/fitsy++/outfile.C
+@@ -6,7 +6,7 @@
+ 
+ OutFitsFile::OutFitsFile(const char* fn)
+ {
+-  if (fd_ = fopen(fn, "wb"))
++  if ((fd_ = fopen(fn, "wb")))
+     valid_ = 1;
+ }
+ 
+@@ -23,7 +23,7 @@ int OutFitsFile::write(char* d, int s)
+ 
+ OutFitsFileGZ::OutFitsFileGZ(const char* fn)
+ {
+-  if (fd_ = gzopen(fn, "wb"))
++  if ((fd_ = gzopen(fn, "wb")))
+     valid_ = 1;
+ }
+ 
+--- a/saotk/fitsy++/strm.C
++++ b/saotk/fitsy++/strm.C
+@@ -346,7 +346,7 @@ template<class T> void FitsFitsStream<T>::processExact()
+   if (!(this->pExt_ || (this->pIndex_>0))) {
+ 
+     // we are only looking for a primary image
+-    if (this->head_ = this->headRead()) {
++    if ((this->head_ = this->headRead())) {
+       this->found();
+       return;
+     }
+@@ -402,7 +402,7 @@ template<class T> void FitsFitsStream<T>::processExact()
+ 	this->head_ = NULL;
+       }
+ 
+-      if (this->head_ = this->headRead()) {
++      if ((this->head_ = this->headRead())) {
+ 	this->ext_++;
+ 	this->found();
+ 	return;
+--- a/saotk/vector/vector.h
++++ b/saotk/vector/vector.h
+@@ -16,6 +16,10 @@ using namespace std;
+ class Vector3d;
+ class Matrix;
+ 
++class Vector;
++class Matrix;
++class BBox;
++
+ class Vector {
+  public:
+   double v[3];
diff --git a/debian/patches/checkdns.patch b/debian/patches/checkdns.patch
index 7e0732f..2dc9757 100644
--- a/debian/patches/checkdns.patch
+++ b/debian/patches/checkdns.patch
@@ -1,3 +1,5 @@
+Author: Justin Pryzby <justinpryzby at users.sf.net>
+Description: Avoid compilation error in (Tcl) DNS checker
 --- a/checkdns/checkdns.c
 +++ b/checkdns/checkdns.c
 @@ -15,6 +15,8 @@
diff --git a/debian/patches/iis.patch b/debian/patches/iis.patch
index a1c54b4..cc75fc9 100644
--- a/debian/patches/iis.patch
+++ b/debian/patches/iis.patch
@@ -1,3 +1,6 @@
+Author: Justin Pryzby <justinpryzby at users.sf.net>
+Description: Avoid compilation errors and warnings in the IRAF/IIS "imtool" 
+ protocol module. The code is K&R C.
 --- a/iis/iis.c
 +++ b/iis/iis.c
 @@ -5,10 +5,14 @@
diff --git a/debian/patches/saotk.patch b/debian/patches/saotk.patch
deleted file mode 100644
index fb0f1b0..0000000
--- a/debian/patches/saotk.patch
+++ /dev/null
@@ -1,372 +0,0 @@
-diff --git a/saotk/colorbar/lut.C b/saotk/colorbar/lut.C
-index 011d443..04bcfde 100644
---- a/saotk/colorbar/lut.C
-+++ b/saotk/colorbar/lut.C
-@@ -1,4 +1,4 @@
--// Copyright (C) 1999-200
-+// Copyright (C) 1999-2005
- // Smithsonian Astrophysical Observatory, Cambridge, MA, USA
- // For conditions of distribution and use, see copyright notice in "copyright"
- 
-diff --git a/saotk/fitsy++/Makefile b/saotk/fitsy++/Makefile
-index 5be79cc..f36d98d 100644
---- a/saotk/fitsy++/Makefile
-+++ b/saotk/fitsy++/Makefile
-@@ -3,8 +3,7 @@ include ../../make.pkgs
- 
- CXXFLAGS = $(CXXOPT) -I. -I.. -I../vector -I../util \
- 	-I../../include -I$(X11INCLUDE) \
--	-I../../$(FUNTOOLSDIR)/filter -I../../$(FUNTOOLSDIR)/fitsy \
--	-I../../$(FUNTOOLSDIR)/util
-+	-I/usr/include/funtools -I/usr/include/wcstools
- 
- SS	= \
- 	alloc.C \
-diff --git a/saotk/fitsy++/outchannel.C b/saotk/fitsy++/outchannel.C
-index 20d7eff..f4e98e0 100644
---- a/saotk/fitsy++/outchannel.C
-+++ b/saotk/fitsy++/outchannel.C
-@@ -7,7 +7,7 @@
- OutFitsChannel::OutFitsChannel(Tcl_Interp* interp, const char* ch)
- {
-   int tclMode;
--  if (ch_ = Tcl_GetChannel(interp, (char*)ch, &tclMode))
-+  if ((ch_ = Tcl_GetChannel(interp, (char*)ch, &tclMode)))
-     valid_ = 1;
- }
- 
-diff --git a/saotk/fitsy++/outfile.C b/saotk/fitsy++/outfile.C
-index 37078c3..976d725 100644
---- a/saotk/fitsy++/outfile.C
-+++ b/saotk/fitsy++/outfile.C
-@@ -6,7 +6,7 @@
- 
- OutFitsFile::OutFitsFile(const char* fn)
- {
--  if (fd_ = fopen(fn, "wb"))
-+  if ((fd_ = fopen(fn, "wb")))
-     valid_ = 1;
- }
- 
-@@ -23,7 +23,7 @@ int OutFitsFile::write(char* d, int s)
- 
- OutFitsFileGZ::OutFitsFileGZ(const char* fn)
- {
--  if (fd_ = gzopen(fn, "wb"))
-+  if ((fd_ = gzopen(fn, "wb")))
-     valid_ = 1;
- }
- 
-diff --git a/saotk/fitsy++/strm.C b/saotk/fitsy++/strm.C
-index 0474bf3..50a37b8 100644
---- a/saotk/fitsy++/strm.C
-+++ b/saotk/fitsy++/strm.C
-@@ -346,7 +346,7 @@ template<class T> void FitsFitsStream<T>::processExact()
-   if (!(this->pExt_ || (this->pIndex_>0))) {
- 
-     // we are only looking for a primary image
--    if (this->head_ = this->headRead()) {
-+    if ((this->head_ = this->headRead())) {
-       this->found();
-       return;
-     }
-@@ -402,7 +402,7 @@ template<class T> void FitsFitsStream<T>::processExact()
- 	this->head_ = NULL;
-       }
- 
--      if (this->head_ = this->headRead()) {
-+      if ((this->head_ = this->headRead())) {
- 	this->ext_++;
- 	this->found();
- 	return;
-diff --git a/saotk/frame/Makefile b/saotk/frame/Makefile
-index 17702d7..f09a666 100644
---- a/saotk/frame/Makefile
-+++ b/saotk/frame/Makefile
-@@ -4,9 +4,8 @@ include ../../make.pkgs
- CXXFLAGS = $(CXXOPT) -w \
- 	-I. -I.. -I../widget -I../vector -I../list -I../fitsy++ -I../util \
- 	-I../../include -I$(X11INCLUDE) \
--	-I../../$(FUNTOOLSDIR)/util \
--	-I/usr/include/libxml2 \
--	-I../../$(ASTDIR)
-+	-I/usr/include/funtools \
-+	-I/usr/include/libxml2 
- 
- SS	= \
- 	annulus.C \
-diff --git a/saotk/frame/ciaolex.C b/saotk/frame/ciaolex.C
-index 1755c2a..5b3b774 100644
---- a/saotk/frame/ciaolex.C
-+++ b/saotk/frame/ciaolex.C
-@@ -119,6 +119,7 @@ typedef unsigned int flex_uint32_t;
- #define yyconst
- #endif
- 
-+
- /* Returned upon end-of-file. */
- #define YY_NULL 0
- 
-diff --git a/saotk/frame/ds9lex.C b/saotk/frame/ds9lex.C
-index 48c82f6..c149f83 100644
---- a/saotk/frame/ds9lex.C
-+++ b/saotk/frame/ds9lex.C
-@@ -119,6 +119,7 @@ typedef unsigned int flex_uint32_t;
- #define yyconst
- #endif
- 
-+
- /* Returned upon end-of-file. */
- #define YY_NULL 0
- 
-diff --git a/saotk/frame/fitsimage.C b/saotk/frame/fitsimage.C
-index 830882a..0cd5733 100644
---- a/saotk/frame/fitsimage.C
-+++ b/saotk/frame/fitsimage.C
-@@ -23,10 +23,101 @@
- 
- // wcs coordinate system strings (for use with wcssubs)
- 
-+
- // this is kluge to speed up doug minks wcssubs 'ksearch' routine
- extern "C" {
-   FitsHead* wcshead = NULL;
--  char* ksearchh(char*, char*);
-+  char* ksearchh(char* hstring, char* keyword)
-+  {
-+/* Find entry for keyword keyword in FITS header string hstring.
-+   (the keyword may have a maximum of eight letters)
-+   NULL is returned if the keyword is not found */
-+
-+/* char *hstring; character string containing fits-style header
-+               information in the format <keyword>= <value> {/ <comment>}
-+               the default is that each entry is 80 characters long;
-+               however, lines may be of arbitrary length terminated by
-+               nulls, carriage returns or linefeeds, if packed is true.  */
-+/*char *keyword; character string containing the name of the variable
-+               to be returned.  ksearch searches for a line beginning
-+               with this string.  The string may be a character
-+               literal or a character variable terminated by a null
-+               or '$'.  it is truncated to 8 characters. */
-+    char *loc, *headnext, *headlast, *pval, *lc, *line;
-+    int icol, nextchar, lkey, nleft, lhead, lmax;
-+
-+#ifdef USE_SAOLIB
-+       int iel=1, ip=1, nel, np, ier;
-+       char *get_fits_head_str();
-+
-+       if( !use_saolib ){
-+#endif
-+
-+    pval = 0;
-+static int lhead0 = 0;
-+/* Find current length of header string */
-+    if (lhead0)
-+       lmax = lhead0;
-+    else
-+       lmax = 256000;
-+    for (lhead = 0; lhead < lmax; lhead++) {
-+       if (hstring[lhead] == (char) 0)
-+           break;
-+       }
-+
-+/* Search header string for variable name */
-+    headlast = hstring + lhead;
-+    headnext = hstring;
-+    pval = NULL;
-+    while (headnext < headlast) {
-+       nleft = headlast - headnext;
-+       loc = strncsrch (headnext, keyword, nleft);
-+
-+       /* Exit if keyword is not found */
-+       if (loc == NULL) {
-+           break;
-+           }
-+
-+       icol = (loc - hstring) % 80;
-+       lkey = strlen (keyword);
-+       nextchar = (int) *(loc + lkey);
-+
-+       /* If this is not in the first 8 characters of a line, keep searching */
-+       if (icol > 7)
-+           headnext = loc + 1;
-+
-+       /* If parameter name in header is longer, keep searching */
-+       else if (nextchar != 61 && nextchar > 32 && nextchar < 127)
-+           headnext = loc + 1;
-+
-+       /* If preceeding characters in line are not blanks, keep searching */
-+       else {
-+           line = loc - icol;
-+           for (lc = line; lc < loc; lc++) {
-+               if (*lc != ' ')
-+                   headnext = loc + 1;
-+               }
-+
-+       /* Return pointer to start of line if match */
-+           if (loc >= headnext) {
-+               pval = line;
-+               break;
-+               }
-+           }
-+       }
-+/* Return pointer to calling program */
-+       return (pval);
-+
-+#ifdef USE_SAOLIB
-+       }
-+       else {
-+           if (get_fits_head_str(keyword,iel,ip,&nel,&np,&ier,hstring) != NULL)
-+               return(hstring);
-+           else
-+               return(NULL);
-+           }
-+#endif
-+  }
- 
-   char* findit(char* cards, char* key)
-   {
-diff --git a/saotk/frame/fitsimage.h b/saotk/frame/fitsimage.h
-index 9fef1db..db48136 100644
---- a/saotk/frame/fitsimage.h
-+++ b/saotk/frame/fitsimage.h
-@@ -10,7 +10,7 @@
- #include "fitsdata.h"
- #include "coord.h"
- #include "file.h"
--#include "wcs.h"
-+#include "wcstools/wcs.h"
- 
- #define WCSXMAX 7
- 
-diff --git a/saotk/frame/lex.C b/saotk/frame/lex.C
-index c7f7739..6aff81d 100644
---- a/saotk/frame/lex.C
-+++ b/saotk/frame/lex.C
-@@ -119,6 +119,7 @@ typedef unsigned int flex_uint32_t;
- #define yyconst
- #endif
- 
-+
- /* Returned upon end-of-file. */
- #define YY_NULL 0
- 
-diff --git a/saotk/frame/proslex.C b/saotk/frame/proslex.C
-index 633769e..1b930af 100644
---- a/saotk/frame/proslex.C
-+++ b/saotk/frame/proslex.C
-@@ -119,6 +119,7 @@ typedef unsigned int flex_uint32_t;
- #define yyconst
- #endif
- 
-+
- /* Returned upon end-of-file. */
- #define YY_NULL 0
- 
-diff --git a/saotk/frame/saolex.C b/saotk/frame/saolex.C
-index 5ed8cfe..45514f0 100644
---- a/saotk/frame/saolex.C
-+++ b/saotk/frame/saolex.C
-@@ -119,6 +119,7 @@ typedef unsigned int flex_uint32_t;
- #define yyconst
- #endif
- 
-+
- /* Returned upon end-of-file. */
- #define YY_NULL 0
- 
-diff --git a/saotk/frame/tnglex.C b/saotk/frame/tnglex.C
-index 9eb7fdd..8d4e921 100644
---- a/saotk/frame/tnglex.C
-+++ b/saotk/frame/tnglex.C
-@@ -119,6 +119,7 @@ typedef unsigned int flex_uint32_t;
- #define yyconst
- #endif
- 
-+
- /* Returned upon end-of-file. */
- #define YY_NULL 0
- 
-diff --git a/saotk/frame/xylex.C b/saotk/frame/xylex.C
-index 1364bf0..cf19fef 100644
---- a/saotk/frame/xylex.C
-+++ b/saotk/frame/xylex.C
-@@ -119,6 +119,7 @@ typedef unsigned int flex_uint32_t;
- #define yyconst
- #endif
- 
-+
- /* Returned upon end-of-file. */
- #define YY_NULL 0
- 
-diff --git a/saotk/util/Makefile b/saotk/util/Makefile
-index 089787f..92be85e 100644
---- a/saotk/util/Makefile
-+++ b/saotk/util/Makefile
-@@ -3,8 +3,7 @@ include ../../make.pkgs
- 
- CXXFLAGS = $(CXXOPT) -I. -I.. -I../widget -I../vector \
- 	-I../../include -I$(X11INCLUDE) \
--	-I../../$(FUNTOOLSDIR)/util \
--	-I../../$(ASTDIR)
-+	-I/usr/include/funtools 
- 
- SRC	= attribute.C \
- 	grf.C \
-diff --git a/saotk/util/grf.C b/saotk/util/grf.C
-index 2788692..36e50c2 100644
---- a/saotk/util/grf.C
-+++ b/saotk/util/grf.C
-@@ -534,3 +534,11 @@ int astGCap(int cap, int value)
- {
-   return astGridPtr->gCap(cap,value);
- }
-+
-+int astGBBuf( void ){
-+   return 0;
-+}
-+
-+int astGEBuf( void ){
-+   return 0;
-+}
-diff --git a/saotk/util/tkpostscript.h b/saotk/util/tkpostscript.h
-index d23708d..d72b3e7 100644
---- a/saotk/util/tkpostscript.h
-+++ b/saotk/util/tkpostscript.h
-@@ -13,7 +13,7 @@
- #endif
- 
- // copied from tkCanvPs.c
--#include "../../tk8.5.8/generic/tkCanvas.h"
-+#include <tk-private/generic/tkCanvas.h>
- 
- typedef struct TkPostscriptInfo {
-     Tk_Window tkwin;		/* The canvas being printed. */
-diff --git a/saotk/vector/vector.h b/saotk/vector/vector.h
-index 5466083..6041b66 100644
---- a/saotk/vector/vector.h
-+++ b/saotk/vector/vector.h
-@@ -16,6 +16,10 @@ using namespace std;
- class Vector3d;
- class Matrix;
- 
-+class Vector;
-+class Matrix;
-+class BBox;
-+
- class Vector {
-  public:
-   double v[3];
-diff --git a/saotk/widget/widget.C b/saotk/widget/widget.C
-index ca078d0..8e88e8e 100644
---- a/saotk/widget/widget.C
-+++ b/saotk/widget/widget.C
-@@ -5,6 +5,8 @@
- #include "widget.h"
- #include "util.h"
- 
-+float psScale = 1.0;
-+
- // Tk Canvas Widget Functions Declaration
- 
- int WidgetConfigProc(Tcl_Interp* interp, Tk_Canvas canvas, Tk_Item* item, 
diff --git a/debian/patches/series b/debian/patches/series
index 584fbef..eccb9fc 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,8 @@
 checkdns.patch
 iis.patch
-saotk.patch
-main-ds9.patch
+add_ksearch.patch
+add_missing_grf.patch
+add_psscale.patch
+avoid_compile_warnings_saotk.patch
+use_external_libs_saotk.patch
+use_external_libs_main.patch
diff --git a/debian/patches/main-ds9.patch b/debian/patches/use_external_libs_main.patch
similarity index 96%
rename from debian/patches/main-ds9.patch
rename to debian/patches/use_external_libs_main.patch
index 9d9b986..65c9cc3 100644
--- a/debian/patches/main-ds9.patch
+++ b/debian/patches/use_external_libs_main.patch
@@ -1,3 +1,6 @@
+Author: Sebastien Fabbro <bicatali at gentoo.org>, and others
+Description: Compile against external libraries of wcstools, funtools, ast,
+ and tk etc. instead of the convienience copies provided by ds9.
 --- a/ds9/Makefile
 +++ b/ds9/Makefile
 @@ -4,13 +4,7 @@ include ../make.pkgs
@@ -455,15 +458,6 @@
  	cd $(XPADIR); $(MAKE); $(MAKE) install
  	cd bin; strip xpa*
  
-@@ -335,7 +335,7 @@ signal: FORCE
- 
- funtools: FORCE
- 	@echo "Installing Funtools..."
--	cd $(FUNTOOLSDIR); CC='$(CC)' CFLAGS='$(OPTS)' LDFLAGS='$(LIBS)' ./configure --prefix $(root) --with-zlib=../../lib/libz.a --with-wcslib=../lib/libwcs.a --enable-mainlib $(FUNTOOLSFLAGS)
-+	cd $(FUNTOOLSDIR); CC='$(CC)' CFLAGS='$(OPTS)' LDFLAGS='$(LIBS)' ./configure --prefix $(root) --with-zlib=-lz --with-wcslib=../lib/libwcs.a --enable-mainlib $(FUNTOOLSFLAGS)
- 	cd $(FUNTOOLSDIR); $(MAKE) lib
- 	cp $(FUNTOOLSDIR)/libfuntools.a lib/.
- 
 @@ -378,7 +378,7 @@ endif
  
  saotk	: FORCE
diff --git a/debian/patches/use_external_libs_saotk.patch b/debian/patches/use_external_libs_saotk.patch
new file mode 100644
index 0000000..b921db3
--- /dev/null
+++ b/debian/patches/use_external_libs_saotk.patch
@@ -0,0 +1,63 @@
+Author: Ole Streicher <debian at liska.ath.cx>
+Description: Compile against external libraries of wcstools, funtools, ast,
+ and tk instead of the convienience copies provided by ds9.
+--- a/saotk/fitsy++/Makefile
++++ b/saotk/fitsy++/Makefile
+@@ -3,8 +3,7 @@ include ../../make.pkgs
+ 
+ CXXFLAGS = $(CXXOPT) -I. -I.. -I../vector -I../util \
+ 	-I../../include -I$(X11INCLUDE) \
+-	-I../../$(FUNTOOLSDIR)/filter -I../../$(FUNTOOLSDIR)/fitsy \
+-	-I../../$(FUNTOOLSDIR)/util
++	-I/usr/include/funtools -I/usr/include/wcstools
+ 
+ SS	= \
+ 	alloc.C \
+--- a/saotk/frame/Makefile
++++ b/saotk/frame/Makefile
+@@ -4,9 +4,8 @@ include ../../make.pkgs
+ CXXFLAGS = $(CXXOPT) -w \
+ 	-I. -I.. -I../widget -I../vector -I../list -I../fitsy++ -I../util \
+ 	-I../../include -I$(X11INCLUDE) \
+-	-I../../$(FUNTOOLSDIR)/util \
+-	-I/usr/include/libxml2 \
+-	-I../../$(ASTDIR)
++	-I/usr/include/funtools \
++	-I/usr/include/libxml2 
+ 
+ SS	= \
+ 	annulus.C \
+--- a/saotk/frame/fitsimage.h
++++ b/saotk/frame/fitsimage.h
+@@ -10,7 +10,7 @@
+ #include "fitsdata.h"
+ #include "coord.h"
+ #include "file.h"
+-#include "wcs.h"
++#include "wcstools/wcs.h"
+ 
+ #define WCSXMAX 7
+ 
+--- a/saotk/util/Makefile
++++ b/saotk/util/Makefile
+@@ -3,8 +3,7 @@ include ../../make.pkgs
+ 
+ CXXFLAGS = $(CXXOPT) -I. -I.. -I../widget -I../vector \
+ 	-I../../include -I$(X11INCLUDE) \
+-	-I../../$(FUNTOOLSDIR)/util \
+-	-I../../$(ASTDIR)
++	-I/usr/include/funtools 
+ 
+ SRC	= attribute.C \
+ 	grf.C \
+--- a/saotk/util/tkpostscript.h
++++ b/saotk/util/tkpostscript.h
+@@ -13,7 +13,7 @@
+ #endif
+ 
+ // copied from tkCanvPs.c
+-#include "../../tk8.5.8/generic/tkCanvas.h"
++#include <tk-private/generic/tkCanvas.h>
+ 
+ typedef struct TkPostscriptInfo {
+     Tk_Window tkwin;		/* The canvas being printed. */

-- 
image display tool for astronomy



More information about the debian-science-commits mailing list