[cpl-plugin-vimos] 01/03: Use Debian provided sextractor image

[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-vimos.

commit 3dbd005f396d8909fab38feca47062cede9bb238
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Thu Nov 7 11:38:40 2013 +0100

    Use Debian provided sextractor image
---
 debian/control                             |    2 +-
 debian/patches/dont_build_sextractor.patch |   33 ++++++++++++++++++++++++++++
 debian/patches/series                      |    1 +
 3 files changed, 35 insertions(+), 1 deletion(-)

diff --git a/debian/control b/debian/control
index d598173..2c0a8f9 100644
--- a/debian/control
+++ b/debian/control
@@ -18,7 +18,7 @@ Vcs-Browser: http://git.debian.org/?p=debian-science/packages/cpl-plugin-vimos.g
 Package: cpl-plugin-vimos
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}
-Recommends: esorex|python-cpl
+Recommends: esorex|python-cpl, sextractor
 Suggests: cpl-plugin-vimos-calib
 Multi-Arch: same
 Description: ESO data reduction pipeline vimos
diff --git a/debian/patches/dont_build_sextractor.patch b/debian/patches/dont_build_sextractor.patch
new file mode 100644
index 0000000..1934998
--- /dev/null
+++ b/debian/patches/dont_build_sextractor.patch
@@ -0,0 +1,33 @@
+--- a/external/Makefile.am
++++ b/external/Makefile.am
+@@ -24,7 +24,7 @@
+ 
+ COMPILE_FIRST =
+ 
+-TOPSUBDIRS = libwcs sextractor
++TOPSUBDIRS = libwcs
+ 
+ COMPILE_LAST = $(PSFEXDIR)
+ 
+--- a/acinclude.m4
++++ b/acinclude.m4
+@@ -158,7 +158,7 @@
+     # Define the preprocessor symbols for the sextractor executable
+     # and the configuration files.
+ 
+-    eval sext_bindir="${prefix}/lib/${PACKAGE}-${VERSION}/bin"
++    eval sext_bindir="/usr/bin"
+ 
+     AC_DEFINE_UNQUOTED(VIMOS_SEXTRACTOR_PATH, "$sext_bindir",
+                        [Absolute path to the sextractor executable])
+--- a/configure.ac
++++ b/configure.ac
+@@ -114,7 +114,7 @@
+ 
+ VIMOS_SET_SEX_PREFIX
+ 
+-AC_CONFIG_SUBDIRS(external/sextractor external/psfex)
++AC_CONFIG_SUBDIRS(external/psfex)
+ 
+ AC_CONFIG_FILES(Makefile
+                 Makefile.purify
diff --git a/debian/patches/series b/debian/patches/series
index 6fa09f7..14b621d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@ set_plugindir.patch
 use-std-paths-for-cpl.patch
 fix_compiler_errors.patch
 private_libpil.patch
+dont_build_sextractor.patch

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