[cpl-plugin-kmos] 06/06: Update debian files to new upstream version
Ole Streicher
olebole-guest at moszumanska.debian.org
Wed Nov 27 15:29:15 UTC 2013
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 e21b2e6185332b3638c1d9d4acf1a25e92f3e034
Author: Ole Streicher <debian at liska.ath.cx>
Date: Wed Nov 27 16:28:12 2013 +0100
Update debian files to new upstream version
---
debian/changelog | 4 ++--
debian/patches/libadd_cpl.patch | 8 +++++++-
debian/patches/no_test_data.patch | 3 ++-
debian/patches/propagate_cflags.patch | 3 +--
debian/patches/spellfix.patch | 18 +++++++++---------
5 files changed, 21 insertions(+), 15 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 63f3fd7..9b1355c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,5 @@
-cpl-plugin-kmos (1.2.4-1) unstable; urgency=low
+cpl-plugin-kmos (1.2.6-1) unstable; urgency=low
* Initial release. (Closes: #726612)
- -- Ole Streicher <debian at liska.ath.cx> Wed, 16 Oct 2013 10:08:49 +0200
+ -- Ole Streicher <debian at liska.ath.cx> Wed, 27 Nov 2013 16:27:31 +0100
diff --git a/debian/patches/libadd_cpl.patch b/debian/patches/libadd_cpl.patch
index d001632..9af8c77 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
-@@ -64,122 +64,122 @@
+@@ -65,127 +65,127 @@
kmo_dev_setup.la
kmo_arithmetic_la_SOURCES = kmo_arithmetic.c
@@ -125,6 +125,12 @@ Description: Add the cpl libraries to the recips.so and the test program
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)
+ kmo_illumination_flat_la_LDFLAGS = -module -avoid-version
+ kmo_illumination_flat_la_DEPENDENCIES = $(LIBKMOS)
+
kmo_dev_setup_la_SOURCES = kmo_dev_setup.c
-kmo_dev_setup_la_LIBADD = $(LIBKMOS)
+kmo_dev_setup_la_LIBADD = $(LIBKMOS) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
diff --git a/debian/patches/no_test_data.patch b/debian/patches/no_test_data.patch
index b826461..5b96f13 100644
--- a/debian/patches/no_test_data.patch
+++ b/debian/patches/no_test_data.patch
@@ -54,7 +54,7 @@ Description: Disable tests that require test data from the ref_data subdir
if MAINTAINER_MODE
-@@ -36,30 +36,7 @@
+@@ -36,31 +36,7 @@
#check_PROGRAMS = kmo_fits_strip-test
# Test programs
@@ -77,6 +77,7 @@ Description: Disable tests that require test data from the ref_data subdir
- kmo_wave_cal-test \
- kmo_reconstruct-test \
- kmo_illumination-test \
+- kmo_illumination_flat-test \
- kmo_std_star-test \
- kmo_sci_red-test \
- kmo_multi_reconstruct-test \
diff --git a/debian/patches/propagate_cflags.patch b/debian/patches/propagate_cflags.patch
index 19cd72e..0b89970 100644
--- a/debian/patches/propagate_cflags.patch
+++ b/debian/patches/propagate_cflags.patch
@@ -12,11 +12,10 @@ Description: Remove ESO's debugging option that overwrites (hardening) CFLAGS.
ESO_ENABLE_STRICT(no)
ESO_PROG_CC_FLAG([fno-builtin], [CFLAGS="$CFLAGS -fno-builtin"])
-
--- a/kmos/kmo_test_create_data.c
+++ b/kmos/kmo_test_create_data.c
@@ -38,6 +38,7 @@
- * $Name: kmosp_v1_2_4__20130807 $
+ * $Name: not supported by cvs2svn $
*/
+#pragma GCC optimize("O0")
diff --git a/debian/patches/spellfix.patch b/debian/patches/spellfix.patch
index 8ef6488..2f57097 100644
--- a/debian/patches/spellfix.patch
+++ b/debian/patches/spellfix.patch
@@ -31,15 +31,15 @@ Description: Remove several small spelling errors
} // end if valid_data
--- a/recipes/kmo_multi_reconstruct.c
+++ b/recipes/kmo_multi_reconstruct.c
-@@ -89,7 +89,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"
+@@ -160,7 +160,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 emit-\n"
+ " to the lower left corner. If the orientation differs a warning will be\n"
--- a/recipes/kmo_wave_cal.c
+++ b/recipes/kmo_wave_cal.c
@@ -97,7 +97,7 @@
@@ -62,7 +62,7 @@ Description: Remove several small spelling errors
"order 4 should be used",
--- a/recipes/kmo_sci_red.c
+++ b/recipes/kmo_sci_red.c
-@@ -175,7 +175,7 @@
+@@ -192,7 +192,7 @@
" differ, but the orientation must be the same for all exposures.\n"
"\n"
" * 'none'\n"
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/cpl-plugin-kmos.git
More information about the debian-science-commits
mailing list