[Debian-astro-commits] [cpl-plugin-kmos] 01/01: Adjust patches 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 6875fc2b82bdb27bc0231ac98e881da2773710f8
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Wed Oct 14 10:08:40 2015 +0200

    Adjust patches for new version
---
 debian/changelog                |  6 ++++++
 debian/patches/libadd_cpl.patch | 20 +++++++++++++-------
 debian/patches/spellfix.patch   | 29 -----------------------------
 3 files changed, 19 insertions(+), 36 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1b460c2..d3bb22b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+cpl-plugin-kmos (1.3.14+dfsg-1) unstable; urgency=low
+
+  * New upstream version
+
+ -- Ole Streicher <olebole at debian.org>  Tue, 13 Oct 2015 16:19:09 +0200
+
 cpl-plugin-kmos (1.3.13+dfsg-1) unstable; urgency=low
 
   * New upstream version
diff --git a/debian/patches/libadd_cpl.patch b/debian/patches/libadd_cpl.patch
index 611bb87..4e2bf0e 100644
--- a/debian/patches/libadd_cpl.patch
+++ b/debian/patches/libadd_cpl.patch
@@ -2,7 +2,7 @@ Author: Ole Streicher <olebole at debian.org>
 Description: Add the cpl libraries to the recips.so and the test program
 --- a/recipes/Makefile.am
 +++ b/recipes/Makefile.am
-@@ -57,122 +57,122 @@
+@@ -58,127 +58,127 @@
                       kmos_sky_tweak.la 
  
  kmo_arithmetic_la_SOURCES = kmo_arithmetic.c
@@ -11,12 +11,6 @@ Description: Add the cpl libraries to the recips.so and the test program
  kmo_arithmetic_la_LDFLAGS = -module -avoid-version
  kmo_arithmetic_la_DEPENDENCIES = $(LIBKMOS)
   
- kmo_combine_la_SOURCES = kmo_combine.c
--kmo_combine_la_LIBADD = $(LIBKMOS)
-+kmo_combine_la_LIBADD = $(LIBKMOS) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- kmo_combine_la_LDFLAGS = -module -avoid-version
- kmo_combine_la_DEPENDENCIES = $(LIBKMOS)
-  
  kmo_copy_la_SOURCES = kmo_copy.c
 -kmo_copy_la_LIBADD = $(LIBKMOS)
 +kmo_copy_la_LIBADD = $(LIBKMOS) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLDRS) $(LIBCPLUI)
@@ -101,6 +95,18 @@ Description: Add the cpl libraries to the recips.so and the test program
  kmos_reconstruct_la_LDFLAGS = -module -avoid-version
  kmos_reconstruct_la_DEPENDENCIES = $(LIBKMOS)
   
+ kmos_test_la_SOURCES = kmos_test.c
+-kmos_test_la_LIBADD = $(LIBKMOS)
++kmos_test_la_LIBADD = $(LIBKMOS) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
+ kmos_test_la_LDFLAGS = -module -avoid-version
+ kmos_test_la_DEPENDENCIES = $(LIBKMOS)
+ 
+ kmos_combine_la_SOURCES = kmos_combine.c
+-kmos_combine_la_LIBADD = $(LIBKMOS)
++kmos_combine_la_LIBADD = $(LIBKMOS) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
+ kmos_combine_la_LDFLAGS = -module -avoid-version
+ kmos_combine_la_DEPENDENCIES = $(LIBKMOS)
+  
  kmos_dark_la_SOURCES = kmos_dark.c
 -kmos_dark_la_LIBADD = $(LIBKMOS)
 +kmos_dark_la_LIBADD = $(LIBKMOS) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
diff --git a/debian/patches/spellfix.patch b/debian/patches/spellfix.patch
index ae8e322..dd1daec 100644
--- a/debian/patches/spellfix.patch
+++ b/debian/patches/spellfix.patch
@@ -1,34 +1,5 @@
 Author: Ole Streicher <olebole at debian.org>
 Description: Remove several small spelling errors
---- a/recipes/kmo_combine.c
-+++ b/recipes/kmo_combine.c
-@@ -93,7 +93,7 @@
- "--method\n"
- "There are following sources to get the shift parameters from:\n"
- "   * 'none' (default)\n"
--"   The cubes are directly recombined, not shifting at all. The ouput frame will\n"
-+"   The cubes are directly recombined, not shifting at all. The output frame will\n"
- "   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 emit-\n"
-@@ -819,7 +819,7 @@
-                                 KMO_TRY_ASSURE(data_cube_counter == noise_cube_counter,
-                                                CPL_ERROR_ILLEGAL_INPUT,
-                                                "Frame No. %d (%s) has no noise frame "
--                                               "while the preceeding ones had!",
-+                                               "while the preceding ones had!",
-                                                i+1, frame_filename);
-                             }
-                         } // end if valid_data
-@@ -903,7 +903,7 @@
-                                 KMO_TRY_ASSURE(data_cube_counter == noise_cube_counter,
-                                                CPL_ERROR_ILLEGAL_INPUT,
-                                                "Frame No. %d (%s) has no noise frame "
--                                               "while the preceeding ones had!",
-+                                               "while the preceding ones had!",
-                                                i+1, frame_filename);
-                             }
-                         } // end if valid_data
 --- 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