[SCM] image display tool for astronomy branch, debian, updated. 8dc10aec8b7b49c9179b70e1f447a7d729f638ab

[Ole Streicher]

The following commit has been merged in the debian branch:
commit 8dc10aec8b7b49c9179b70e1f447a7d729f638ab
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Wed Jun 6 23:56:24 2012 +0200

    Fix most compile problems

diff --git a/debian/patches/fix_funtools_includes.patch b/debian/patches/fix_funtools_includes.patch
index f3ad4fb..9afa447 100644
--- a/debian/patches/fix_funtools_includes.patch
+++ b/debian/patches/fix_funtools_includes.patch
@@ -181,6 +181,17 @@ Description: Since the funtools include files have quite generic names, we
  
  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 @@
@@ -192,3 +203,17 @@ Description: Since the funtools include files have quite generic names, we
  
  void boxcar(double* kernel, int r)
  {
+--- a/saotk/fitsy++/hpx.C
++++ b/saotk/fitsy++/hpx.C
+@@ -17,9 +17,9 @@
+ 
+ #include "hpx.h"
+ #include "util.h"
+-#include "NaN.h"
++#include <funtools/NaN.h>
+ 
+-#include "fitsy.h"
++#include <funtools/fitsy.h>
+ 
+ FitsHPX::FitsHPX(FitsFile* fits, Order oo, CoordSys ss, Layout ll, 
+ 		 int cc, int qq) 
diff --git a/debian/patches/use_external_libs.patch b/debian/patches/use_external_libs.patch
index 551b206..4d615d5 100644
--- a/debian/patches/use_external_libs.patch
+++ b/debian/patches/use_external_libs.patch
@@ -18,7 +18,7 @@ Description: Compile against external libraries of wcstools, funtools, ast,
  	$(ZDIR)/src \
  	$(ZDIR)/msgs \
  	$(ZDIR)/doc \
-@@ -25,49 +19,18 @@
+@@ -25,49 +19,19 @@
  endif
  
  # for unix, macosx
@@ -61,7 +61,7 @@ Description: Compile against external libraries of wcstools, funtools, ast,
  	../lib/libiis.a \
 -	../lib/libcheckdns.a \
 -	../lib/libsignal_ext.a \
--	../lib/libxxlib.a \
+ 	../lib/libxxlib.a \
 -	../lib/libBLTX30.a \
 -	../lib/libBLTCore30.a \
 -	../lib/libtk8.5.a \
@@ -70,7 +70,7 @@ Description: Compile against external libraries of wcstools, funtools, ast,
  
  # if windows, redefine
  ifeq ($(OS),windows)
-@@ -354,18 +317,14 @@
+@@ -354,18 +318,14 @@
  #--------------------------linux
  
  ifneq (,$(findstring linux,$(ARCH)))
diff --git a/debian/patches/use_filesystem.patch b/debian/patches/use_filesystem.patch
index 7e49ada..22355c0 100644
--- a/debian/patches/use_filesystem.patch
+++ b/debian/patches/use_filesystem.patch
@@ -3,7 +3,7 @@ Description: Store all files in the usual FHS directories instead of
  building a zipfile and using a special tcl filesystem driver to access it.
 --- a/ds9/Makefile
 +++ b/ds9/Makefile
-@@ -94,12 +94,9 @@
+@@ -95,12 +95,9 @@
  
  all: ds9
  
@@ -18,7 +18,7 @@ Description: Store all files in the usual FHS directories instead of
  	cd ../bin; $(CODESIGN) -s "SAOImage DS9" ds9
  
  debug	: ds9Base ds9.zip
-@@ -190,12 +187,9 @@
+@@ -191,12 +188,9 @@
  
  all: ds9
  
diff --git a/debian/rules b/debian/rules
index ad9e0e7..357124f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,7 +2,7 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-BUILDPARTS:=dirs blt checkdns tkmpeg html iis rice hcompress plio saotk ds9
+BUILDPARTS:=dirs blt checkdns tkmpeg html iis rice hcompress plio unix saotk ds9
 
 get-orig-source:
 	sh ./debian/repack;

-- 
image display tool for astronomy