[cpl-plugin-vimos] 04/04: Update patches for newupstream version
Ole Streicher
olebole-guest at moszumanska.debian.org
Wed Nov 27 15:15:35 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-vimos.
commit 6749cf7f5931479734e59a03cec0b6fbf6e69c00
Author: Ole Streicher <debian at liska.ath.cx>
Date: Wed Nov 27 16:15:40 2013 +0100
Update patches for newupstream version
---
debian/changelog | 4 +--
debian/patches/fix_compiler_errors.patch | 43 ++++++++++-------------
debian/patches/libadd_cpl.patch | 58 ++++++++++++++++++--------------
3 files changed, 51 insertions(+), 54 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 621e7e8..c93912c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,5 @@
-cpl-plugin-vimos (2.9.7-1) unstable; urgency=low
+cpl-plugin-vimos (2.9.9-1) unstable; urgency=low
* Initial release. (Closes: #728894)
- -- Ole Streicher <debian at liska.ath.cx> Mon, 21 Oct 2013 10:09:22 +0200
+ -- Ole Streicher <debian at liska.ath.cx> Wed, 27 Nov 2013 16:14:16 +0100
diff --git a/debian/patches/fix_compiler_errors.patch b/debian/patches/fix_compiler_errors.patch
index 6bcb2c4..f8c3554 100644
--- a/debian/patches/fix_compiler_errors.patch
+++ b/debian/patches/fix_compiler_errors.patch
@@ -2,7 +2,7 @@ Author: Ole Streicher <debian at liska.ath.cx>
Description: Fix format security errors
--- a/vimos/moses.c
+++ b/vimos/moses.c
-@@ -5464,7 +5464,7 @@
+@@ -5463,7 +5463,7 @@
*err = sqrt(*err);
if (ids == NULL) {
@@ -11,18 +11,9 @@ Description: Fix format security errors
cpl_msg_debug(func, "Fitting IDS");
cpl_error_set_where(func);
if (rejection) {
-@@ -18711,7 +18711,7 @@
- if (col != 1) {
- cpl_table_delete(standard);
- cpl_msg_error(cpl_func,
-- "Assertion failure!!! col = %d (it should be 1)", col);
-+ "Assertion failure!!! col = %"CPL_SIZE_FORMAT" (it should be 1)", col);
- return 1;
- }
-
--- a/vimos/fors_dfs.c
+++ b/vimos/fors_dfs.c
-@@ -662,7 +662,7 @@
+@@ -665,7 +665,7 @@
if (frame) {
image = cpl_image_load(cpl_frame_get_filename(frame), type, 0, ext);
if (image == NULL) {
@@ -31,7 +22,7 @@ Description: Fix format security errors
cpl_msg_error(func, "Cannot load image %s",
cpl_frame_get_filename(frame));
}
-@@ -717,7 +717,7 @@
+@@ -720,7 +720,7 @@
if (frame) {
table = cpl_table_load(cpl_frame_get_filename(frame), ext, 1);
if (table == NULL) {
@@ -40,7 +31,7 @@ Description: Fix format security errors
cpl_msg_error(func, "Cannot load table %s",
cpl_frame_get_filename(frame));
}
-@@ -768,7 +768,7 @@
+@@ -771,7 +771,7 @@
if (frame) {
plist = cpl_propertylist_load(cpl_frame_get_filename(frame), ext);
if (plist == NULL) {
@@ -49,7 +40,7 @@ Description: Fix format security errors
cpl_msg_error(func, "Cannot load header from %s",
cpl_frame_get_filename(frame));
}
-@@ -824,7 +824,7 @@
+@@ -827,7 +827,7 @@
if (category == NULL || frameset == NULL || image == NULL) {
@@ -58,7 +49,7 @@ Description: Fix format security errors
cpl_error_set(func, CPL_ERROR_NULL_INPUT);
return -1;
}
-@@ -844,7 +844,7 @@
+@@ -847,7 +847,7 @@
cpl_frame_set_group(frame, CPL_FRAME_GROUP_PRODUCT);
cpl_frame_set_level(frame, CPL_FRAME_LEVEL_FINAL);
if (cpl_error_get_code()) {
@@ -67,7 +58,7 @@ Description: Fix format security errors
cpl_msg_error(func, "Cannot initialise the product frame");
cpl_frame_delete(frame);
cpl_free(filename);
-@@ -868,7 +868,7 @@
+@@ -871,7 +871,7 @@
if (cpl_dfs_setup_product_header(plist, frame, frameset, parlist,
recipename, version, "PRO-1.15")) {
#endif
@@ -76,7 +67,7 @@ Description: Fix format security errors
cpl_msg_error(func, "Problem with product %s FITS header definition",
category);
if (header == NULL)
-@@ -896,7 +896,7 @@
+@@ -899,7 +899,7 @@
if (cpl_image_save(image, filename, CPL_BPP_IEEE_FLOAT, plist,
CPL_IO_DEFAULT)) {
@@ -85,7 +76,7 @@ Description: Fix format security errors
cpl_msg_error(func, "Cannot save product %s to disk", filename);
if (header == NULL)
cpl_propertylist_delete(plist);
-@@ -962,7 +962,7 @@
+@@ -965,7 +965,7 @@
if (category == NULL || frameset == NULL || table == NULL) {
cpl_error_set(func, CPL_ERROR_NULL_INPUT);
@@ -94,7 +85,7 @@ Description: Fix format security errors
return -1;
}
-@@ -988,7 +988,7 @@
+@@ -991,7 +991,7 @@
cpl_frame_set_group(frame, CPL_FRAME_GROUP_PRODUCT);
cpl_frame_set_level(frame, CPL_FRAME_LEVEL_FINAL);
if (cpl_error_get_code()) {
@@ -103,7 +94,7 @@ Description: Fix format security errors
cpl_msg_error(func, "Cannot initialise the product frame");
cpl_frame_delete(frame);
cpl_free(filename);
-@@ -1012,7 +1012,7 @@
+@@ -1015,7 +1015,7 @@
if (cpl_dfs_setup_product_header(plist, frame, frameset, parlist,
recipename, version, "PRO-1.15")) {
#endif
@@ -112,7 +103,7 @@ Description: Fix format security errors
cpl_msg_error(func, "Problem with product %s FITS header definition",
category);
if (header == NULL)
-@@ -1038,7 +1038,7 @@
+@@ -1041,7 +1041,7 @@
if (cpl_table_save(table, plist, NULL, filename, CPL_IO_DEFAULT)) {
@@ -123,7 +114,7 @@ Description: Fix format security errors
cpl_propertylist_delete(plist);
--- a/vimos/vimos_calib_impl.c
+++ b/vimos/vimos_calib_impl.c
-@@ -983,7 +983,7 @@
+@@ -970,7 +970,7 @@
slits = mos_locate_spectra(refmask);
if (!slits) {
@@ -132,7 +123,7 @@ Description: Fix format security errors
vimos_calib_exit("No slits could be detected!");
}
-@@ -2070,7 +2070,7 @@
+@@ -2057,7 +2057,7 @@
cpl_table_delete(slits); slits = NULL;
if (cpl_error_get_code()) {
@@ -143,7 +134,7 @@ Description: Fix format security errors
--- a/vimos/vimos_science_impl.c
+++ b/vimos/vimos_science_impl.c
-@@ -1564,7 +1564,7 @@
+@@ -1561,7 +1561,7 @@
cpl_propertylist_delete(header); header = NULL;
if (cpl_error_get_code()) {
@@ -154,7 +145,7 @@ Description: Fix format security errors
else
--- a/vimos/vimos_calib_mult.c
+++ b/vimos/vimos_calib_mult.c
-@@ -1971,7 +1971,7 @@
+@@ -1960,7 +1960,7 @@
cpl_table_delete(subslits); subslits = NULL;
if (cpl_error_get_code()) {
@@ -165,7 +156,7 @@ Description: Fix format security errors
}
--- a/recipes/vmifucombinecube.cc
+++ b/recipes/vmifucombinecube.cc
-@@ -497,7 +497,7 @@
+@@ -499,7 +499,7 @@
if (i) {
if (strcmp(tplStart, astart)) {
if (warning) {
diff --git a/debian/patches/libadd_cpl.patch b/debian/patches/libadd_cpl.patch
index 2be8ab8..1fcc3b8 100644
--- a/debian/patches/libadd_cpl.patch
+++ b/debian/patches/libadd_cpl.patch
@@ -2,109 +2,115 @@ 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
-@@ -62,87 +62,87 @@
+@@ -57,92 +57,92 @@
+ endif
+
+ vmbias_la_SOURCES = vmbias.c
+-vmbias_la_LIBADD = $(LIBVIMOS)
++vmbias_la_LIBADD = $(LIBVIMOS) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
+ vmbias_la_LDFLAGS = -module -avoid-version -no-undefined $(CPL_LDFLAGS)
vmbias_la_DEPENDENCIES = $(LIBVIMOS)
vmdark_la_SOURCES = vmdark.c
-vmdark_la_LIBADD = $(LIBVIMOS)
+vmdark_la_LIBADD = $(LIBVIMOS) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- vmdark_la_LDFLAGS = -module -avoid-version -no-undefined
+ vmdark_la_LDFLAGS = -module -avoid-version -no-undefined $(CPL_LDFLAGS)
vmdark_la_DEPENDENCIES = $(LIBVIMOS)
vmifucalib_la_SOURCES = vmifucalib.c
-vmifucalib_la_LIBADD = $(LIBVIMOS)
+vmifucalib_la_LIBADD = $(LIBVIMOS) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- vmifucalib_la_LDFLAGS = -module -avoid-version -no-undefined
+ vmifucalib_la_LDFLAGS = -module -avoid-version -no-undefined $(CPL_LDFLAGS)
vmifucalib_la_DEPENDENCIES = $(LIBVIMOS)
vmifucombine_la_SOURCES = vmifucombine.c
-vmifucombine_la_LIBADD = $(LIBVIMOS)
+vmifucombine_la_LIBADD = $(LIBVIMOS) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- vmifucombine_la_LDFLAGS = -module -avoid-version -no-undefined
+ vmifucombine_la_LDFLAGS = -module -avoid-version -no-undefined $(CPL_LDFLAGS)
vmifucombine_la_DEPENDENCIES = $(LIBVIMOS)
vmifucombinecube_la_SOURCES = vmifucombinecube.cc
-vmifucombinecube_la_LIBADD = $(LIBVIMOS)
+vmifucombinecube_la_LIBADD = $(LIBVIMOS) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- vmifucombinecube_la_LDFLAGS = -module -avoid-version -no-undefined
+ vmifucombinecube_la_LDFLAGS = -module -avoid-version -no-undefined $(CPL_LDFLAGS)
vmifucombinecube_la_DEPENDENCIES = $(LIBVIMOS)
vmifuscience_la_SOURCES = vmifuscience.c
-vmifuscience_la_LIBADD = $(LIBVIMOS)
+vmifuscience_la_LIBADD = $(LIBVIMOS) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- vmifuscience_la_LDFLAGS = -module -avoid-version -no-undefined
+ vmifuscience_la_LDFLAGS = -module -avoid-version -no-undefined $(CPL_LDFLAGS)
vmifuscience_la_DEPENDENCIES = $(LIBVIMOS)
vmifustandard_la_SOURCES = vmifustandard.c
-vmifustandard_la_LIBADD = $(LIBVIMOS)
+vmifustandard_la_LIBADD = $(LIBVIMOS) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- vmifustandard_la_LDFLAGS = -module -avoid-version -no-undefined
+ vmifustandard_la_LDFLAGS = -module -avoid-version -no-undefined $(CPL_LDFLAGS)
vmifustandard_la_DEPENDENCIES = $(LIBVIMOS)
vmmosstandard_la_SOURCES = vmmosstandard.c
-vmmosstandard_la_LIBADD = $(LIBVIMOS)
+vmmosstandard_la_LIBADD = $(LIBVIMOS) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- vmmosstandard_la_LDFLAGS = -module -avoid-version -no-undefined
+ vmmosstandard_la_LDFLAGS = -module -avoid-version -no-undefined $(CPL_LDFLAGS)
vmmosstandard_la_DEPENDENCIES = $(LIBVIMOS)
vmmoscombine_la_SOURCES = vmmoscombine.c
-vmmoscombine_la_LIBADD = $(LIBVIMOS)
+vmmoscombine_la_LIBADD = $(LIBVIMOS) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- vmmoscombine_la_LDFLAGS = -module -avoid-version -no-undefined
+ vmmoscombine_la_LDFLAGS = -module -avoid-version -no-undefined $(CPL_LDFLAGS)
vmmoscombine_la_DEPENDENCIES = $(LIBVIMOS)
vmspphot_la_SOURCES = vmspphot.c
-vmspphot_la_LIBADD = $(LIBVIMOS)
+vmspphot_la_LIBADD = $(LIBVIMOS) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- vmspphot_la_LDFLAGS = -module -avoid-version -no-undefined
+ vmspphot_la_LDFLAGS = -module -avoid-version -no-undefined $(CPL_LDFLAGS)
vmspphot_la_DEPENDENCIES = $(LIBVIMOS)
vmdet_la_SOURCES = vmdet.c
-vmdet_la_LIBADD = $(LIBVIMOS)
+vmdet_la_LIBADD = $(LIBVIMOS) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- vmdet_la_LDFLAGS = -module -avoid-version -no-undefined
+ vmdet_la_LDFLAGS = -module -avoid-version -no-undefined $(CPL_LDFLAGS)
vmdet_la_DEPENDENCIES = $(LIBVIMOS)
vmimcalphot_la_SOURCES = vmimcalphot.c
-vmimcalphot_la_LIBADD = $(LIBVIMOS)
+vmimcalphot_la_LIBADD = $(LIBVIMOS) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- vmimcalphot_la_LDFLAGS = -module -avoid-version -no-undefined
+ vmimcalphot_la_LDFLAGS = -module -avoid-version -no-undefined $(CPL_LDFLAGS)
vmimcalphot_la_DEPENDENCIES = $(LIBVIMOS)
vmimflatscreen_la_SOURCES = vmimflatscreen.c
-vmimflatscreen_la_LIBADD = $(LIBVIMOS)
+vmimflatscreen_la_LIBADD = $(LIBVIMOS) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- vmimflatscreen_la_LDFLAGS = -module -avoid-version -no-undefined
+ vmimflatscreen_la_LDFLAGS = -module -avoid-version -no-undefined $(CPL_LDFLAGS)
vmimflatscreen_la_DEPENDENCIES = $(LIBVIMOS)
vmimflatsky_la_SOURCES = vmimflatsky.c
-vmimflatsky_la_LIBADD = $(LIBVIMOS)
+vmimflatsky_la_LIBADD = $(LIBVIMOS) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- vmimflatsky_la_LDFLAGS = -module -avoid-version -no-undefined
+ vmimflatsky_la_LDFLAGS = -module -avoid-version -no-undefined $(CPL_LDFLAGS)
vmimflatsky_la_DEPENDENCIES = $(LIBVIMOS)
vmimobsjitter_la_SOURCES = vmimobsjitter.c
-vmimobsjitter_la_LIBADD = $(LIBVIMOS)
+vmimobsjitter_la_LIBADD = $(LIBVIMOS) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- vmimobsjitter_la_LDFLAGS = -module -avoid-version -no-undefined
+ vmimobsjitter_la_LDFLAGS = -module -avoid-version -no-undefined $(CPL_LDFLAGS)
vmimobsjitter_la_DEPENDENCIES = $(LIBVIMOS)
vmimobsstare_la_SOURCES = vmimobsstare.c
-vmimobsstare_la_LIBADD = $(LIBVIMOS)
+vmimobsstare_la_LIBADD = $(LIBVIMOS) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- vmimobsstare_la_LDFLAGS = -module -avoid-version -no-undefined
+ vmimobsstare_la_LDFLAGS = -module -avoid-version -no-undefined $(CPL_LDFLAGS)
vmimobsstare_la_DEPENDENCIES = $(LIBVIMOS)
vmimpreimaging_la_SOURCES = vmimpreimaging.c
-vmimpreimaging_la_LIBADD = $(LIBVIMOS)
+vmimpreimaging_la_LIBADD = $(LIBVIMOS) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- vmimpreimaging_la_LDFLAGS = -module -avoid-version -no-undefined
+ vmimpreimaging_la_LDFLAGS = -module -avoid-version -no-undefined $(CPL_LDFLAGS)
vmimpreimaging_la_DEPENDENCIES = $(LIBVIMOS)
vmimstandard_la_SOURCES = vmimstandard.c
-vmimstandard_la_LIBADD = $(LIBVIMOS)
+vmimstandard_la_LIBADD = $(LIBVIMOS) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- vmimstandard_la_LDFLAGS = -module -avoid-version -no-undefined
+ vmimstandard_la_LDFLAGS = -module -avoid-version -no-undefined $(CPL_LDFLAGS)
vmimstandard_la_DEPENDENCIES = $(LIBVIMOS)
@@ -151,17 +151,17 @@
@@ -113,19 +119,19 @@ Description: Add the cpl libraries to the recips.so and the test program
endif
-vmmasktoccd_la_LIBADD = $(LIBVIMOS)
+vmmasktoccd_la_LIBADD = $(LIBVIMOS) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- vmmasktoccd_la_LDFLAGS = -module -avoid-version -no-undefined
+ vmmasktoccd_la_LDFLAGS = -module -avoid-version -no-undefined $(CPL_LDFLAGS)
vmmasktoccd_la_DEPENDENCIES = $(LIBVIMOS)
vmmosobsjitter_la_SOURCES = vmmosobsjitter.c
-vmmosobsjitter_la_LIBADD = $(LIBVIMOS)
+vmmosobsjitter_la_LIBADD = $(LIBVIMOS) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- vmmosobsjitter_la_LDFLAGS = -module -avoid-version -no-undefined
+ vmmosobsjitter_la_LDFLAGS = -module -avoid-version -no-undefined $(CPL_LDFLAGS)
vmmosobsjitter_la_DEPENDENCIES = $(LIBVIMOS)
vmmosobsstare_la_SOURCES = vmmosobsstare.c
-vmmosobsstare_la_LIBADD = $(LIBVIMOS)
+vmmosobsstare_la_LIBADD = $(LIBVIMOS) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- vmmosobsstare_la_LDFLAGS = -module -avoid-version -no-undefined
+ vmmosobsstare_la_LDFLAGS = -module -avoid-version -no-undefined $(CPL_LDFLAGS)
vmmosobsstare_la_DEPENDENCIES = $(LIBVIMOS)
@@ -170,26 +170,26 @@
@@ -134,29 +140,29 @@ Description: Add the cpl libraries to the recips.so and the test program
endif
-vmskyccd_la_LIBADD = $(LIBVIMOS)
+vmskyccd_la_LIBADD = $(LIBVIMOS) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- vmskyccd_la_LDFLAGS = -module -avoid-version -no-undefined
+ vmskyccd_la_LDFLAGS = -module -avoid-version -no-undefined $(CPL_LDFLAGS)
vmskyccd_la_DEPENDENCIES = $(LIBVIMOS)
vmspcaldisp_la_SOURCES = vmspcaldisp.c
-vmspcaldisp_la_LIBADD = $(LIBVIMOS)
+vmspcaldisp_la_LIBADD = $(LIBVIMOS) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- vmspcaldisp_la_LDFLAGS = -module -avoid-version -no-undefined
+ vmspcaldisp_la_LDFLAGS = -module -avoid-version -no-undefined $(CPL_LDFLAGS)
vmspcaldisp_la_DEPENDENCIES = $(LIBVIMOS)
vmspflat_la_SOURCES = vmspflat.c
-vmspflat_la_LIBADD = $(LIBVIMOS)
+vmspflat_la_LIBADD = $(LIBVIMOS) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- vmspflat_la_LDFLAGS = -module -avoid-version -no-undefined
+ vmspflat_la_LDFLAGS = -module -avoid-version -no-undefined $(CPL_LDFLAGS)
vmspflat_la_DEPENDENCIES = $(LIBVIMOS)
vmmoscalib_la_SOURCES = vimos_calib.c
-vmmoscalib_la_LIBADD = $(LIBVIMOS)
+vmmoscalib_la_LIBADD = $(LIBVIMOS) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- vmmoscalib_la_LDFLAGS = -module -avoid-version -no-undefined
+ vmmoscalib_la_LDFLAGS = -module -avoid-version -no-undefined $(CPL_LDFLAGS)
vmmoscalib_la_DEPENDENCIES = $(LIBVIMOS)
vmmosscience_la_SOURCES = vimos_science.c
-vmmosscience_la_LIBADD = $(LIBVIMOS)
+vmmosscience_la_LIBADD = $(LIBVIMOS) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- vmmosscience_la_LDFLAGS = -module -avoid-version -no-undefined
+ vmmosscience_la_LDFLAGS = -module -avoid-version -no-undefined $(CPL_LDFLAGS)
vmmosscience_la_DEPENDENCIES = $(LIBVIMOS)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/cpl-plugin-vimos.git
More information about the debian-science-commits
mailing list