[cpl-plugin-fors] 06/06: Adjust Debian files for new upstream version
Ole Streicher
olebole-guest at moszumanska.debian.org
Wed Nov 27 16:09:43 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-fors.
commit e3677f4ef79f0ced90603454ac8a128f74df4751
Author: Ole Streicher <debian at liska.ath.cx>
Date: Wed Nov 27 17:09:29 2013 +0100
Adjust Debian files for new upstream version
---
debian/changelog | 6 +
debian/patches/dont_build_sextractor.patch | 2 +-
debian/patches/fix_format_security.patch | 287 -----------------------------
debian/patches/libadd_cpl.patch | 209 +--------------------
debian/patches/private_libmosca.patch | 8 +-
debian/patches/series | 1 -
debian/patches/set_plugindir.patch | 2 +-
7 files changed, 15 insertions(+), 500 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index a3bd168..095271c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+cpl-plugin-fors (4.11.12-1) unstable; urgency=low
+
+ * New upstream version
+
+ -- Ole Streicher <debian at liska.ath.cx> Wed, 27 Nov 2013 17:08:59 +0100
+
cpl-plugin-fors (4.9.23-1) unstable; urgency=low
* New package. Closes: #709321
diff --git a/debian/patches/dont_build_sextractor.patch b/debian/patches/dont_build_sextractor.patch
index 7c47f77..01787aa 100644
--- a/debian/patches/dont_build_sextractor.patch
+++ b/debian/patches/dont_build_sextractor.patch
@@ -14,7 +14,7 @@ Description: Use the system provided sextractor binary
HTML_SUBDIRS =
--- a/configure.ac
+++ b/configure.ac
-@@ -112,8 +112,6 @@
+@@ -89,8 +89,6 @@
FORS_SET_SEX_PREFIX
diff --git a/debian/patches/fix_format_security.patch b/debian/patches/fix_format_security.patch
deleted file mode 100644
index 0fcdd35..0000000
--- a/debian/patches/fix_format_security.patch
+++ /dev/null
@@ -1,287 +0,0 @@
-Author: Ole Streicher <debian at liska.ath.cx>
-Description: Fix format security errors
---- a/fors/fors_dfs.c
-+++ b/fors/fors_dfs.c
-@@ -874,7 +874,7 @@
- if (frame) {
- image = cpl_image_load(cpl_frame_get_filename(frame), type, 0, ext);
- if (image == NULL) {
-- cpl_msg_error(cpl_error_get_where(), cpl_error_get_message());
-+ cpl_msg_error(cpl_error_get_where(), "%s", cpl_error_get_message());
- cpl_msg_error(func, "Cannot load image %s",
- cpl_frame_get_filename(frame));
- }
-@@ -929,7 +929,7 @@
- if (frame) {
- table = cpl_table_load(cpl_frame_get_filename(frame), ext, 1);
- if (table == NULL) {
-- cpl_msg_error(cpl_error_get_where(), cpl_error_get_message());
-+ cpl_msg_error(cpl_error_get_where(), "%s", cpl_error_get_message());
- cpl_msg_error(func, "Cannot load table %s",
- cpl_frame_get_filename(frame));
- }
-@@ -980,7 +980,7 @@
- if (frame) {
- plist = cpl_propertylist_load(cpl_frame_get_filename(frame), ext);
- if (plist == NULL) {
-- cpl_msg_error(cpl_error_get_where(), cpl_error_get_message());
-+ cpl_msg_error(cpl_error_get_where(), "%s", cpl_error_get_message());
- cpl_msg_error(func, "Cannot load header from %s",
- cpl_frame_get_filename(frame));
- }
-@@ -1012,7 +1012,7 @@
-
- if (category == NULL || frameset == NULL || object == NULL ||
- raw_frame == NULL) {
-- cpl_msg_error(cpl_error_get_where(), cpl_error_get_message());
-+ cpl_msg_error(cpl_error_get_where(), "%s", cpl_error_get_message());
- cpl_error_set(cpl_func, CPL_ERROR_NULL_INPUT);
- return;
- }
-@@ -1058,7 +1058,7 @@
- cpl_frame_set_group(frame, CPL_FRAME_GROUP_PRODUCT);
- cpl_frame_set_level(frame, CPL_FRAME_LEVEL_FINAL);
- if (cpl_error_get_code()) {
-- cpl_msg_error(cpl_error_get_where(), cpl_error_get_message());
-+ cpl_msg_error(cpl_error_get_where(), "%s", cpl_error_get_message());
- cpl_msg_error(cpl_func, "Cannot initialise the product frame");
- cpl_frame_delete(frame);
- cpl_free(filename);
-@@ -1083,7 +1083,7 @@
- if (cpl_dfs_setup_product_header(plist, frame, frameset, parlist,
- recipename, version, "PRO-1.15")) {
- #endif
-- cpl_msg_error(cpl_error_get_where(), cpl_error_get_message());
-+ cpl_msg_error(cpl_error_get_where(), "%s", cpl_error_get_message());
- cpl_msg_error(cpl_func, "Problem with product %s FITS header definition",
- category);
- if (header == NULL)
-@@ -1119,7 +1119,7 @@
- }
-
- if (cpl_error_get_code() != CPL_ERROR_NONE) {
-- cpl_msg_error(cpl_error_get_where(), cpl_error_get_message());
-+ cpl_msg_error(cpl_error_get_where(), "%s", cpl_error_get_message());
- cpl_msg_error(cpl_func, "Cannot save product %s to disk", filename);
- if (header == NULL)
- cpl_propertylist_delete(plist);
-@@ -1333,7 +1333,7 @@
-
-
- if (category == NULL || frameset == NULL || image == NULL) {
-- cpl_msg_error(cpl_error_get_where(), cpl_error_get_message());
-+ cpl_msg_error(cpl_error_get_where(), "%s", cpl_error_get_message());
- cpl_error_set(func, CPL_ERROR_NULL_INPUT);
- return -1;
- }
-@@ -1353,7 +1353,7 @@
- cpl_frame_set_group(frame, CPL_FRAME_GROUP_PRODUCT);
- cpl_frame_set_level(frame, CPL_FRAME_LEVEL_FINAL);
- if (cpl_error_get_code()) {
-- cpl_msg_error(cpl_error_get_where(), cpl_error_get_message());
-+ cpl_msg_error(cpl_error_get_where(), "%s", cpl_error_get_message());
- cpl_msg_error(func, "Cannot initialise the product frame");
- cpl_frame_delete(frame);
- cpl_free(filename);
-@@ -1377,7 +1377,7 @@
- if (cpl_dfs_setup_product_header(plist, frame, frameset, parlist,
- recipename, version, "PRO-1.15")) {
- #endif
-- cpl_msg_error(cpl_error_get_where(), cpl_error_get_message());
-+ cpl_msg_error(cpl_error_get_where(), "%s", cpl_error_get_message());
- cpl_msg_error(func, "Problem with product %s FITS header definition",
- category);
- if (header == NULL)
-@@ -1403,7 +1403,7 @@
-
- if (cpl_image_save(image, filename, CPL_BPP_IEEE_FLOAT, plist,
- CPL_IO_DEFAULT)) {
-- cpl_msg_error(cpl_error_get_where(), cpl_error_get_message());
-+ cpl_msg_error(cpl_error_get_where(), "%s", cpl_error_get_message());
- cpl_msg_error(func, "Cannot save product %s to disk", filename);
- if (header == NULL)
- cpl_propertylist_delete(plist);
-@@ -1469,7 +1469,7 @@
-
- if (category == NULL || frameset == NULL || table == NULL) {
- cpl_error_set(func, CPL_ERROR_NULL_INPUT);
-- cpl_msg_error(cpl_error_get_where(), cpl_error_get_message());
-+ cpl_msg_error(cpl_error_get_where(), "%s", cpl_error_get_message());
- return -1;
- }
-
-@@ -1495,7 +1495,7 @@
- cpl_frame_set_group(frame, CPL_FRAME_GROUP_PRODUCT);
- cpl_frame_set_level(frame, CPL_FRAME_LEVEL_FINAL);
- if (cpl_error_get_code()) {
-- cpl_msg_error(cpl_error_get_where(), cpl_error_get_message());
-+ cpl_msg_error(cpl_error_get_where(), "%s", cpl_error_get_message());
- cpl_msg_error(func, "Cannot initialise the product frame");
- cpl_frame_delete(frame);
- cpl_free(filename);
-@@ -1519,7 +1519,7 @@
- if (cpl_dfs_setup_product_header(plist, frame, frameset, parlist,
- recipename, version, "PRO-1.15")) {
- #endif
-- cpl_msg_error(cpl_error_get_where(), cpl_error_get_message());
-+ cpl_msg_error(cpl_error_get_where(), "%s", cpl_error_get_message());
- cpl_msg_error(func, "Problem with product %s FITS header definition",
- category);
- if (header == NULL)
-@@ -1545,7 +1545,7 @@
-
-
- if (cpl_table_save(table, plist, NULL, filename, CPL_IO_DEFAULT)) {
-- cpl_msg_error(cpl_error_get_where(), cpl_error_get_message());
-+ cpl_msg_error(cpl_error_get_where(), "%s", cpl_error_get_message());
- cpl_msg_error(func, "Cannot save product %s to disk", filename);
- if (header == NULL)
- cpl_propertylist_delete(plist);
---- a/fors/fors_utils.c
-+++ b/fors/fors_utils.c
-@@ -675,7 +675,7 @@
- case CPL_MSG_ERROR: cpl_msg_error (fct, "%s", message); break;
- default:
- cpl_msg_error(fct, "Unknown message level: %d", level);
-- cpl_msg_error(fct, message);
-+ cpl_msg_error(fct, "%s", message);
- break;
- }
- return;
---- a/fors/moses.c
-+++ b/fors/moses.c
-@@ -4900,7 +4900,7 @@
- *err = sqrt(*err);
-
- if (ids == NULL) {
-- cpl_msg_debug(cpl_error_get_where(), cpl_error_get_message());
-+ cpl_msg_debug(cpl_error_get_where(), "%s", cpl_error_get_message());
- cpl_msg_debug(func, "Fitting IDS");
- cpl_error_set_where(func);
- if (rejection) {
---- a/recipes/fors_calib.c
-+++ b/recipes/fors_calib.c
-@@ -2082,7 +2082,7 @@
- slits = mos_locate_spectra(refmask);
-
- if (!slits) {
-- cpl_msg_error(cpl_error_get_where(), cpl_error_get_message());
-+ cpl_msg_error(cpl_error_get_where(), "%s", cpl_error_get_message());
- fors_calib_exit("No slits could be detected!");
- }
-
-@@ -2712,7 +2712,7 @@
- cpl_table_delete(slits); slits = NULL;
-
- if (cpl_error_get_code()) {
-- cpl_msg_error(cpl_error_get_where(), cpl_error_get_message());
-+ cpl_msg_error(cpl_error_get_where(), "%s", cpl_error_get_message());
- fors_calib_exit(NULL);
- }
-
---- a/recipes/fors_science.c
-+++ b/recipes/fors_science.c
-@@ -1668,7 +1668,7 @@
- cpl_msg_error(recipe, "The IDS coeff table is "
- "incompatible with the input slit position table.");
- }
-- cpl_msg_error(cpl_error_get_where(), cpl_error_get_message());
-+ cpl_msg_error(cpl_error_get_where(), "%s", cpl_error_get_message());
- fors_science_exit(NULL);
- }
- cpl_msg_warning(recipe, "Alignment of the wavelength solution "
-@@ -2314,7 +2314,7 @@
- cpl_propertylist_delete(header); header = NULL;
-
- if (cpl_error_get_code()) {
-- cpl_msg_error(cpl_error_get_where(), cpl_error_get_message());
-+ cpl_msg_error(cpl_error_get_where(), "%s", cpl_error_get_message());
- fors_science_exit(NULL);
- }
- else
---- a/recipes/fors_config.c
-+++ b/recipes/fors_config.c
-@@ -754,7 +754,7 @@
- cpl_free(filename); filename = NULL;
-
- if (cpl_error_get_code()) {
-- cpl_msg_error(cpl_error_get_where(), cpl_error_get_message());
-+ cpl_msg_error(cpl_error_get_where(), "%s", cpl_error_get_message());
- fors_config_exit(NULL);
- }
- else
---- a/recipes/fors_detect_spectra.c
-+++ b/recipes/fors_detect_spectra.c
-@@ -759,7 +759,7 @@
- slits = mos_locate_spectra(refmask);
-
- if (!slits) {
-- cpl_msg_error(cpl_error_get_where(), cpl_error_get_message());
-+ cpl_msg_error(cpl_error_get_where(), "%s", cpl_error_get_message());
- fors_detect_spectra_exit("No slits could be detected!");
- }
-
---- a/recipes/fors_extract.c
-+++ b/recipes/fors_extract.c
-@@ -1736,7 +1736,7 @@
- cpl_propertylist_delete(header); header = NULL;
-
- if (cpl_error_get_code()) {
-- cpl_msg_error(cpl_error_get_where(), cpl_error_get_message());
-+ cpl_msg_error(cpl_error_get_where(), "%s", cpl_error_get_message());
- fors_extract_exit(NULL);
- }
-
---- a/recipes/fors_pmos_calib.c
-+++ b/recipes/fors_pmos_calib.c
-@@ -1467,7 +1467,7 @@
- slits = mos_locate_spectra(refmask);
-
- if (!slits) {
-- cpl_msg_error(cpl_error_get_where(), cpl_error_get_message());
-+ cpl_msg_error(cpl_error_get_where(), "%s", cpl_error_get_message());
- fors_pmos_calib_exit("No slits could be detected!");
- }
-
-@@ -2332,7 +2332,7 @@
- cpl_vector_delete(lines); lines = NULL;
-
- if (cpl_error_get_code()) {
-- cpl_msg_error(cpl_error_get_where(), cpl_error_get_message());
-+ cpl_msg_error(cpl_error_get_where(), "%s", cpl_error_get_message());
- fors_pmos_calib_exit(NULL);
- }
-
---- a/recipes/fors_pmos_extract.c
-+++ b/recipes/fors_pmos_extract.c
-@@ -2759,7 +2759,7 @@
- cpl_free(nobjs_per_slit);
-
- if (cpl_error_get_code()) {
-- cpl_msg_error(cpl_error_get_where(), cpl_error_get_message());
-+ cpl_msg_error(cpl_error_get_where(), "%s", cpl_error_get_message());
- fors_pmos_extract_exit(NULL);
- }
- else
---- a/recipes/fors_pmos_science.c
-+++ b/recipes/fors_pmos_science.c
-@@ -3358,7 +3358,7 @@
- cpl_free(nobjs_per_slit);
-
- if (cpl_error_get_code()) {
-- cpl_msg_error(cpl_error_get_where(), cpl_error_get_message());
-+ cpl_msg_error(cpl_error_get_where(), "%s", cpl_error_get_message());
- fors_pmos_science_exit(NULL);
- }
- else
---- a/recipes/fors_subtract_sky_lss.c
-+++ b/recipes/fors_subtract_sky_lss.c
-@@ -434,7 +434,7 @@
- cpl_propertylist_delete(header); header = NULL;
-
- if (cpl_error_get_code()) {
-- cpl_msg_error(cpl_error_get_where(), cpl_error_get_message());
-+ cpl_msg_error(cpl_error_get_where(), "%s", cpl_error_get_message());
- fors_subtract_sky_lss_exit(NULL);
- }
- else
diff --git a/debian/patches/libadd_cpl.patch b/debian/patches/libadd_cpl.patch
index a4fd0e2..d064bf7 100644
--- a/debian/patches/libadd_cpl.patch
+++ b/debian/patches/libadd_cpl.patch
@@ -1,208 +1,5 @@
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
-@@ -71,167 +71,167 @@
- endif
-
- fors_calib_la_SOURCES = fors_calib.c
--fors_calib_la_LIBADD = $(LIBFORS)
-+fors_calib_la_LIBADD = $(LIBFORS) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- fors_calib_la_LDFLAGS = -module -avoid-version
- fors_calib_la_DEPENDENCIES = $(LIBFORS)
-
- fors_science_la_SOURCES = fors_science.c
--fors_science_la_LIBADD = $(LIBFORS)
-+fors_science_la_LIBADD = $(LIBFORS) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- fors_science_la_LDFLAGS = -module -avoid-version
- fors_science_la_DEPENDENCIES = $(LIBFORS)
-
- fors_config_la_SOURCES = fors_config.c
--fors_config_la_LIBADD = $(LIBFORS)
-+fors_config_la_LIBADD = $(LIBFORS) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- fors_config_la_LDFLAGS = -module -avoid-version
- fors_config_la_DEPENDENCIES = $(LIBFORS)
-
- fors_sumflux_la_SOURCES = fors_sumflux.c
--fors_sumflux_la_LIBADD = $(LIBFORS)
-+fors_sumflux_la_LIBADD = $(LIBFORS) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- fors_sumflux_la_LDFLAGS = -module -avoid-version
- fors_sumflux_la_DEPENDENCIES = $(LIBFORS)
-
- fors_extract_la_SOURCES = fors_extract.c
--fors_extract_la_LIBADD = $(LIBFORS)
-+fors_extract_la_LIBADD = $(LIBFORS) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- fors_extract_la_LDFLAGS = -module -avoid-version
- fors_extract_la_DEPENDENCIES = $(LIBFORS)
-
- test_hough_la_SOURCES = test_hough.c
-
--test_hough_la_LIBADD = $(LIBFORS)
-+test_hough_la_LIBADD = $(LIBFORS) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- test_hough_la_LDFLAGS = -module -avoid-version
- test_hough_la_DEPENDENCIES = $(LIBFORS)
-
- fors_bias_la_SOURCES = fors_bias.c
--fors_bias_la_LIBADD = $(LIBFORS)
-+fors_bias_la_LIBADD = $(LIBFORS) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- fors_bias_la_LDFLAGS = -module -avoid-version
- fors_bias_la_DEPENDENCIES = $(LIBFORS)
-
- fors_remove_bias_la_SOURCES = fors_remove_bias.c
--fors_remove_bias_la_LIBADD = $(LIBFORS)
-+fors_remove_bias_la_LIBADD = $(LIBFORS) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- fors_remove_bias_la_LDFLAGS = -module -avoid-version
- fors_remove_bias_la_DEPENDENCIES = $(LIBFORS)
-
- fors_flat_la_SOURCES = fors_flat.c
--fors_flat_la_LIBADD = $(LIBFORS)
-+fors_flat_la_LIBADD = $(LIBFORS) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- fors_flat_la_LDFLAGS = -module -avoid-version
- fors_flat_la_DEPENDENCIES = $(LIBFORS)
-
- fors_detect_spectra_la_SOURCES = fors_detect_spectra.c
--fors_detect_spectra_la_LIBADD = $(LIBFORS)
-+fors_detect_spectra_la_LIBADD = $(LIBFORS) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- fors_detect_spectra_la_LDFLAGS = -module -avoid-version
- fors_detect_spectra_la_DEPENDENCIES = $(LIBFORS)
-
- fors_trace_flat_la_SOURCES = fors_trace_flat.c
--fors_trace_flat_la_LIBADD = $(LIBFORS)
-+fors_trace_flat_la_LIBADD = $(LIBFORS) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- fors_trace_flat_la_LDFLAGS = -module -avoid-version
- fors_trace_flat_la_DEPENDENCIES = $(LIBFORS)
-
- fors_normalise_flat_la_SOURCES = fors_normalise_flat.c
--fors_normalise_flat_la_LIBADD = $(LIBFORS)
-+fors_normalise_flat_la_LIBADD = $(LIBFORS) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- fors_normalise_flat_la_LDFLAGS = -module -avoid-version
- fors_normalise_flat_la_DEPENDENCIES = $(LIBFORS)
-
- fors_flatfield_la_SOURCES = fors_flatfield.c
--fors_flatfield_la_LIBADD = $(LIBFORS)
-+fors_flatfield_la_LIBADD = $(LIBFORS) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- fors_flatfield_la_LDFLAGS = -module -avoid-version
- fors_flatfield_la_DEPENDENCIES = $(LIBFORS)
-
- fors_extract_slits_la_SOURCES = fors_extract_slits.c
--fors_extract_slits_la_LIBADD = $(LIBFORS)
-+fors_extract_slits_la_LIBADD = $(LIBFORS) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- fors_extract_slits_la_LDFLAGS = -module -avoid-version
- fors_extract_slits_la_DEPENDENCIES = $(LIBFORS)
-
- fors_wave_calib_la_SOURCES = fors_wave_calib.c
--fors_wave_calib_la_LIBADD = $(LIBFORS)
-+fors_wave_calib_la_LIBADD = $(LIBFORS) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- fors_wave_calib_la_LDFLAGS = -module -avoid-version
- fors_wave_calib_la_DEPENDENCIES = $(LIBFORS)
-
- fors_wave_calib_lss_la_SOURCES = fors_wave_calib_lss.c
--fors_wave_calib_lss_la_LIBADD = $(LIBFORS)
-+fors_wave_calib_lss_la_LIBADD = $(LIBFORS) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- fors_wave_calib_lss_la_LDFLAGS = -module -avoid-version
- fors_wave_calib_lss_la_DEPENDENCIES = $(LIBFORS)
-
- fors_align_sky_la_SOURCES = fors_align_sky.c
--fors_align_sky_la_LIBADD = $(LIBFORS)
-+fors_align_sky_la_LIBADD = $(LIBFORS) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- fors_align_sky_la_LDFLAGS = -module -avoid-version
- fors_align_sky_la_DEPENDENCIES = $(LIBFORS)
-
- fors_align_sky_lss_la_SOURCES = fors_align_sky_lss.c
--fors_align_sky_lss_la_LIBADD = $(LIBFORS)
-+fors_align_sky_lss_la_LIBADD = $(LIBFORS) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- fors_align_sky_lss_la_LDFLAGS = -module -avoid-version
- fors_align_sky_lss_la_DEPENDENCIES = $(LIBFORS)
-
- fors_subtract_sky_la_SOURCES = fors_subtract_sky.c
--fors_subtract_sky_la_LIBADD = $(LIBFORS)
-+fors_subtract_sky_la_LIBADD = $(LIBFORS) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- fors_subtract_sky_la_LDFLAGS = -module -avoid-version
- fors_subtract_sky_la_DEPENDENCIES = $(LIBFORS)
-
- fors_subtract_sky_lss_la_SOURCES = fors_subtract_sky_lss.c
--fors_subtract_sky_lss_la_LIBADD = $(LIBFORS)
-+fors_subtract_sky_lss_la_LIBADD = $(LIBFORS) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- fors_subtract_sky_lss_la_LDFLAGS = -module -avoid-version
- fors_subtract_sky_lss_la_DEPENDENCIES = $(LIBFORS)
-
- fors_resample_la_SOURCES = fors_resample.c
--fors_resample_la_LIBADD = $(LIBFORS)
-+fors_resample_la_LIBADD = $(LIBFORS) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- fors_resample_la_LDFLAGS = -module -avoid-version
- fors_resample_la_DEPENDENCIES = $(LIBFORS)
-
- fors_detect_objects_la_SOURCES = fors_detect_objects.c
--fors_detect_objects_la_LIBADD = $(LIBFORS)
-+fors_detect_objects_la_LIBADD = $(LIBFORS) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- fors_detect_objects_la_LDFLAGS = -module -avoid-version
- fors_detect_objects_la_DEPENDENCIES = $(LIBFORS)
-
- fors_extract_objects_la_SOURCES = fors_extract_objects.c
--fors_extract_objects_la_LIBADD = $(LIBFORS)
-+fors_extract_objects_la_LIBADD = $(LIBFORS) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- fors_extract_objects_la_LDFLAGS = -module -avoid-version
- fors_extract_objects_la_DEPENDENCIES = $(LIBFORS)
-
- montecarlo_la_SOURCES = montecarlo.c
--montecarlo_la_LIBADD = $(LIBFORS)
-+montecarlo_la_LIBADD = $(LIBFORS) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- montecarlo_la_LDFLAGS = -module -avoid-version
- montecarlo_la_DEPENDENCIES = $(LIBFORS)
-
- fors_dark_la_SOURCES = fors_dark.c
--fors_dark_la_LIBADD = $(LIBFORS)
-+fors_dark_la_LIBADD = $(LIBFORS) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- fors_dark_la_LDFLAGS = -module -avoid-version
- fors_dark_la_DEPENDENCIES = $(LIBFORS)
-
- fors_img_screen_flat_la_SOURCES = fors_img_screen_flat.c
--fors_img_screen_flat_la_LIBADD = $(LIBFORS)
-+fors_img_screen_flat_la_LIBADD = $(LIBFORS) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- fors_img_screen_flat_la_LDFLAGS = -module -avoid-version
- fors_img_screen_flat_la_DEPENDENCIES = $(LIBFORS)
-
- fors_img_sky_flat_la_SOURCES = fors_img_sky_flat.c
--fors_img_sky_flat_la_LIBADD = $(LIBFORS)
-+fors_img_sky_flat_la_LIBADD = $(LIBFORS) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- fors_img_sky_flat_la_LDFLAGS = -module -avoid-version
- fors_img_sky_flat_la_DEPENDENCIES = $(LIBFORS)
-
- fors_zeropoint_la_SOURCES = fors_zeropoint.c
--fors_zeropoint_la_LIBADD = $(LIBFORS)
-+fors_zeropoint_la_LIBADD = $(LIBFORS) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- fors_zeropoint_la_LDFLAGS = -module -avoid-version
- fors_zeropoint_la_DEPENDENCIES = $(LIBFORS)
-
- fors_photometry_la_SOURCES = fors_photometry.c
--fors_photometry_la_LIBADD = $(LIBFORS)
-+fors_photometry_la_LIBADD = $(LIBFORS) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- fors_photometry_la_LDFLAGS = -module -avoid-version
- fors_photometry_la_DEPENDENCIES = $(LIBFORS)
-
- fors_img_science_la_SOURCES = fors_img_science.c
--fors_img_science_la_LIBADD = $(LIBFORS)
-+fors_img_science_la_LIBADD = $(LIBFORS) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- fors_img_science_la_LDFLAGS = -module -avoid-version
- fors_img_science_la_DEPENDENCIES = $(LIBFORS)
-
- fors_pmos_calib_la_SOURCES = fors_pmos_calib.c
--fors_pmos_calib_la_LIBADD = $(LIBFORS)
-+fors_pmos_calib_la_LIBADD = $(LIBFORS) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- fors_pmos_calib_la_LDFLAGS = -module -avoid-version
- fors_pmos_calib_la_DEPENDENCIES = $(LIBFORS)
-
- fors_pmos_science_la_SOURCES = fors_pmos_science.c
--fors_pmos_science_la_LIBADD = $(LIBFORS)
-+fors_pmos_science_la_LIBADD = $(LIBFORS) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- fors_pmos_science_la_LDFLAGS = -module -avoid-version
- fors_pmos_science_la_DEPENDENCIES = $(LIBFORS)
-
- fors_pmos_extract_la_SOURCES = fors_pmos_extract.c
--fors_pmos_extract_la_LIBADD = $(LIBFORS)
-+fors_pmos_extract_la_LIBADD = $(LIBFORS) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- fors_pmos_extract_la_LDFLAGS = -module -avoid-version
- fors_pmos_extract_la_DEPENDENCIES = $(LIBFORS)
--- a/fors/tests/Makefile.am
+++ b/fors/tests/Makefile.am
@@ -37,12 +37,12 @@
@@ -222,9 +19,9 @@ Description: Add the cpl libraries to the recips.so and the test program
--- a/mosca/libmosca/Makefile.am
+++ b/mosca/libmosca/Makefile.am
-@@ -41,4 +41,4 @@
+@@ -93,4 +93,4 @@
- libmosca_la_SOURCES = image_smooth.cpp mosca_image.cpp
- libmosca_la_LDFLAGS = -version-info 0:1:0
+ #The -static is needed because in VLT machines, with LD_LIBRARY_PATH=/usrlib:/vlt..., the /usr/lib/libstdc++.so is chosen at runtime, which is the wrong version (it was compiled with /vlt/VLT2010/....). This will compile everything static for this library. Once DFS machines are VLT-free this can be removed.
+ libmosca_la_LDFLAGS = -version-info 0:1:0 -static
-libmosca_la_LIBADD = -lm
+libmosca_la_LIBADD = -lm $(LIBCPLCORE)
diff --git a/debian/patches/private_libmosca.patch b/debian/patches/private_libmosca.patch
index 3f2f9a2..79937fa 100644
--- a/debian/patches/private_libmosca.patch
+++ b/debian/patches/private_libmosca.patch
@@ -3,12 +3,12 @@ Description: Make the "mosca" library private since it should only be used
by this pipeline.
--- a/mosca/libmosca/Makefile.am
+++ b/mosca/libmosca/Makefile.am
-@@ -37,7 +37,7 @@
-
+@@ -69,7 +69,7 @@
+
noinst_HEADERS =
-lib_LTLIBRARIES = libmosca.la
+privatelib_LTLIBRARIES = libmosca.la
- libmosca_la_SOURCES = image_smooth.cpp mosca_image.cpp
- libmosca_la_LDFLAGS = -version-info 0:1:0
+ libmosca_la_SOURCES = detected_slits.cpp detected_slit.cpp \
+ mosca_image.cpp \
diff --git a/debian/patches/series b/debian/patches/series
index f7ed244..6195aa1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,5 +2,4 @@ libadd_cpl.patch
set_plugindir.patch
use-std-paths-for-cpl.patch
dont_build_sextractor.patch
-fix_format_security.patch
private_libmosca.patch
diff --git a/debian/patches/set_plugindir.patch b/debian/patches/set_plugindir.patch
index a6a4698..45fbd8e 100644
--- a/debian/patches/set_plugindir.patch
+++ b/debian/patches/set_plugindir.patch
@@ -54,7 +54,7 @@ Description: Set the plugin directory so that esorex and python-cpl can find it.
[Absolute path to the sextractor executable])
--- a/reflex/ForsSpec.xml.in
+++ b/reflex/ForsSpec.xml.in
-@@ -3362,7 +3362,7 @@
+@@ -5926,7 +5926,7 @@
</entity>
<entity name="DataOrganizer" class="org.eso.DataOrganizer">
<display name="Data Organiser"/>
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/cpl-plugin-fors.git
More information about the debian-science-commits
mailing list