[cpl-plugin-uves] 02/03: Use the qfits library provided by Debian instead of the convienience copy

[Ole Streicher]

This is an automated email from the git hooks/post-receive script.

olebole-guest pushed a commit to branch debian
in repository cpl-plugin-uves.

commit 841f4ebe1af0dab20972a68009846d2a6c49cbd3
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Sat Dec 7 19:09:50 2013 +0100

    Use the qfits library provided by Debian instead of the convienience copy
---
 debian/control                        |  1 +
 debian/patches/series                 |  1 +
 debian/patches/use_system_qfits.patch | 93 +++++++++++++++++++++++++++++++++++
 3 files changed, 95 insertions(+)

diff --git a/debian/control b/debian/control
index 8caca67..dff1cbe 100644
--- a/debian/control
+++ b/debian/control
@@ -6,6 +6,7 @@ Uploaders: Ole Streicher <debian at liska.ath.cx>
 Build-Depends: debhelper (>= 9),
                dh-autoreconf,
                libcpl-dev (>= 5.3.1),
+	       libqfits-dev,
                python,
                python-cpl,
                python-pyfits,
diff --git a/debian/patches/series b/debian/patches/series
index e2c2220..e14e2cc 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 libadd_cpl.patch
 set_plugindir.patch
 use-std-paths-for-cpl.patch
+use_system_qfits.patch
diff --git a/debian/patches/use_system_qfits.patch b/debian/patches/use_system_qfits.patch
new file mode 100644
index 0000000..e52807c
--- /dev/null
+++ b/debian/patches/use_system_qfits.patch
@@ -0,0 +1,93 @@
+Author: Ole Streicher <debian at liska.ath.cx>
+Description: Use the qfits library provided by Debian instead of the
+ convienience copy.
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -19,11 +19,10 @@
+ 
+ AUTOMAKE_OPTIONS = 1.8 foreign
+ 
+-ACLOCAL_AMFLAGS = -I m4macros -I libqfits/m4macros
++ACLOCAL_AMFLAGS = -I m4macros
+ 
+ DISTCLEANFILES = *~
+ 
+-COMPILE_FIRST = libqfits
+ 
+ TOPSUBDIRS = irplib uves flames recipes regtests reflex
+ #TOPSUBDIRS = irplib uves recipes
+@@ -31,7 +30,6 @@
+ COMPILE_LAST =
+ 
+ 
+-HTML_SUBDIRS =  libqfits
+ 
+ SUBDIRS = $(COMPILE_FIRST) $(TOPSUBDIRS) $(COMPILE_LAST)
+ 
+--- a/acinclude.m4
++++ b/acinclude.m4
+@@ -276,7 +276,7 @@
+     IRPLIB_INCLUDES='-I$(top_srcdir)/irplib'
+     # No -L for IRPLIB which is statically linked
+ 
+-    QF_INCLUDES='-I$(top_srcdir)/libqfits -I$(top_srcdir)/libqfits/src'
++    QF_INCLUDES=''
+     QF_LDFLAGS=""
+ 
+ 
+--- a/configure.ac
++++ b/configure.ac
+@@ -89,7 +89,7 @@
+ AC_CHECK_DECLS([setenv])
+ 
+ # Check for QFITS
+-#CPL_CHECK_QFITS
++CPL_CHECK_QFITS
+ 
+ # Check for CPL presence and usability
+ CPL_CHECK_LIBS
+@@ -108,7 +108,6 @@
+ #                uves/tests/Makefile
+ #                recipes/Makefile)
+ 
+-AC_CONFIG_SUBDIRS(libqfits)
+ 
+ AC_CONFIG_FILES(Makefile
+                 Makefile.purify
+--- a/flames/Makefile.am
++++ b/flames/Makefile.am
+@@ -23,8 +23,8 @@
+ 
+ SUBDIRS = . tests
+ 
+-LIBQFITS=$(top_builddir)/libqfits/src/libqfits.la
+-QFITS_INCLUDES = -I$(top_srcdir)/libqfits/src/
++LIBQFITS= -lqfits
++QFITS_INCLUDES =
+ 
+ 
+ if MAINTAINER_MODE
+--- a/uves/Makefile.am
++++ b/uves/Makefile.am
+@@ -23,8 +23,8 @@
+ 
+ SUBDIRS = . tests
+ 
+-LIBQFITS=$(top_builddir)/libqfits/src/libqfits.la
+-QFITS_INCLUDES = -I$(top_srcdir)/libqfits/src/
++LIBQFITS=-lqfits
++QFITS_INCLUDES =
+ 
+ 
+ if MAINTAINER_MODE
+--- a/uves/tests/Makefile.am
++++ b/uves/tests/Makefile.am
+@@ -30,7 +30,7 @@
+ 
+ AM_CPPFLAGS = $(all_includes)
+ 
+-LDADD = $(LIBUVES) $(LIBFLAMES) $(LIBCPLUI) $(LIBCPLCORE) $(LIBCEXT) $(LIBCFITSIO)
++LDADD = $(LIBUVES) $(LIBFLAMES) $(LIBCPLUI) $(LIBCPLCORE) $(LIBCEXT) $(LIBCFITSIO) -lqfits
+ LDFLAGS = $(CPL_LDFLAGS)
+ 
+ pkginclude_HEADERS =

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/cpl-plugin-uves.git