[SCM] Minimal buy-in FITS library and utility package branch, master, updated. c4d06adaa94659722cf9fc4c97b2683f63b88997

[Ole Streicher]

The following commit has been merged in the master branch:
commit b3c51b2605c535d80dac75a93bbbee95d2ad1109
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Thu Apr 5 10:29:42 2012 +0200

    Fix wcs.h inclusion

diff --git a/debian/changelog b/debian/changelog
index 3a8a235..bd3c024 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+funtools (1.4.4-2) unstable; urgency=low
+
+  * Add dependency of libwcstools-dev to libfuntools-dev
+
+ -- Ole Streicher <debian at liska.ath.cx>  Thu, 05 Apr 2012 10:20:00 +0200
+
 funtools (1.4.4-1) unstable; urgency=low
 
   * Initial release. (Closes: #655653)
diff --git a/debian/control b/debian/control
index dc2d81a..a9453ea 100644
--- a/debian/control
+++ b/debian/control
@@ -46,7 +46,7 @@ Description: Minimal buy-in FITS library
 Package: libfuntools-dev
 Section: libdevel
 Architecture: any
-Depends: libfuntools1 (= ${binary:Version}), ${misc:Depends}
+Depends: libfuntools1 (= ${binary:Version}), libwcstools-dev, ${misc:Depends}
 Description: Minimal buy-in FITS library (development files)
  Funtools, is a "minimal buy-in" FITS library and utility package developed at
  the High Energy Astrophysics Division of SAO. The Funtools library
diff --git a/debian/patches/use_shared_libwcstools.patch b/debian/patches/use_shared_libwcstools.patch
index a77c353..ac750c8 100644
--- a/debian/patches/use_shared_libwcstools.patch
+++ b/debian/patches/use_shared_libwcstools.patch
@@ -8,7 +8,7 @@ Description: Use the shared libwcstools package instead of the convienence copy.
  # wcs files are in the wcs subdirectory
 -WCS_INC =		-I./wcs
 -# WCS_LIBS =		-L./wcs -lwcs
-+WCS_INC =		-I/usr/include/wcstools
++WCS_INC =		
 +WCS_LIBS =		-lwcstools
  
  # filter files are in the filter subdirectory
@@ -23,3 +23,80 @@ Description: Use the shared libwcstools package instead of the convienence copy.
  SUBDIRS =	$(SUBLIBS) gnu funtest faq
  
 
+--- a/funcen.c
++++ b/funcen.c
+@@ -21,7 +21,7 @@
+ #include <filter.h>
+ #include <swap.h>
+ #include <word.h>
+-#include <wcs.h>
++#include <wcstools/wcs.h>
+ #include <xalloc.h>
+ 
+ #define MAXROW 8192
+--- a/funmerge.c
++++ b/funmerge.c
+@@ -4,7 +4,7 @@
+ 
+ #include <funtools.h>
+ #include <fitsy.h>
+-#include <wcs.h>
++#include <wcstools/wcs.h>
+ #include <gio.h>
+ #include <tl.h>
+ #include <word.h>
+--- a/funtools.h
++++ b/funtools.h
+@@ -31,7 +31,7 @@
+ #define USE_XFILEIO 1
+ #include <fitsy.h>
+ #undef USE_XFILEIO
+-#include <wcs.h>
++#include <wcstools/wcs.h>
+ typedef void *Fun;
+ #endif
+ 
+--- a/funwcs.c
++++ b/funwcs.c
+@@ -3,7 +3,7 @@
+  */
+ 
+ #include <funtoolsP.h>
+-#include <wcs.h>
++#include <wcstools/wcs.h>
+ 
+ /*
+  *
+--- a/ofuntools.h
++++ b/ofuntools.h
+@@ -31,7 +31,7 @@
+ #define USE_XFILEIO 1
+ #include <fitsy.h>
+ #undef USE_XFILEIO
+-#include <wcs.h>
++#include <wcstools/wcs.h>
+ typedef void *Fun;
+ #endif
+ 
+--- a/funtoolsP.h
++++ b/funtoolsP.h
+@@ -36,7 +36,7 @@
+ #define USE_XFILEIO 1
+ #include <fitsy.h>
+ #undef USE_XFILEIO
+-#include <wcs.h>
++#include <wcstools/wcs.h>
+ #include <filter.h>
+ #include <file.h>
+ #include <swap.h>
+--- a/filter/filter.h
++++ b/filter/filter.h
+@@ -46,7 +46,7 @@
+ #include <fitsy.h>
+ #undef USE_XFILEIO
+ #include <idx.h>
+-#include <wcs.h>
++#include <wcstools/wcs.h>
+ #include <column.h>
+ #include <tl.h>
+ #include <dl.h>

-- 
Minimal buy-in FITS library and utility package