[cpl-plugin-fors] 05/05: Adjust for new version

Fri Apr 11 14:27:36 UTC 2014

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

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

commit 9b3e075cb38f9f229c37cc817e95ceded855a1da
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Fri Apr 11 16:18:56 2014 +0200

    Adjust for new version
---
 debian/changelog                            |  7 +++++++
 debian/patches/disable_tests_libmosca.patch |  8 ++++----
 debian/patches/dont_build_sextractor.patch  | 25 +++++++++++++------------
 debian/patches/libadd_cpl.patch             |  8 --------
 debian/patches/private_libmosca.patch       | 14 --------------
 debian/patches/series                       |  1 -
 debian/patches/set_plugindir.patch          | 22 +++++++++++-----------
 debian/repackage.sh                         |  6 +++---
 8 files changed, 38 insertions(+), 53 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3f60b90..b2833ec 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+cpl-plugin-fors (4.12.8+dfsg-1) unstable; urgency=low
+
+  * New Upstream version
+  * Change maintainer and VCS location to debian-astro
+
+ -- Ole Streicher <debian at liska.ath.cx>  Fri, 11 Apr 2014 16:18:01 +0200
+
 cpl-plugin-fors (4.11.13+dfsg-1) unstable; urgency=low
 
   * New upstream version.
diff --git a/debian/patches/disable_tests_libmosca.patch b/debian/patches/disable_tests_libmosca.patch
index a1a0977..3286841 100644
--- a/debian/patches/disable_tests_libmosca.patch
+++ b/debian/patches/disable_tests_libmosca.patch
@@ -3,12 +3,12 @@ Description: The libmosca testsuite is buggy (driver problem),
  so we just disable it until it gets fixed.
 --- a/mosca/libmosca/tests/Makefile.am
 +++ b/mosca/libmosca/tests/Makefile.am
-@@ -36,7 +36,7 @@
- LDADD = $(LIBMOSCA) $(LIBCPLCORE) $(LIBCPLUI) \
+@@ -37,7 +37,7 @@
+ LDADD = $(HDRL_LIBS) $(LIBMOSCA) $(LIBCPLCORE) $(LIBCPLUI) \
  	$(BOOST_UNIT_TEST_FRAMEWORK_LIB)
  
--check_PROGRAMS = image_smooth-test flat_combine-test
-+#check_PROGRAMS = image_smooth-test flat_combine-test
+-check_PROGRAMS = image_smooth-test flat_combine-test fiera_config-test
++#check_PROGRAMS = image_smooth-test flat_combine-test fiera_config-test
  
  
  image_smooth_test_SOURCES = image_smooth-test.cpp
diff --git a/debian/patches/dont_build_sextractor.patch b/debian/patches/dont_build_sextractor.patch
index 01787aa..c28b185 100644
--- a/debian/patches/dont_build_sextractor.patch
+++ b/debian/patches/dont_build_sextractor.patch
@@ -12,20 +12,9 @@ Description: Use the system provided sextractor binary
  
  
  HTML_SUBDIRS = 
---- a/configure.ac
-+++ b/configure.ac
-@@ -89,8 +89,6 @@
- 
- FORS_SET_SEX_PREFIX
- 
--AC_CONFIG_SUBDIRS([sextractor])
--
- AC_CONFIG_FILES(Makefile
-                 doxygen/Doxyfile
-                 mosca/Makefile
 --- a/acinclude.m4
 +++ b/acinclude.m4
-@@ -162,7 +162,7 @@
+@@ -141,7 +141,7 @@
      # Define the preprocessor symbols for the sextractor executable
      # and the configuration files.
  
@@ -34,3 +23,15 @@ Description: Use the system provided sextractor binary
  
      AC_DEFINE_UNQUOTED(FORS_SEXTRACTOR_PATH, "$sext_bindir",
                         [Absolute path to the sextractor executable])
+--- a/configure.ac
++++ b/configure.ac
+@@ -92,9 +92,6 @@
+ 
+ FORS_SET_SEX_PREFIX
+ 
+-AC_CONFIG_SUBDIRS([sextractor])
+-
+-
+ AC_CONFIG_FILES(Makefile
+                 doxygen/Doxyfile
+                 mosca/Makefile
diff --git a/debian/patches/libadd_cpl.patch b/debian/patches/libadd_cpl.patch
index d064bf7..7b7edf5 100644
--- a/debian/patches/libadd_cpl.patch
+++ b/debian/patches/libadd_cpl.patch
@@ -17,11 +17,3 @@ Description: Add the cpl libraries to the recips.so and the test program
  libsimulate_la_DEPENDENCIES =
  
  
---- a/mosca/libmosca/Makefile.am
-+++ b/mosca/libmosca/Makefile.am
-@@ -93,4 +93,4 @@
- 
- #The -static is needed because in VLT machines, with LD_LIBRARY_PATH=/usrlib:/vlt..., the /usr/lib/libstdc++.so is chosen at runtime, which is the wrong version (it was compiled with /vlt/VLT2010/....). This will compile everything static for this library. Once DFS machines are VLT-free this can be removed.
- libmosca_la_LDFLAGS = -version-info 0:1:0 -static 
--libmosca_la_LIBADD =  -lm 
-+libmosca_la_LIBADD =  -lm $(LIBCPLCORE)
diff --git a/debian/patches/private_libmosca.patch b/debian/patches/private_libmosca.patch
deleted file mode 100644
index 79937fa..0000000
--- a/debian/patches/private_libmosca.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Author: Ole Streicher <debian at liska.ath.cx>
-Description: Make the "mosca" library private since it should only be used 
- by this pipeline.
---- a/mosca/libmosca/Makefile.am
-+++ b/mosca/libmosca/Makefile.am
-@@ -69,7 +69,7 @@
-  
- noinst_HEADERS =  
- 
--lib_LTLIBRARIES = libmosca.la
-+privatelib_LTLIBRARIES = libmosca.la
- 
- libmosca_la_SOURCES = detected_slits.cpp detected_slit.cpp \
-                       mosca_image.cpp \
diff --git a/debian/patches/series b/debian/patches/series
index 60f11ec..48b2e5c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,7 +2,6 @@ libadd_cpl.patch
 set_plugindir.patch
 use-std-paths-for-cpl.patch
 dont_build_sextractor.patch
-private_libmosca.patch
 disable_tests_libmosca.patch
 fix_test_fail.patch
 force-serial-tests.patch
diff --git a/debian/patches/set_plugindir.patch b/debian/patches/set_plugindir.patch
index 45fbd8e..deb75e1 100644
--- a/debian/patches/set_plugindir.patch
+++ b/debian/patches/set_plugindir.patch
@@ -2,16 +2,16 @@ Author: Ole Streicher <debian at liska.ath.cx>
 Description: Set the plugin directory so that esorex and python-cpl can find it.
 --- a/acinclude.m4
 +++ b/acinclude.m4
-@@ -105,7 +105,7 @@
+@@ -87,7 +87,7 @@
+ [
  
      if test -z "$plugindir"; then
- #        plugindir='${libdir}/${PACKAGE}/plugins/${PACKAGE}-${VERSION}'
 -        plugindir='${libdir}/esopipes-plugins/${PACKAGE}-${VERSION}'
 +        plugindir='${libdir}/cpl/plugins/${PACKAGE}-${VERSION}'
      fi
  
      if test -z "$privatelibdir"; then
-@@ -113,7 +113,7 @@
+@@ -95,7 +95,7 @@
      fi
  
      if test -z "$pipedocsdir"; then
@@ -20,7 +20,7 @@ Description: Set the plugin directory so that esorex and python-cpl can find it.
      fi
  
      htmldir='${pipedocsdir}/html'
-@@ -123,11 +123,11 @@
+@@ -105,11 +105,11 @@
  #    fi
  
      if test -z "$configdir"; then
@@ -34,16 +34,16 @@ Description: Set the plugin directory so that esorex and python-cpl can find it.
      fi
  
      if test -z "$wkfcopydir"; then
-@@ -149,7 +149,7 @@
- #    AC_DEFINE_UNQUOTED(FORS_PLUGIN_DIR, "${PACKAGE}/plugins",
- #                       [Plugin directory tree prefix])
+@@ -128,7 +128,7 @@
+ 
+     # Define a preprocesor symbol for the plugin search paths
  
 -    AC_DEFINE_UNQUOTED(FORS_PLUGIN_DIR,"esopipes-plugins", 
 +    AC_DEFINE_UNQUOTED(FORS_PLUGIN_DIR,"cpl/plugins",
                         [Plugin directory tree prefix])
  
      eval plugin_dir="$plugindir"
-@@ -162,7 +162,7 @@
+@@ -141,7 +141,7 @@
      # Define the preprocessor symbols for the sextractor executable
      # and the configuration files.
  
@@ -52,9 +52,9 @@ Description: Set the plugin directory so that esorex and python-cpl can find it.
  
      AC_DEFINE_UNQUOTED(FORS_SEXTRACTOR_PATH, "$sext_bindir",
                         [Absolute path to the sextractor executable])
---- a/reflex/ForsSpec.xml.in
-+++ b/reflex/ForsSpec.xml.in
-@@ -5926,7 +5926,7 @@
+--- a/reflex/fors_spec.xml.in
++++ b/reflex/fors_spec.xml.in
+@@ -6011,7 +6011,7 @@
      </entity>
      <entity name="DataOrganizer" class="org.eso.DataOrganizer">
          <display name="Data Organiser"/>
diff --git a/debian/repackage.sh b/debian/repackage.sh
index 5dce014..c3cb918 100755
--- a/debian/repackage.sh
+++ b/debian/repackage.sh
@@ -24,8 +24,8 @@ INCLUDE_CALIB="no"
 # Include test data?
 # If not, the test (fits) data are removed from the source package.
 # In this case, also the tests need to be adjusted.
-#INCLUDE_TEST_DATA="no"
-INCLUDE_TEST_DATA="yes"
+INCLUDE_TEST_DATA="no"
+#INCLUDE_TEST_DATA="yes"
 
 BASEDIR=$(dirname $3)
 FILENAME=${BASEDIR}/${PIPELINE}-kit-${VERSION}.tar.gz
@@ -34,7 +34,7 @@ rm -f ${BASEDIR}/${DEBIAN_PACKAGE}_${VERSION}.orig*.tar.* ${FILENAME}
 
 TAREXCLUDE="--exclude ${PIPELINE}-${VERSION}/html --exclude ${PIPELINE}-${VERSION}/sextractor"
 if [ $INCLUDE_TEST_DATA = "no" ] ; then
-  TAREXCLUDE=${TAREXCLUDE}" --exclude ${PIPELINE}-${VERSION}/*/tests/ref_data"
+  TAREXCLUDE=${TAREXCLUDE}" --exclude ${PIPELINE}-${VERSION}/*/tests/data"
 fi
 
 tar xf ${BASEDIR}/${PIPELINE}-kit-${VERSION}/${PIPELINE}-${VERSION}.tar.gz\

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

