[cpl-plugin-kmos] 03/03: Adjust patches for new version
Ole Streicher
olebole-guest at moszumanska.debian.org
Mon Jan 13 11:03:12 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 875c8ad0da6dfd0b94c6f7b10ba5c65b43bacf27
Author: Ole Streicher <debian at liska.ath.cx>
Date: Mon Jan 13 12:03:34 2014 +0100
Adjust patches for new version
---
debian/patches/libadd_cpl.patch | 2 +-
debian/patches/no_test_data.patch | 44 +++++++++++------------------------
debian/patches/propagate_cflags.patch | 24 -------------------
debian/patches/series | 1 -
debian/patches/spellfix.patch | 8 +++----
5 files changed, 18 insertions(+), 61 deletions(-)
diff --git a/debian/patches/libadd_cpl.patch b/debian/patches/libadd_cpl.patch
index 9af8c77..18905f5 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
-@@ -65,127 +65,127 @@
+@@ -66,127 +66,127 @@
kmo_dev_setup.la
kmo_arithmetic_la_SOURCES = kmo_arithmetic.c
diff --git a/debian/patches/no_test_data.patch b/debian/patches/no_test_data.patch
index 5b96f13..6b0ace5 100644
--- a/debian/patches/no_test_data.patch
+++ b/debian/patches/no_test_data.patch
@@ -7,8 +7,8 @@ Description: Disable tests that require test data from the ref_data subdir
DISTCLEANFILES = *~
--SUBDIRS = ref_data
-+SUBDIRS =
+-EXTRA_DIST = ref_data
++EXTRA_DIST =
if MAINTAINER_MODE
@@ -27,21 +27,21 @@ Description: Disable tests that require test data from the ref_data subdir
kmo_priv_fits_stack-test \
- kmo_priv_flat-test \
- kmo_priv_functions-test \
+- kmo_priv_lcorr-test \
kmo_priv_make_image-test \
kmo_priv_noise_map-test \
- kmo_priv_reconstruct-test \
kmo_priv_rotate-test \
kmo_priv_shift-test \
kmo_priv_sky_mask-test \
+- kmo_priv_sky_tweak-test \
kmo_priv_stats-test \
- kmo_priv_std_star-test \
- kmo_priv_wave_cal-test \
-- kmo_utils-test \
-- kmo_priv_lcorr-test \
-- kmo_priv_sky_tweak-test
+- kmo_utils-test
+ kmo_priv_wave_cal-test
- kmo_cpl_extensions_test_SOURCES = kmo_cpl_extensions-test.c
+ kmo_cpl_extensions_test_SOURCES = create_data_kmos.c kmo_cpl_extensions-test.c
kmo_cpl_extensions_test_LDFLAGS = $(CPL_LDFLAGS)
--- a/recipes/tests/Makefile.am
+++ b/recipes/tests/Makefile.am
@@ -49,16 +49,16 @@ Description: Disable tests that require test data from the ref_data subdir
DISTCLEANFILES = *~
--SUBDIRS = ref_data
-+SUBDIRS =
+-EXTRA_DIST = ref_data
++EXTRA_DIST =
if MAINTAINER_MODE
-@@ -36,31 +36,7 @@
- #check_PROGRAMS = kmo_fits_strip-test
+@@ -36,30 +36,6 @@
# Test programs
--check_PROGRAMS = kmo_arithmetic-test \
+ check_PROGRAMS = kmo_init-test \
+- kmo_arithmetic-test \
- kmo_combine-test \
- kmo_copy-test \
- kmo_dev_setup-test \
@@ -82,24 +82,6 @@ Description: Disable tests that require test data from the ref_data subdir
- kmo_sci_red-test \
- kmo_multi_reconstruct-test \
- kmo_fits_strip-test \
-- leak_check-test
-+check_PROGRAMS = leak_check-test
+ kmo_final-test
-
- kmo_arithmetic_test_SOURCES = kmo_arithmetic-test.c
---- a/configure.ac
-+++ b/configure.ac
-@@ -92,13 +92,11 @@
- doxygen/Doxyfile
- kmos/Makefile
- kmos/tests/Makefile
-- kmos/tests/ref_data/Makefile
- tools/easySPARK/Makefile
- reflex/Makefile
- reflex/kmos.xml
- recipes/Makefile
- recipes/tests/Makefile
-- recipes/tests/ref_data/Makefile
- regtests/Makefile
- regtests/tests/Makefile
- irplib/Makefile
+ kmo_init_test_SOURCES = create_data_recipes.c kmo_init-test.c
diff --git a/debian/patches/propagate_cflags.patch b/debian/patches/propagate_cflags.patch
deleted file mode 100644
index 0b89970..0000000
--- a/debian/patches/propagate_cflags.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Author: Ole Streicher <debian at liska.ath.cx>
-Description: Remove ESO's debugging option that overwrites (hardening) CFLAGS.
- On i386, the creation of test data works only without optimization, so
- we switch it off.
---- a/configure.ac
-+++ b/configure.ac
-@@ -39,7 +39,6 @@
- AM_PROG_CC_C_O
- AC_PROG_LN_S
-
--ESO_ENABLE_DEBUG(yes)
- 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: not supported by cvs2svn $
- */
-
-+#pragma GCC optimize("O0")
- #include <stdio.h>
- #include <string.h>
- #include <sys/stat.h>
diff --git a/debian/patches/series b/debian/patches/series
index f76baa4..55229a6 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
no_test_data.patch
-propagate_cflags.patch
fortify.patch
spellfix.patch
serial-tests
diff --git a/debian/patches/spellfix.patch b/debian/patches/spellfix.patch
index 2f57097..1a43d78 100644
--- a/debian/patches/spellfix.patch
+++ b/debian/patches/spellfix.patch
@@ -11,7 +11,7 @@ Description: Remove several small spelling errors
" 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"
-@@ -808,7 +808,7 @@
+@@ -818,7 +818,7 @@
KMO_TRY_ASSURE(data_cube_counter == noise_cube_counter,
CPL_ERROR_ILLEGAL_INPUT,
"Frame No. %d (%s) has no noise frame "
@@ -20,7 +20,7 @@ Description: Remove several small spelling errors
i+1, frame_filename);
}
} // end if valid_data
-@@ -892,7 +892,7 @@
+@@ -902,7 +902,7 @@
KMO_TRY_ASSURE(data_cube_counter == noise_cube_counter,
CPL_ERROR_ILLEGAL_INPUT,
"Frame No. %d (%s) has no noise frame "
@@ -31,7 +31,7 @@ Description: Remove several small spelling errors
} // end if valid_data
--- a/recipes/kmo_multi_reconstruct.c
+++ b/recipes/kmo_multi_reconstruct.c
-@@ -160,7 +160,7 @@
+@@ -167,7 +167,7 @@
" differ, but the orientation must be the same for all exposures.\n"
"\n"
" * 'none'\n"
@@ -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
-@@ -192,7 +192,7 @@
+@@ -210,7 +210,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