[cpl-plugin-vimos] 14/17: Remove sextractor and psfex from sources

[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 1f9cb1ffd64390707f76e6e25a3196d0a3acb8b0
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Tue Dec 10 14:42:41 2013 +0100

    Remove sextractor and psfex from sources
---
 debian/changelog                           | 2 +-
 debian/patches/dont_build_sextractor.patch | 9 +++++++--
 debian/repackage.sh                        | 2 ++
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c93912c..b2427dd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-cpl-plugin-vimos (2.9.9-1) unstable; urgency=low
+cpl-plugin-vimos (2.9.9+dfsg-1) unstable; urgency=low
 
   * Initial release. (Closes: #728894)
 
diff --git a/debian/patches/dont_build_sextractor.patch b/debian/patches/dont_build_sextractor.patch
index a6c3dce..4344e41 100644
--- a/debian/patches/dont_build_sextractor.patch
+++ b/debian/patches/dont_build_sextractor.patch
@@ -3,15 +3,20 @@ Description: Use the system provided sextractor binary
  instead of the convenience copy
 --- a/external/Makefile.am
 +++ b/external/Makefile.am
-@@ -24,7 +24,7 @@
+@@ -24,10 +24,10 @@
  
  COMPILE_FIRST =
  
 -TOPSUBDIRS = libwcs sextractor
 +TOPSUBDIRS = libwcs
  
- COMPILE_LAST = $(PSFEXDIR)
+-COMPILE_LAST = $(PSFEXDIR)
++COMPILE_LAST =
  
+ SUBDIRS = $(COMPILE_FIRST) $(TOPSUBDIRS) $(COMPILE_LAST)
+ 
+-DIST_SUBDIRS = $(COMPILE_FIRST) $(TOPSUBDIRS) psfex
++DIST_SUBDIRS = $(COMPILE_FIRST) $(TOPSUBDIRS)
 --- a/acinclude.m4
 +++ b/acinclude.m4
 @@ -158,7 +158,7 @@
diff --git a/debian/repackage.sh b/debian/repackage.sh
index 1eddf38..d7b3f41 100755
--- a/debian/repackage.sh
+++ b/debian/repackage.sh
@@ -33,6 +33,8 @@ tar xf ${FILENAME} -C ${BASEDIR}
 rm -f ${BASEDIR}/${DEBIAN_PACKAGE}_${VERSION}.orig*.tar.* ${FILENAME}
 
 TAREXCLUDE="--exclude ${PIPELINE}-${VERSION}/html"
+TAREXCLUDE=${TAREXCLUDE}" --exclude ${PIPELINE}-${VERSION}/external/sextractor"
+TAREXCLUDE=${TAREXCLUDE}" --exclude ${PIPELINE}-${VERSION}/external/psfex"
 if [ $INCLUDE_TEST_DATA = "no" ] ; then
   TAREXCLUDE=${TAREXCLUDE}" --exclude ${PIPELINE}-${VERSION}/*/tests/ref_data"
 fi

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