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

[Ole Streicher]

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

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

commit 8cf5c05dcb2481e2b7593a276b0c2397d6a20bf1
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Tue Feb 10 11:58:50 2015 +0100

    Adjust for new version
---
 debian/changelog                  |  4 ++--
 debian/patches/libadd_cpl.patch   | 20 +++++++-------------
 debian/patches/no_test_data.patch |  2 +-
 debian/patches/spellfix.patch     | 22 ----------------------
 4 files changed, 10 insertions(+), 38 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9bd265c..2a2122f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-cpl-plugin-kmos (1.3.8+dfsg-1) UNRELEASED; urgency=low
+cpl-plugin-kmos (1.3.9+dfsg-1) UNRELEASED; urgency=low
 
   * New upstream version
   * Update standards version to 3.9.6. No changes needed.
 
- -- Ole Streicher <olebole at debian.org>  Thu, 04 Dec 2014 11:38:22 +0100
+ -- Ole Streicher <debian at liska.ath.cx>  Tue, 10 Feb 2015 11:58:14 +0100
 
 cpl-plugin-kmos (1.3.5+dfsg-1) unstable; urgency=low
 
diff --git a/debian/patches/libadd_cpl.patch b/debian/patches/libadd_cpl.patch
index 2cd000a..0ebac15 100644
--- a/debian/patches/libadd_cpl.patch
+++ b/debian/patches/libadd_cpl.patch
@@ -2,7 +2,7 @@ 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
-@@ -58,127 +58,127 @@
+@@ -57,122 +57,122 @@
                       kmos_sky_tweak.la 
  
  kmo_arithmetic_la_SOURCES = kmo_arithmetic.c
@@ -17,12 +17,6 @@ Description: Add the cpl libraries to the recips.so and the test program
  kmo_combine_la_LDFLAGS = -module -avoid-version
  kmo_combine_la_DEPENDENCIES = $(LIBKMOS)
   
- kmo_multi_reconstruct_la_SOURCES = kmo_multi_reconstruct.c
--kmo_multi_reconstruct_la_LIBADD = $(LIBKMOS)
-+kmo_multi_reconstruct_la_LIBADD = $(LIBKMOS) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- kmo_multi_reconstruct_la_LDFLAGS = -module -avoid-version
- kmo_multi_reconstruct_la_DEPENDENCIES = $(LIBKMOS)
-  
  kmo_copy_la_SOURCES = kmo_copy.c
 -kmo_copy_la_LIBADD = $(LIBKMOS)
 +kmo_copy_la_LIBADD = $(LIBKMOS) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLDRS) $(LIBCPLUI)
@@ -113,12 +107,6 @@ Description: Add the cpl libraries to the recips.so and the test program
  kmo_std_star_la_LDFLAGS = -module -avoid-version
  kmo_std_star_la_DEPENDENCIES = $(LIBKMOS)
  
- kmo_sci_red_la_SOURCES = kmo_sci_red.c
--kmo_sci_red_la_LIBADD = $(LIBKMOS)
-+kmo_sci_red_la_LIBADD = $(LIBKMOS) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- kmo_sci_red_la_LDFLAGS = -module -avoid-version
- kmo_sci_red_la_DEPENDENCIES = $(LIBKMOS)
- 
  kmo_fits_strip_la_SOURCES = kmo_fits_strip.c
 -kmo_fits_strip_la_LIBADD = $(LIBKMOS)
 +kmo_fits_strip_la_LIBADD = $(LIBKMOS) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
@@ -149,6 +137,12 @@ Description: Add the cpl libraries to the recips.so and the test program
  kmos_illumination_la_LDFLAGS = -module -avoid-version
  kmos_illumination_la_DEPENDENCIES = $(LIBKMOS)
  
+ kmos_sci_red_la_SOURCES = kmos_sci_red.c
+-kmos_sci_red_la_LIBADD = $(LIBKMOS)
++kmos_sci_red_la_LIBADD = $(LIBKMOS) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
+ kmos_sci_red_la_LDFLAGS = -module -avoid-version
+ kmos_sci_red_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)
diff --git a/debian/patches/no_test_data.patch b/debian/patches/no_test_data.patch
index 9f90ba3..ff7f825 100644
--- a/debian/patches/no_test_data.patch
+++ b/debian/patches/no_test_data.patch
@@ -34,7 +34,7 @@ Description: Disable tests that require test data from the ref_data subdir
                  kmo_priv_rotate-test \
                  kmo_priv_shift-test \
                  kmo_priv_sky_mask-test \
--                kmo_priv_sky_tweak-test \
+-                kmos_priv_sky_tweak-test \
                  kmo_priv_stats-test \
 -                kmo_priv_std_star-test \
 -                kmo_priv_wave_cal-test \
diff --git a/debian/patches/spellfix.patch b/debian/patches/spellfix.patch
index e2da2f2..dabd571 100644
--- a/debian/patches/spellfix.patch
+++ b/debian/patches/spellfix.patch
@@ -29,28 +29,6 @@ Description: Remove several small spelling errors
                                                 i+1, frame_filename);
                              }
                          } // end if valid_data
---- a/recipes/kmo_multi_reconstruct.c
-+++ b/recipes/kmo_multi_reconstruct.c
-@@ -159,7 +159,7 @@
- "   differ, but the orientation must be the same for all exposures.\n"
- "\n"
- "   * 'none'\n"
--"   The cubes are directly recombined, not shifting at all. The ouput frame\n"
-+"   The cubes are directly recombined, not shifting at all. The output frame\n"
- "   will have the same dimensions as the input cubes.\n"
- "   If the size differs a warning will be emitted and the cubes will be aligned\n"
- "   to the lower left corner. If the orientation differs a warning will be\n"
---- a/recipes/kmo_sci_red.c
-+++ b/recipes/kmo_sci_red.c
-@@ -201,7 +201,7 @@
- "   exposures.\n"
- "\n"
- "   * 'none'\n"
--"   The cubes are directly recombined, not shifting at all. The ouput frame\n"
-+"   The cubes are directly recombined, not shifting at all. The output frame\n"
- "   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/kmos_wave_cal.c
 +++ b/recipes/kmos_wave_cal.c
 @@ -95,7 +95,7 @@

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