[cpl-plugin-kmos] 03/03: Adjust patches for new version
Ole Streicher
olebole-guest at moszumanska.debian.org
Mon Mar 10 12:23:18 UTC 2014
This is an automated email from the git hooks/post-receive script.
olebole-guest pushed a commit to tag debian/1.3.0+dfsg-1
in repository cpl-plugin-kmos.
commit 602f8f47eb10704745cda3c30285974aae28cae0
Author: Ole Streicher <debian at liska.ath.cx>
Date: Mon Mar 10 11:54:37 2014 +0100
Adjust patches for new version
---
debian/changelog | 6 ++++
debian/cpl-plugin-kmos.lintian-overrides | 4 +--
debian/patches/fix_test_fail.patch | 2 +-
debian/patches/force-serial-tests.patch | 11 --------
debian/patches/fortify.patch | 12 ++++----
debian/patches/kmos_fix_test_fail.patch | 19 ++++---------
debian/patches/libadd_cpl.patch | 11 ++------
debian/patches/no_test_data.patch | 42 ----------------------------
debian/patches/series | 1 -
debian/patches/spellfix.patch | 47 +++++++++++++-------------------
10 files changed, 41 insertions(+), 114 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 78ee41d..b95e589 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+cpl-plugin-kmos (1.3.0+dfsg-1) unstable; urgency=low
+
+ * New upstream version
+
+ -- Ole Streicher <debian at liska.ath.cx> Mon, 10 Mar 2014 11:16:47 +0100
+
cpl-plugin-kmos (1.2.8+dfsg-4) unstable; urgency=low
* Disable all kmclipm tests that may take too long for mips and mipsel
diff --git a/debian/cpl-plugin-kmos.lintian-overrides b/debian/cpl-plugin-kmos.lintian-overrides
index 132b3fb..6e841b6 100644
--- a/debian/cpl-plugin-kmos.lintian-overrides
+++ b/debian/cpl-plugin-kmos.lintian-overrides
@@ -1,4 +1,4 @@
# False positive for checked strncat
-cpl-plugin-kmos: hardening-no-fortify-functions usr/lib/x86_64-linux-gnu/cpl/plugins/kmos-1.2.6/kmo_stats.so
+cpl-plugin-kmos: hardening-no-fortify-functions usr/lib/x86_64-linux-gnu/cpl/plugins/kmos-1.3.0/kmo_stats.so
# False positive for checked strncpy
-cpl-plugin-kmos: hardening-no-fortify-functions usr/lib/x86_64-linux-gnu/cpl/plugins/kmos-1.2.6/kmo_std_star.so
+cpl-plugin-kmos: hardening-no-fortify-functions usr/lib/x86_64-linux-gnu/cpl/plugins/kmos-1.3.0/kmo_std_star.so
diff --git a/debian/patches/fix_test_fail.patch b/debian/patches/fix_test_fail.patch
index 3c1c876..3fdc536 100644
--- a/debian/patches/fix_test_fail.patch
+++ b/debian/patches/fix_test_fail.patch
@@ -2,7 +2,7 @@ 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
-@@ -569,7 +569,7 @@
+@@ -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 bace58f..6b44d92 100644
--- a/debian/patches/force-serial-tests.patch
+++ b/debian/patches/force-serial-tests.patch
@@ -1,17 +1,6 @@
Author: Ole Streicher <debian at liska.ath.cx>
Description: Force serial-tests to get better verbose output
Bug: http://bugs.debian.org/715204
---- a/recipes/tests/Makefile.am
-+++ b/recipes/tests/Makefile.am
-@@ -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
-
--AUTOMAKE_OPTIONS = 1.8 foreign
-+AUTOMAKE_OPTIONS = 1.13 foreign serial-tests
-
- DISTCLEANFILES = *~
-
--- a/kmos/tests/Makefile.am
+++ b/kmos/tests/Makefile.am
@@ -17,7 +17,7 @@
diff --git a/debian/patches/fortify.patch b/debian/patches/fortify.patch
index 074b85a..e36929e 100644
--- a/debian/patches/fortify.patch
+++ b/debian/patches/fortify.patch
@@ -2,7 +2,7 @@ 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
-@@ -856,9 +856,10 @@
+@@ -848,9 +848,10 @@
sub_header = kmo_dfs_load_sub_header(frameset, STATS, extnr,
FALSE));
@@ -10,13 +10,13 @@ Description: Replace strcat calls with size checked strncat calls
- cpl_propertylist_get_string(sub_header, EXTNAME));
- strcat(strarr[0], "|");
+ strncat(strarr[0],
-+ cpl_propertylist_get_string(sub_header, EXTNAME),
++ cpl_propertylist_get_string(sub_header, EXTNAME),
+ 1024-strlen(strarr[0])-1);
+ strncat(strarr[0], "|", 1024-strlen(strarr[0])-1);
cpl_propertylist_delete(sub_header); sub_header = NULL;
KMO_TRY_EXIT_IF_NULL(
-@@ -876,7 +877,7 @@
+@@ -868,7 +869,7 @@
tmp_str = cpl_sprintf(" - |"));
}
@@ -25,7 +25,7 @@ Description: Replace strcat calls with size checked strncat calls
cpl_free(tmp_str); tmp_str = NULL;
}
kmclipm_vector_delete(data_out); data_out = NULL;
-@@ -885,9 +886,10 @@
+@@ -877,9 +878,10 @@
KMO_TRY_EXIT_IF_NULL(
sub_header = kmo_dfs_load_sub_header(frameset, STATS,
extnr, TRUE));
@@ -33,13 +33,13 @@ Description: Replace strcat calls with size checked strncat calls
- cpl_propertylist_get_string(sub_header, EXTNAME));
- strcat(strarr[0], "|");
+ strncat(strarr[0],
-+ cpl_propertylist_get_string(sub_header, EXTNAME),
++ cpl_propertylist_get_string(sub_header, EXTNAME),
+ 1024-strlen(strarr[0])-1);
+ strncat(strarr[0], "|", 1024-strlen(strarr[0])-1);
cpl_propertylist_delete(sub_header); sub_header = NULL;
KMO_TRY_EXIT_IF_NULL(
-@@ -906,7 +908,7 @@
+@@ -898,7 +900,7 @@
tmp_str = cpl_sprintf(" - |"));
}
diff --git a/debian/patches/kmos_fix_test_fail.patch b/debian/patches/kmos_fix_test_fail.patch
index 87f937a..414d442 100644
--- a/debian/patches/kmos_fix_test_fail.patch
+++ b/debian/patches/kmos_fix_test_fail.patch
@@ -2,24 +2,15 @@ Author: Ole Streicher <debian at liska.ath.cx>
Description: Increase tolerance to fix FTBS on i386
--- a/kmos/tests/kmo_priv_arithmetic-test.c
+++ b/kmos/tests/kmo_priv_arithmetic-test.c
-@@ -299,7 +299,7 @@
- kmo_test_fill_image(img, 4.4, 2.2);
- kmo_arithmetic_3D_2D(cube1, img, NULL, NULL, "*");
- cpl_test_abs(cpl_image_get(cpl_imagelist_get(cube1, 2), 4, 99, &rej),
-- 2.11496e+08, 400);
-+ 2.11496e+08, 8000);
-
- cpl_image_delete(img);
- cpl_imagelist_delete(cube1);
-@@ -323,9 +323,9 @@
+@@ -315,9 +315,9 @@
kmo_test_fill_image(noise_img, 2.1, 0.2);
kmo_arithmetic_3D_2D(cube1, img, noise_cube1, noise_img, "+");
cpl_test_abs(cpl_image_get(cpl_imagelist_get(cube1, 2), 4, 99, &rej),
-- 31375.2, 2*tol);
-+ 31375.2, 1.0);
+- 31376, 2*tol);
++ 31376, 1.0);
cpl_test_abs(cpl_image_get(cpl_imagelist_get(noise_cube1, 2), 4, 99, &rej),
-- 2193.96, tol);
-+ 2193.96, 0.5);
+- 2194.16, tol);
++ 2194.16, 0.5);
cpl_image_delete(img);
cpl_image_delete(noise_img);
diff --git a/debian/patches/libadd_cpl.patch b/debian/patches/libadd_cpl.patch
index 18905f5..dc477fb 100644
--- a/debian/patches/libadd_cpl.patch
+++ b/debian/patches/libadd_cpl.patch
@@ -2,8 +2,8 @@ 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
-@@ -66,127 +66,127 @@
- kmo_dev_setup.la
+@@ -57,121 +57,121 @@
+ kmo_wave_cal.la
kmo_arithmetic_la_SOURCES = kmo_arithmetic.c
-kmo_arithmetic_la_LIBADD = $(LIBKMOS)
@@ -131,12 +131,6 @@ Description: Add the cpl libraries to the recips.so and the test program
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)
- kmo_dev_setup_la_LDFLAGS = -module -avoid-version
- kmo_dev_setup_la_DEPENDENCIES = $(LIBKMOS)
-
kmo_std_star_la_SOURCES = kmo_std_star.c
-kmo_std_star_la_LIBADD = $(LIBKMOS)
+kmo_std_star_la_LIBADD = $(LIBKMOS) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
@@ -154,4 +148,3 @@ Description: Add the cpl libraries to the recips.so and the test program
+kmo_fits_strip_la_LIBADD = $(LIBKMOS) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
kmo_fits_strip_la_LDFLAGS = -module -avoid-version
kmo_fits_strip_la_DEPENDENCIES = $(LIBKMOS)
-
diff --git a/debian/patches/no_test_data.patch b/debian/patches/no_test_data.patch
index 6b0ace5..9f90ba3 100644
--- a/debian/patches/no_test_data.patch
+++ b/debian/patches/no_test_data.patch
@@ -43,45 +43,3 @@ Description: Disable tests that require test data from the ref_data subdir
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
-@@ -21,7 +21,7 @@
-
- DISTCLEANFILES = *~
-
--EXTRA_DIST = ref_data
-+EXTRA_DIST =
-
- if MAINTAINER_MODE
-
-@@ -36,30 +36,6 @@
-
- # Test programs
- check_PROGRAMS = kmo_init-test \
-- kmo_arithmetic-test \
-- kmo_combine-test \
-- kmo_copy-test \
-- kmo_dev_setup-test \
-- kmo_extract_spec-test \
-- kmo_fit_profile-test \
-- kmo_fits_check-test \
-- kmo_fits_stack-test \
-- kmo_make_image-test \
-- kmo_noise_map-test \
-- kmo_rotate-test \
-- kmo_shift-test \
-- kmo_sky_mask-test \
-- kmo_stats-test \
-- kmo_dark-test \
-- kmo_flat-test \
-- 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 \
-- kmo_fits_strip-test \
- kmo_final-test
-
- kmo_init_test_SOURCES = create_data_recipes.c kmo_init-test.c
diff --git a/debian/patches/series b/debian/patches/series
index ae9e68b..a5d423f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,7 +4,6 @@ use-std-paths-for-cpl.patch
no_test_data.patch
fortify.patch
spellfix.patch
-kmos_fix_test_fail.patch
fix_test_fail.patch
force-serial-tests.patch
kmclipm_disable_test.patch
diff --git a/debian/patches/spellfix.patch b/debian/patches/spellfix.patch
index 1a43d78..dd60a34 100644
--- a/debian/patches/spellfix.patch
+++ b/debian/patches/spellfix.patch
@@ -2,7 +2,7 @@ Author: Ole Streicher <debian at liska.ath.cx>
Description: Remove several small spelling errors
--- a/recipes/kmo_combine.c
+++ b/recipes/kmo_combine.c
-@@ -101,7 +101,7 @@
+@@ -93,7 +93,7 @@
"--method\n"
"There are following sources to get the shift parameters from:\n"
" * 'none' (default)\n"
@@ -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"
-@@ -818,7 +818,7 @@
+@@ -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 "
@@ -20,7 +20,7 @@ Description: Remove several small spelling errors
i+1, frame_filename);
}
} // end if valid_data
-@@ -902,7 +902,7 @@
+@@ -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 "
@@ -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
-@@ -167,7 +167,7 @@
+@@ -159,7 +159,7 @@
" differ, but the orientation must be the same for all exposures.\n"
"\n"
" * 'none'\n"
@@ -40,34 +40,25 @@ 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 aligned\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 @@
- "-----------------\n"
- "--order\n"
- "The polynomial order to use for the fit of the wavelength solution.\n"
--"0: (default) The appropriate order is choosen automatically depending on the\n"
-+"0: (default) The appropriate order is chosen automatically depending on the\n"
- "waveband. Otherwise an order of 6 is recommended, except for IZ-band, there\n"
- "order 4 should be used.\n"
- "\n"
-@@ -217,7 +217,7 @@
- CPL_TYPE_INT,
- "The polynomial order to use for the fit of "
- "the wavelength solution. 0: (default) The "
-- "appropriate order is choosen automatically "
-+ "appropriate order is chosen automatically "
- "depending on the waveband. Otherwise an order "
- "of 6 is recommended, except for IZ-band, there "
- "order 4 should be used",
--- a/recipes/kmo_sci_red.c
+++ b/recipes/kmo_sci_red.c
-@@ -210,7 +210,7 @@
- " differ, but the orientation must be the same for all exposures.\n"
+@@ -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 aligned\n"
- " to the lower left corner. If the orientation differs a warning will be\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 @@
+ "-----------------\n"
+ "--order\n"
+ "The polynomial order to use for the fit of the wavelength solution.\n"
+-"0: (default) The appropriate order is choosen automatically depending on\n"
++"0: (default) The appropriate order is chosen automatically depending on\n"
+ "the waveband (4 for IZ band, 5 for HK, 6 for the others)\n"
+ "\n"
+ "ADVANCED PARAMETERS\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