Commit a336d599 authored by Ole Streicher's avatar Ole Streicher

Use internal swarp

Closes: #832578

Dropped Use-system-provided-swarp-instead-of-convenience-copy.patch
parent 397c5915
......@@ -17,7 +17,7 @@ Vcs-Browser: https://anonscm.debian.org/cgit/debian-astro/packages/cpl-plugin-vi
Package: cpl-plugin-visir
Architecture: any
Depends: ${misc:Depends}, ${shlibs:Depends}, swarp
Depends: ${misc:Depends}, ${shlibs:Depends}
Recommends: esorex|python-cpl
Suggests: cpl-plugin-visir-calib, cpl-plugin-visir-doc
Multi-Arch: same
......
From: Ole Streicher <olebole@debian.org>
Date: Mon, 18 Jul 2016 21:17:04 +0200
Subject: Use system provided swarp instead of convenience copy
---
Makefile.am | 2 +-
acinclude.m4 | 4 ++--
configure.ac | 2 --
3 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 111a775..4de4d69 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -26,7 +26,7 @@ DISTCLEANFILES = *~
COMPILE_FIRST =
-TOPSUBDIRS = irplib visir recipes reflex swarp
+TOPSUBDIRS = irplib visir recipes reflex
COMPILE_LAST =
diff --git a/acinclude.m4 b/acinclude.m4
index c3c0110..c252a61 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -273,9 +273,9 @@ AC_DEFUN([VISIR_SET_PATHS],
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])
])
diff --git a/configure.ac b/configure.ac
index 3033c14..a0ceb9b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -14,8 +14,6 @@ AC_CONFIG_HEADERS([config.h])
AM_MAINTAINER_MODE([enable])
-AC_CONFIG_SUBDIRS([swarp])
-
VISIR_SET_PREFIX(${PIPE_HOME:-/usr/local})
# Immediately before every release do:
......@@ -2,4 +2,3 @@ Add-the-cpl-libraries-to-the-recips.so-and-the-test-progr.patch
Set-the-plugin-directory-so-that-esorex-and-python-cpl-ca.patch
Increase-tolerance-to-fix-FTBS-on-mips-mipsel64-and-ia64.patch
Force-serial-tests-to-get-better-verbose-output.patch
Use-system-provided-swarp-instead-of-convenience-copy.patch
......@@ -39,7 +39,6 @@ tar xf ${FILENAME} -C ${BASEDIR}
#rm -f ${BASEDIR}/${DEBIAN_PACKAGE}_${UVERSION}.orig*.tar.* ${FILENAME}
TAREXCLUDE="--exclude ${PIPELINE}-${VERSION}/html"
TAREXCLUDE=${TAREXCLUDE}" --exclude ${PIPELINE}-${VERSION}/swarp"
if [ $INCLUDE_TEST_DATA = "no" ] ; then
TAREXCLUDE=${TAREXCLUDE}" --exclude ${PIPELINE}-${VERSION}/*/tests/ref_data"
fi
......@@ -56,7 +55,7 @@ if [ $INCLUDE_CALIB = "no" ] ; then
rm -rf ${BASEDIR}/${PIPELINE}-${VERSION}/calib/cal
fi
tar cJf ${BASEDIR}/${DEBIAN_PACKAGE}_${VERSION}+dfsg.orig.tar.xz \
tar cJf ${BASEDIR}/${DEBIAN_PACKAGE}_${VERSION}+dfsg1.orig.tar.xz \
-C ${BASEDIR} ${PIPELINE}-${VERSION}/
rm -rf ${BASEDIR}/${PIPELINE}-${VERSION}/
......
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