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

[Ole Streicher]

The following commit has been merged in the debian branch:
commit c32f08b5bb0c1a5b54cfee5f2fa50fa71199195f
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Sat Jan 14 19:17:27 2012 +0100

    Link against shared libs (libfuntools.so, and external libwcstools.so)

diff --git a/debian/patches/link_to_so.patch b/debian/patches/link_to_so.patch
new file mode 100644
index 0000000..4bf1f4b
--- /dev/null
+++ b/debian/patches/link_to_so.patch
@@ -0,0 +1,23 @@
+Author: Ole Streicher <debian at liska.ath.cx>
+Description: Link the executables agains libfuntools.so and link libfuntools.so
+ against the needed libs.
+--- sao-funtools-1.4.4.orig/Makefile.in
++++ sao-funtools-1.4.4/Makefile.in
+@@ -160,7 +160,7 @@ LIB =		@LIB@
+ 
+ # this is used in the link line
+ # LLIB =	$(LIB)
+-LLIB =		@LLIB@
++LLIB =		-L. -lfuntools
+ 
+ # libraries containing main as subroutines
+ MAINLIB =	lib$(PACKAGE)MainLib.a
+@@ -228,7 +228,7 @@ shlib:		sublib $(LIBOBJS)
+ 		@(rm -rf $(PACKAGE)tmp; mkdir $(PACKAGE)tmp; \
+ 		(cd $(PACKAGE)tmp && ar x ../$(LIB)); \
+ 		CC='$(CC)' CXX=$(CXX) \
+-		./mklib -o $(PACKAGE) $(PACKAGE)tmp/*.o; \
++		./mklib -o $(PACKAGE) -ldl $(WCS_LIBS) -lm -lz $(PACKAGE)tmp/*.o; \
+ 		rm -rf $(PACKAGE)tmp;)
+ 
+ mainlib:	$(MAINLIBOBJS) funmainlib.o lex.calc.o
diff --git a/debian/patches/series b/debian/patches/series
index 6fa8c2e..d351f22 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,4 @@
 fix_paths.patch
 fix_manpages.patch
+link_to_so.patch
+use_shared_libwcstools.patch
diff --git a/debian/patches/use_shared_libwcstools.patch b/debian/patches/use_shared_libwcstools.patch
new file mode 100644
index 0000000..a77c353
--- /dev/null
+++ b/debian/patches/use_shared_libwcstools.patch
@@ -0,0 +1,25 @@
+Author: Ole Streicher <debian at liska.ath.cx>
+Description: Use the shared libwcstools package instead of the convienence copy.
+--- sao-funtools-1.4.4.orig/Makefile.in
++++ sao-funtools-1.4.4/Makefile.in
+@@ -60,8 +60,8 @@ FITSY_INC =		-I./fitsy
+ # FITSY_LIBS =		-L./fitsy -lfitsy
+ 
+ # wcs files are in the wcs subdirectory
+-WCS_INC =		-I./wcs
+-# WCS_LIBS =		-L./wcs -lwcs
++WCS_INC =		-I/usr/include/wcstools
++WCS_LIBS =		-lwcstools
+ 
+ # filter files are in the filter subdirectory
+ FILTER_INC =        	-I./filter
+@@ -188,7 +188,7 @@ DEVEL =
+ 
+ # Subdirectories to run make in for the primary targets.
+ 
+-SUBLIBS =	util fitsy wcs filter
++SUBLIBS =	util fitsy filter
+ 
+ SUBDIRS =	$(SUBLIBS) gnu funtest faq
+ 
+

-- 
Minimal buy-in FITS library and utility package