Commit a4a18fc4 authored by Ole Streicher's avatar Ole Streicher

Depend on swarp (convenience copy removed from tarball)

parent 4d1ea771
cpl-plugin-visir (4.1.0+dfsg-1) unstable; urgency=low
* New upstream version
* Depend on swarp (convenience copy removed from tarball).
-- Ole Streicher <olebole@debian.org> Mon, 21 Dec 2015 11:25:30 +0100
cpl-plugin-visir (3.5.1+dfsg-4) unstable; urgency=low cpl-plugin-visir (3.5.1+dfsg-4) unstable; urgency=low
* Reproducibly sort recipes in manpage SEEALSO output. * Reproducibly sort recipes in manpage SEEALSO output.
......
...@@ -17,7 +17,7 @@ Vcs-Browser: http://anonscm.debian.org/gitweb/?p=debian-astro/packages/cpl-plugi ...@@ -17,7 +17,7 @@ Vcs-Browser: http://anonscm.debian.org/gitweb/?p=debian-astro/packages/cpl-plugi
Package: cpl-plugin-visir Package: cpl-plugin-visir
Architecture: any Architecture: any
Depends: ${misc:Depends}, ${shlibs:Depends} Depends: ${misc:Depends}, ${shlibs:Depends}, swarp
Recommends: esorex|python-cpl Recommends: esorex|python-cpl
Suggests: cpl-plugin-visir-calib, cpl-plugin-visir-doc Suggests: cpl-plugin-visir-calib, cpl-plugin-visir-doc
Multi-Arch: same Multi-Arch: same
......
...@@ -2,3 +2,4 @@ libadd_cpl.patch ...@@ -2,3 +2,4 @@ libadd_cpl.patch
set_plugindir.patch set_plugindir.patch
fix_test_fail.patch fix_test_fail.patch
force-serial-tests.patch force-serial-tests.patch
system-swarp.patch
Author: Ole Streicher <olebole@debian.org>
Description: Use system provided swarp instead of convenience copy
--- a/Makefile.am
+++ b/Makefile.am
@@ -26,7 +26,7 @@
COMPILE_FIRST =
-TOPSUBDIRS = irplib visir recipes reflex swarp
+TOPSUBDIRS = irplib visir recipes reflex
COMPILE_LAST =
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -273,9 +273,9 @@
AC_DEFINE_UNQUOTED(VISIR_CONFIG_PATH, "$config_dir",
[Absolute path to the config data directory])
- eval swarp_bin="${private_libdir}/bin/swarp"
+ eval swarp_bin="swarp"
AC_DEFINE_UNQUOTED(VISIR_SWARP_BIN, "$swarp_bin",
- [Absolute path to the swarp binary])
+ [The swarp binary])
])
--- a/configure.ac
+++ b/configure.ac
@@ -14,8 +14,6 @@
AM_MAINTAINER_MODE([enable])
-AC_CONFIG_SUBDIRS([swarp])
-
VISIR_SET_PREFIX(${PIPE_HOME:-/usr/local})
# Immediately before every release do:
...@@ -39,6 +39,7 @@ tar xf ${FILENAME} -C ${BASEDIR} ...@@ -39,6 +39,7 @@ tar xf ${FILENAME} -C ${BASEDIR}
rm -f ${BASEDIR}/${DEBIAN_PACKAGE}_${UVERSION}.orig*.tar.* ${FILENAME} rm -f ${BASEDIR}/${DEBIAN_PACKAGE}_${UVERSION}.orig*.tar.* ${FILENAME}
TAREXCLUDE="--exclude ${PIPELINE}-${VERSION}/html" TAREXCLUDE="--exclude ${PIPELINE}-${VERSION}/html"
TAREXCLUDE=${TAREXCLUDE}" --exclude ${PIPELINE}-${VERSION}/swarp"
if [ $INCLUDE_TEST_DATA = "no" ] ; then if [ $INCLUDE_TEST_DATA = "no" ] ; then
TAREXCLUDE=${TAREXCLUDE}" --exclude ${PIPELINE}-${VERSION}/*/tests/ref_data" TAREXCLUDE=${TAREXCLUDE}" --exclude ${PIPELINE}-${VERSION}/*/tests/ref_data"
fi fi
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment