[cpl-plugin-kmos] 02/02: Add patches for new version

Fri Jul 25 12:41:46 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-kmos.

commit 36264990e98e09fb8596f296762ff8b7c97c2fce
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Fri Jul 25 14:32:53 2014 +0200

    Add patches for new version
---
 debian/changelog                           |  6 +++
 debian/patches/fix_test_fail.patch         |  6 ++-
 debian/patches/force-serial-tests.patch    | 18 ++++++---
 debian/patches/fortify.patch               |  6 ++-
 debian/patches/kmclipm_disable_test.patch  |  6 ++-
 debian/patches/libadd_cpl.patch            | 64 +++++++++++++++++-------------
 debian/patches/no_test_data.patch          |  6 ++-
 debian/patches/set_plugindir.patch         |  6 ++-
 debian/patches/spellfix.patch              |  6 +--
 debian/patches/use-std-paths-for-cpl.patch |  6 ++-
 10 files changed, 81 insertions(+), 49 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index eea044c..aee7db8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+cpl-plugin-kmos (1.3.4+dfsg-1) unstable; urgency=low
+
+  * New upstream version
+
+ -- Ole Streicher <debian at liska.ath.cx>  Fri, 25 Jul 2014 14:32:19 +0200
+
 cpl-plugin-kmos (1.3.3+dfsg-1) unstable; urgency=low
 
   * New upstream version
diff --git a/debian/patches/fix_test_fail.patch b/debian/patches/fix_test_fail.patch
index 3fdc536..c717083 100644
--- a/debian/patches/fix_test_fail.patch
+++ b/debian/patches/fix_test_fail.patch
@@ -1,7 +1,9 @@
 Author: Ole Streicher <debian at liska.ath.cx>
 Description: Increase tolerance to fix FTBS on mips and ia64
---- a/irplib/tests/irplib_polynomial-test.c
-+++ b/irplib/tests/irplib_polynomial-test.c
+Index: kmos/irplib/tests/irplib_polynomial-test.c
+===================================================================
+--- kmos.orig/irplib/tests/irplib_polynomial-test.c	2014-07-25 14:29:01.674611756 +0200
++++ kmos/irplib/tests/irplib_polynomial-test.c	2014-07-25 14:29:01.674611756 +0200
 @@ -576,7 +576,7 @@
      for (i = nreal; i < degree; i++) {
          const double root = cpl_vector_get(roots, i);
diff --git a/debian/patches/force-serial-tests.patch b/debian/patches/force-serial-tests.patch
index 6b44d92..96e61b7 100644
--- a/debian/patches/force-serial-tests.patch
+++ b/debian/patches/force-serial-tests.patch
@@ -1,8 +1,10 @@
 Author: Ole Streicher <debian at liska.ath.cx>
 Description: Force serial-tests to get better verbose output
 Bug: http://bugs.debian.org/715204
---- a/kmos/tests/Makefile.am
-+++ b/kmos/tests/Makefile.am
+Index: kmos/kmos/tests/Makefile.am
+===================================================================
+--- kmos.orig/kmos/tests/Makefile.am	2014-07-25 14:29:05.394611874 +0200
++++ kmos/kmos/tests/Makefile.am	2014-07-25 14:29:05.370611874 +0200
 @@ -17,7 +17,7 @@
  ##   along with this program; if not, write to the Free Software
  ##   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
@@ -12,8 +14,10 @@ Bug: http://bugs.debian.org/715204
  
  DISTCLEANFILES = *~
  
---- a/regtests/tests/Makefile.am
-+++ b/regtests/tests/Makefile.am
+Index: kmos/regtests/tests/Makefile.am
+===================================================================
+--- kmos.orig/regtests/tests/Makefile.am	2014-07-25 14:29:05.394611874 +0200
++++ kmos/regtests/tests/Makefile.am	2014-07-25 14:29:05.370611874 +0200
 @@ -17,7 +17,7 @@
  ##   along with this program; if not, write to the Free Software
  ##   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
@@ -23,8 +27,10 @@ Bug: http://bugs.debian.org/715204
  
  DISTCLEANFILES = *~
  
---- a/irplib/tests/Makefile.am
-+++ b/irplib/tests/Makefile.am
+Index: kmos/irplib/tests/Makefile.am
+===================================================================
+--- kmos.orig/irplib/tests/Makefile.am	2014-07-25 14:29:05.394611874 +0200
++++ kmos/irplib/tests/Makefile.am	2014-07-25 14:29:05.370611874 +0200
 @@ -17,7 +17,7 @@
  ##   along with this program; if not, write to the Free Software
  ##   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02111-1307  USA
diff --git a/debian/patches/fortify.patch b/debian/patches/fortify.patch
index e36929e..cf81edf 100644
--- a/debian/patches/fortify.patch
+++ b/debian/patches/fortify.patch
@@ -1,7 +1,9 @@
 Author: Ole Streicher <debian at liska.ath.cx>
 Description: Replace strcat calls with size checked strncat calls
---- a/recipes/kmo_stats.c
-+++ b/recipes/kmo_stats.c
+Index: kmos/recipes/kmo_stats.c
+===================================================================
+--- kmos.orig/recipes/kmo_stats.c	2014-07-25 14:27:46.558609370 +0200
++++ kmos/recipes/kmo_stats.c	2014-07-25 14:27:46.554609370 +0200
 @@ -848,9 +848,10 @@
                      sub_header = kmo_dfs_load_sub_header(frameset, STATS, extnr,
                                                           FALSE));
diff --git a/debian/patches/kmclipm_disable_test.patch b/debian/patches/kmclipm_disable_test.patch
index bad682c..71867b3 100644
--- a/debian/patches/kmclipm_disable_test.patch
+++ b/debian/patches/kmclipm_disable_test.patch
@@ -2,8 +2,10 @@ Author; Ole Streicher <debian at liska.ath.cx>
 Description: Disable priv_reconstruct patch on mips.
  This test takes ages on MIPS and goes beyound the time limits of the buildd without
  gaining anything.
---- a/kmclipm/test/Makefile.am
-+++ b/kmclipm/test/Makefile.am
+Index: kmos/kmclipm/test/Makefile.am
+===================================================================
+--- kmos.orig/kmclipm/test/Makefile.am	2014-07-25 14:29:08.022611958 +0200
++++ kmos/kmclipm/test/Makefile.am	2014-07-25 14:29:08.018611958 +0200
 @@ -39,14 +39,7 @@
  
  noinst_HEADERS =
diff --git a/debian/patches/libadd_cpl.patch b/debian/patches/libadd_cpl.patch
index 8adca45..3400b50 100644
--- a/debian/patches/libadd_cpl.patch
+++ b/debian/patches/libadd_cpl.patch
@@ -1,9 +1,11 @@
 Author: Ole Streicher <debian at liska.ath.cx>
 Description: Add the cpl libraries to the recips.so and the test program
---- a/recipes/Makefile.am
-+++ b/recipes/Makefile.am
-@@ -59,122 +59,122 @@
-                      kmos_wave_cal.la 
+Index: kmos/recipes/Makefile.am
+===================================================================
+--- kmos.orig/recipes/Makefile.am	2014-07-25 14:24:17.754602736 +0200
++++ kmos/recipes/Makefile.am	2014-07-25 14:26:55.474607747 +0200
+@@ -58,127 +58,127 @@
+                      kmos_gen_reflines.la
  
  kmo_arithmetic_la_SOURCES = kmo_arithmetic.c
 -kmo_arithmetic_la_LIBADD = $(LIBKMOS)
@@ -95,36 +97,12 @@ Description: Add the cpl libraries to the recips.so and the test program
  kmo_stats_la_LDFLAGS = -module -avoid-version
  kmo_stats_la_DEPENDENCIES = $(LIBKMOS)
   
- kmo_dark_la_SOURCES = kmo_dark.c
--kmo_dark_la_LIBADD = $(LIBKMOS)
-+kmo_dark_la_LIBADD = $(LIBKMOS) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- kmo_dark_la_LDFLAGS = -module -avoid-version
- kmo_dark_la_DEPENDENCIES = $(LIBKMOS)
-  
- kmo_flat_la_SOURCES = kmo_flat.c
--kmo_flat_la_LIBADD = $(LIBKMOS)
-+kmo_flat_la_LIBADD = $(LIBKMOS) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- kmo_flat_la_LDFLAGS = -module -avoid-version
- kmo_flat_la_DEPENDENCIES = $(LIBKMOS)
-  
- kmo_wave_cal_la_SOURCES = kmo_wave_cal.c
--kmo_wave_cal_la_LIBADD = $(LIBKMOS)
-+kmo_wave_cal_la_LIBADD = $(LIBKMOS) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- kmo_wave_cal_la_LDFLAGS = -module -avoid-version
- kmo_wave_cal_la_DEPENDENCIES = $(LIBKMOS)
- 
  kmo_reconstruct_la_SOURCES = kmo_reconstruct.c
 -kmo_reconstruct_la_LIBADD = $(LIBKMOS)
 +kmo_reconstruct_la_LIBADD = $(LIBKMOS) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
  kmo_reconstruct_la_LDFLAGS = -module -avoid-version
  kmo_reconstruct_la_DEPENDENCIES = $(LIBKMOS)
   
- kmo_illumination_la_SOURCES = kmo_illumination.c
--kmo_illumination_la_LIBADD = $(LIBKMOS)
-+kmo_illumination_la_LIBADD = $(LIBKMOS) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- kmo_illumination_la_LDFLAGS = -module -avoid-version
- kmo_illumination_la_DEPENDENCIES = $(LIBKMOS)
- 
  kmo_illumination_flat_la_SOURCES = kmo_illumination_flat.c
 -kmo_illumination_flat_la_LIBADD = $(LIBKMOS)
 +kmo_illumination_flat_la_LIBADD = $(LIBKMOS) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
@@ -149,3 +127,33 @@ Description: Add the cpl libraries to the recips.so and the test program
  kmo_fits_strip_la_LDFLAGS = -module -avoid-version
  kmo_fits_strip_la_DEPENDENCIES = $(LIBKMOS)
   
+ kmos_dark_la_SOURCES = kmos_dark.c
+-kmos_dark_la_LIBADD = $(LIBKMOS)
++kmos_dark_la_LIBADD = $(LIBKMOS) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
+ kmos_dark_la_LDFLAGS = -module -avoid-version
+ kmos_dark_la_DEPENDENCIES = $(LIBKMOS)
+ 
+ kmos_flat_la_SOURCES = kmos_flat.c
+-kmos_flat_la_LIBADD = $(LIBKMOS)
++kmos_flat_la_LIBADD = $(LIBKMOS) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
+ kmos_flat_la_LDFLAGS = -module -avoid-version
+ kmos_flat_la_DEPENDENCIES = $(LIBKMOS)
+ 
+ kmos_wave_cal_la_SOURCES = kmos_wave_cal.c
+-kmos_wave_cal_la_LIBADD = $(LIBKMOS)
++kmos_wave_cal_la_LIBADD = $(LIBKMOS) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
+ kmos_wave_cal_la_LDFLAGS = -module -avoid-version
+ kmos_wave_cal_la_DEPENDENCIES = $(LIBKMOS)
+ 
+ kmos_illumination_la_SOURCES = kmos_illumination.c
+-kmos_illumination_la_LIBADD = $(LIBKMOS)
++kmos_illumination_la_LIBADD = $(LIBKMOS) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
+ kmos_illumination_la_LDFLAGS = -module -avoid-version
+ kmos_illumination_la_DEPENDENCIES = $(LIBKMOS)
+ 
+ kmos_gen_reflines_la_SOURCES = kmos_gen_reflines.c
+-kmos_gen_reflines_la_LIBADD = $(LIBKMOS)
++kmos_gen_reflines_la_LIBADD = $(LIBKMOS) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
+ kmos_gen_reflines_la_LDFLAGS = -module -avoid-version
+ kmos_gen_reflines_la_DEPENDENCIES = $(LIBKMOS)
+ 
diff --git a/debian/patches/no_test_data.patch b/debian/patches/no_test_data.patch
index 9f90ba3..d3070e4 100644
--- a/debian/patches/no_test_data.patch
+++ b/debian/patches/no_test_data.patch
@@ -1,8 +1,10 @@
 Author: Ole Streicher <debian at liska.ath.cx>
 Description: Disable tests that require test data from the ref_data subdir
  These data were removed from the tar file due to their huge size.
---- a/kmos/tests/Makefile.am
-+++ b/kmos/tests/Makefile.am
+Index: kmos/kmos/tests/Makefile.am
+===================================================================
+--- kmos.orig/kmos/tests/Makefile.am	2014-07-25 14:27:44.766609313 +0200
++++ kmos/kmos/tests/Makefile.am	2014-07-25 14:27:44.762609313 +0200
 @@ -21,7 +21,7 @@
  
  DISTCLEANFILES = *~
diff --git a/debian/patches/set_plugindir.patch b/debian/patches/set_plugindir.patch
index a3dd429..4476916 100644
--- a/debian/patches/set_plugindir.patch
+++ b/debian/patches/set_plugindir.patch
@@ -1,7 +1,9 @@
 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
+Index: kmos/acinclude.m4
+===================================================================
+--- kmos.orig/acinclude.m4	2014-07-25 14:27:39.370609142 +0200
++++ kmos/acinclude.m4	2014-07-25 14:27:39.370609142 +0200
 @@ -84,15 +84,15 @@
  AC_DEFUN([KMOS_SET_PATHS],
  [
diff --git a/debian/patches/spellfix.patch b/debian/patches/spellfix.patch
index dd60a34..49ec30d 100644
--- a/debian/patches/spellfix.patch
+++ b/debian/patches/spellfix.patch
@@ -51,9 +51,9 @@ Description: Remove several small spelling errors
  "   will have the same dimensions as the input cubes.\n"
  "   If the size differs a warning will be emitted and the cubes will be\n"
  "   aligned to the lower left corner. If the orientation differs a warning\n"
---- a/recipes/kmo_wave_cal.c
-+++ b/recipes/kmo_wave_cal.c
-@@ -91,7 +91,7 @@
+--- a/recipes/kmos_wave_cal.c
++++ b/recipes/kmos_wave_cal.c
+@@ -95,7 +95,7 @@
  "-----------------\n"
  "--order\n"
  "The polynomial order to use for the fit of the wavelength solution.\n"
diff --git a/debian/patches/use-std-paths-for-cpl.patch b/debian/patches/use-std-paths-for-cpl.patch
index f768445..cabe639 100644
--- a/debian/patches/use-std-paths-for-cpl.patch
+++ b/debian/patches/use-std-paths-for-cpl.patch
@@ -1,7 +1,9 @@
 Author: Ole Streicher <debian at liska.ath.cx>
 Description: Use standard path and name for cpl
---- a/m4macros/cpl.m4
-+++ b/m4macros/cpl.m4
+Index: kmos/m4macros/cpl.m4
+===================================================================
+--- kmos.orig/m4macros/cpl.m4	2014-07-25 14:27:42.982609256 +0200
++++ kmos/m4macros/cpl.m4	2014-07-25 14:27:42.978609256 +0200
 @@ -9,7 +9,7 @@
          
      cpl_cfitsio_check_version="$1"

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

