[saods9] 01/02: Create new patch saotk_use_system_wcstools.patch
Ole Streicher
olebole at moszumanska.debian.org
Tue Jul 7 08:17:57 UTC 2015
This is an automated email from the git hooks/post-receive script.
olebole pushed a commit to branch experimental
in repository saods9.
commit cc22fb35fec6e8c43b2d9401cb0934b931e89bff
Author: Ole Streicher <olebole at debian.org>
Date: Tue Jul 7 09:30:46 2015 +0200
Create new patch saotk_use_system_wcstools.patch
---
debian/patches/ds9_use_external_libs.patch | 75 +-------------------
debian/patches/saotk_fix_wcstools_includes.patch | 15 ----
debian/patches/saotk_use_system_wcstools.patch | 88 ++++++++++++++++++++++++
debian/patches/series | 2 +-
4 files changed, 90 insertions(+), 90 deletions(-)
diff --git a/debian/patches/ds9_use_external_libs.patch b/debian/patches/ds9_use_external_libs.patch
index 5f2b1aa..cd872be 100644
--- a/debian/patches/ds9_use_external_libs.patch
+++ b/debian/patches/ds9_use_external_libs.patch
@@ -1,5 +1,5 @@
Author: Sebastien Fabbro <bicatali at gentoo.org>, and others
-Description: Compile against external libraries of wcstools, funtools, ast,
+Description: Compile against external libraries of funtools, ast,
and tk etc. instead of the convienience copies provided by ds9.
--- a/ds9/Makefile.unix
+++ b/ds9/Makefile.unix
@@ -445,81 +445,8 @@ Description: Compile against external libraries of wcstools, funtools, ast,
SHLIB_LD_LIBS='${LIBS} -lstdc++'
#--------------------------------------------------------------------
---- a/saotk/Makefile.org
-+++ b/saotk/Makefile.org
-@@ -7,7 +7,7 @@
-
- CXXFLAGS = $(CXXOPT) -I../include -I$(X11INCLUDE)
-
--DIRS = widget frame colorbar panner magnifier vector list fitsy++ util wcssubs
-+DIRS = widget frame colorbar panner magnifier vector list fitsy++ util
-
- OBJS = \
- widget/*.o \
-@@ -18,8 +18,7 @@
- vector/*.o \
- list/*.o \
- fitsy++/*.o \
-- util/*.o \
-- wcssubs/*.o
-+ util/*.o
-
- LIB = libsaotk.a
-
-@@ -62,9 +61,6 @@
- util : FORCE
- cd util; $(MAKE)
-
--wcssubs : FORCE
-- cd wcssubs; $(MAKE)
--
- clean : FORCE
- cd frame; $(MAKE) clean
- cd colorbar; $(MAKE) clean
-@@ -75,7 +71,6 @@
- cd list; $(MAKE) clean
- cd fitsy++; $(MAKE) clean
- cd util; $(MAKE) clean
-- cd wcssubs; $(MAKE) clean
-
- distclean : FORCE
- rm -f *.o *.a *.so
-@@ -88,7 +83,6 @@
- cd list; $(MAKE) distclean
- cd fitsy++; $(MAKE) distclean
- cd util; $(MAKE) distclean
-- cd wcssubs; $(MAKE) distclean
-
- parsers : FORCE
- cd frame; $(MAKE) parsers
--- a/saotk/configure.in
+++ b/saotk/configure.in
-@@ -266,25 +266,6 @@
- util/util.C
- vector/vector.C
- vector/vector3d.C
--wcssubs/cel.c
--wcssubs/distort.c
--wcssubs/dsspos.c
--wcssubs/hget.c
--wcssubs/hput.c
--wcssubs/iget.c
--wcssubs/lin.c
--wcssubs/platepos.c
--wcssubs/poly.c
--wcssubs/proj.c
--wcssubs/sph.c
--wcssubs/tnxpos.c
--wcssubs/wcs.c
--wcssubs/wcscon.c
--wcssubs/wcsinit.c
--wcssubs/wcslib.c
--wcssubs/wcstrig.c
--wcssubs/worldpos.c
--wcssubs/zpxpos.c
- widget/truecolor16.C
- widget/truecolor24.C
- widget/truecolor8.C
@@ -375,7 +356,7 @@
# link against the non-stubbed Tcl library. Add Tk too if necessary.
#--------------------------------------------------------------------
diff --git a/debian/patches/saotk_fix_wcstools_includes.patch b/debian/patches/saotk_fix_wcstools_includes.patch
deleted file mode 100644
index 18e4795..0000000
--- a/debian/patches/saotk_fix_wcstools_includes.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-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>
- #include "head.h"
-
- #include "smooth.h"
diff --git a/debian/patches/saotk_use_system_wcstools.patch b/debian/patches/saotk_use_system_wcstools.patch
new file mode 100644
index 0000000..0a3397d
--- /dev/null
+++ b/debian/patches/saotk_use_system_wcstools.patch
@@ -0,0 +1,88 @@
+Author: Ole Streicher <olebole at debian.org>
+Description: Compile against system library wcstools
+--- a/saotk/Makefile.org
++++ b/saotk/Makefile.org
+@@ -7,7 +7,7 @@
+
+ CXXFLAGS = $(CXXOPT) -I../include -I$(X11INCLUDE)
+
+-DIRS = widget frame colorbar panner magnifier vector list fitsy++ util wcssubs
++DIRS = widget frame colorbar panner magnifier vector list fitsy++ util
+
+ OBJS = \
+ widget/*.o \
+@@ -18,8 +18,7 @@
+ vector/*.o \
+ list/*.o \
+ fitsy++/*.o \
+- util/*.o \
+- wcssubs/*.o
++ util/*.o
+
+ LIB = libsaotk.a
+
+@@ -62,9 +61,6 @@
+ util : FORCE
+ cd util; $(MAKE)
+
+-wcssubs : FORCE
+- cd wcssubs; $(MAKE)
+-
+ clean : FORCE
+ cd frame; $(MAKE) clean
+ cd colorbar; $(MAKE) clean
+@@ -75,7 +71,6 @@
+ cd list; $(MAKE) clean
+ cd fitsy++; $(MAKE) clean
+ cd util; $(MAKE) clean
+- cd wcssubs; $(MAKE) clean
+
+ distclean : FORCE
+ rm -f *.o *.a *.so
+@@ -88,7 +83,6 @@
+ cd list; $(MAKE) distclean
+ cd fitsy++; $(MAKE) distclean
+ cd util; $(MAKE) distclean
+- cd wcssubs; $(MAKE) distclean
+
+ parsers : FORCE
+ cd frame; $(MAKE) parsers
+--- a/saotk/configure.in
++++ b/saotk/configure.in
+@@ -266,25 +266,6 @@
+ util/util.C
+ vector/vector.C
+ vector/vector3d.C
+-wcssubs/cel.c
+-wcssubs/distort.c
+-wcssubs/dsspos.c
+-wcssubs/hget.c
+-wcssubs/hput.c
+-wcssubs/iget.c
+-wcssubs/lin.c
+-wcssubs/platepos.c
+-wcssubs/poly.c
+-wcssubs/proj.c
+-wcssubs/sph.c
+-wcssubs/tnxpos.c
+-wcssubs/wcs.c
+-wcssubs/wcscon.c
+-wcssubs/wcsinit.c
+-wcssubs/wcslib.c
+-wcssubs/wcstrig.c
+-wcssubs/worldpos.c
+-wcssubs/zpxpos.c
+ widget/truecolor16.C
+ widget/truecolor24.C
+ widget/truecolor8.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>
+ #include "head.h"
+
+ #include "smooth.h"
diff --git a/debian/patches/series b/debian/patches/series
index 367ebba..1dcac9f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,7 +4,7 @@ saotk_fix_blt_crash.patch
saotk_add_ksearch.patch
saotk_add_psscale.patch
saotk_avoid_compile_warnings.patch
-saotk_fix_wcstools_includes.patch
+saotk_use_system_wcstools.patch
saotk_fix_funtools_includes.patch
saotk_spellfix.patch
ds9_support_blt.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-astro/packages/saods9.git
More information about the debian-science-commits
mailing list