[SCM] image display tool for astronomy branch, debian, updated. 31ef4f3ee5d7ccd65c08677bd7fb61f2b969acaf

Ole Streicher debian at liska.ath.cx
Wed Apr 11 08:32:23 UTC 2012


The following commit has been merged in the debian branch:
commit 31ef4f3ee5d7ccd65c08677bd7fb61f2b969acaf
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Wed Apr 11 10:29:56 2012 +0200

    Split the saotk patch, and describe it better.
    
    Use <funtools/*.h> and <wcstools/wcs.h> instead of just adding -I options
    to cc.

diff --git a/debian/patches/add_psscale.patch b/debian/patches/add_psscale.patch
index c244860..3eadee4 100644
--- a/debian/patches/add_psscale.patch
+++ b/debian/patches/add_psscale.patch
@@ -14,3 +14,14 @@ Description: The original code from ds9 uses a patched postscript code to allow
  // Tk Canvas Widget Functions Declaration
  
  int WidgetConfigProc(Tcl_Interp* interp, Tk_Canvas canvas, Tk_Item* item, 
+--- 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/debian/patches/fix_funtools_includes.patch b/debian/patches/fix_funtools_includes.patch
new file mode 100644
index 0000000..1e3cca8
--- /dev/null
+++ b/debian/patches/fix_funtools_includes.patch
@@ -0,0 +1,205 @@
+Author: Ole Streicher <debian at liska.ath.cx>
+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
+@@ -5,7 +5,7 @@
+ #include "compress.h"
+ #include "head.h"
+ #include "util.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 @@ using namespace std;
+ #include "hist.h"
+ #include "util.h"
+ 
+-#include "fitsy.h"
+-#include "filter.h"
++#include <funtools/fitsy.h>
++#include <funtools/filter.h>
+ 
+ #define FILTERSIZE 262144
+ #define MULTWCS 27
+--- a/saotk/frame/fitsanalysis.C
++++ b/saotk/frame/fitsanalysis.C
+@@ -4,7 +4,7 @@
+ 
+ #include "fitsimage.h"
+ 
+-#include "NaN.h"
++#include <funtools/NaN.h>
+ #include "smooth.h"
+ 
+ int FitsImage::smooth()
+--- 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
+@@ -5,7 +5,7 @@
+ #include "fitsdata.h"
+ #include "colorscale.h"
+ 
+-#include "NaN.h"
++#include <funtools/NaN.h>
+ 
+ #define AUTOCUTSIZE 2048
+ 
+--- 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"
+ 
+--- 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 "framebase.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
+@@ -12,7 +12,7 @@
+ 
+ #include "marker.h"
+ #include "basemarker.h"
+-#include "NaN.h"
++#include <funtools/NaN.h>
+ 
+ #include "annulus.h"
+ #include "box.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
+@@ -6,7 +6,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/util/smooth.C
++++ b/saotk/util/smooth.C
+@@ -10,7 +10,7 @@ using namespace std;
+ #include <math.h>
+ 
+ #include "smooth.h"
+-#include "NaN.h"
++#include <funtools/NaN.h>
+ 
+ void boxcar(float* kernel, int r)
+ {
diff --git a/debian/patches/fix_wcstools_includes.patch b/debian/patches/fix_wcstools_includes.patch
new file mode 100644
index 0000000..c2be562
--- /dev/null
+++ b/debian/patches/fix_wcstools_includes.patch
@@ -0,0 +1,15 @@
+Author: Ole Streicher <debian at liska.ath.cx>
+Description: There is a ambiguity in the name "wcs.h" which could either come
+ from wcslilb or from wcstools. saotk wants the wcstools one here. So, we
+ prepend the right directory prefix.
+--- 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/debian/patches/series b/debian/patches/series
index 92810c8..343bdb1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,7 +4,8 @@ add_ksearch.patch
 add_missing_grf.patch
 add_psscale.patch
 avoid_compile_warnings_saotk.patch
-use_external_libs_saotk.patch
+fix_wcstools_includes.patch
+fix_funtools_includes.patch
 use_external_libs_main.patch
 fix_blt.patch
 fix_docdir.patch
diff --git a/debian/patches/use_external_libs_saotk.patch b/debian/patches/use_external_libs_saotk.patch
deleted file mode 100644
index b921db3..0000000
--- a/debian/patches/use_external_libs_saotk.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-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