Package: funtools / 1.4.4+dfsg2-1

use_shared_libwcstools.patch Patch series | download
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
Author: Ole Streicher <debian@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 =		
+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
 

--- 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"