[cpl-plugin-sinfo] 02/02: Adjust Debian files for new upstream version
Ole Streicher
olebole-guest at moszumanska.debian.org
Wed Nov 27 15:46:38 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-sinfo.
commit a3247ad3c83d818e1cb92161f4fcb56725360180
Author: Ole Streicher <debian at liska.ath.cx>
Date: Wed Nov 27 16:46:28 2013 +0100
Adjust Debian files for new upstream version
---
debian/changelog | 6 +
debian/patches/format_security.patch | 256 --------------------------------
debian/patches/libadd_cpl.patch | 249 -------------------------------
debian/patches/propagate_cppflags.patch | 13 --
debian/patches/series | 3 -
5 files changed, 6 insertions(+), 521 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 04d14f3..0cf25e6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+cpl-plugin-sinfo (2.4.0-1) unstable; urgency=low
+
+ * New upstream version
+
+ -- Ole Streicher <debian at liska.ath.cx> Wed, 27 Nov 2013 16:45:46 +0100
+
cpl-plugin-sinfo (2.3.3-1) unstable; urgency=low
* Initial release. (Closes: #709317)
diff --git a/debian/patches/format_security.patch b/debian/patches/format_security.patch
deleted file mode 100644
index 26aba2b..0000000
--- a/debian/patches/format_security.patch
+++ /dev/null
@@ -1,256 +0,0 @@
-Author: Ole Streicher <debian at liska.ath.cx>
-Description: Fix format security errors
---- a/sinfoni/sinfo_rec_utils.c
-+++ b/sinfoni/sinfo_rec_utils.c
-@@ -265,7 +265,7 @@
- basename(sky_name)); */
- snprintf(fake_sky_name,MAX_NAME_SIZE-1,"%s%d%s","out_fake_sky",i,".fits");
- } else {
-- snprintf(fake_sky_name, MAX_NAME_SIZE-1,sky_name) ;
-+ snprintf(fake_sky_name, MAX_NAME_SIZE-1,"%s", sky_name) ;
- }
-
- check_nomsg(sky_ima=cpl_image_load(sky_name,CPL_TYPE_FLOAT,0,0));
-@@ -463,7 +463,7 @@
- "fake_",basename(sky_name)); */
- snprintf(fake_sky_name,MAX_NAME_SIZE-1,"%s%d%s","out_fake_sky",i,".fits");
- } else {
-- snprintf(fake_sky_name, MAX_NAME_SIZE-1,sky_name) ;
-+ snprintf(fake_sky_name, MAX_NAME_SIZE-1, "%s", sky_name) ;
- }
-
- check_nomsg(sky_ima=cpl_image_load(sky_name,CPL_TYPE_FLOAT,0,0));
---- a/sinfoni/sinfo_objnod_ini_by_cpl.c
-+++ b/sinfoni/sinfo_objnod_ini_by_cpl.c
-@@ -228,7 +228,7 @@
- strcpy(cfg -> wavemap, cpl_frame_get_filename(frame));
- } else {
- sinfo_msg("Frame %s not found!", PRO_WAVE_MAP);
-- sinfo_msg_error((char* ) cpl_error_get_message());
-+ sinfo_msg_error("%s", (char* ) cpl_error_get_message());
- (*status)++;
- return ;
- }
-@@ -238,7 +238,7 @@
- strcpy(cfg -> mflat, cpl_frame_get_filename(frame));
- } else {
- sinfo_msg("Frame %s not found!", PRO_MASTER_FLAT_LAMP);
-- sinfo_msg_error((char* ) cpl_error_get_message());
-+ sinfo_msg_error("%s", (char* ) cpl_error_get_message());
- (*status)++;
- return ;
- }
---- a/sinfoni/sinfo_dfs.c
-+++ b/sinfoni/sinfo_dfs.c
-@@ -1733,8 +1733,8 @@
- int sinfo_check_rec_status(const int val) {
- if(cpl_error_get_code() != CPL_ERROR_NONE) {
- sinfo_msg_error("error before %d",val);
-- sinfo_msg_error((char* ) cpl_error_get_message());
-- sinfo_msg_error((char* ) cpl_error_get_where());
-+ sinfo_msg_error("%s", (char* ) cpl_error_get_message());
-+ sinfo_msg_error("%s", (char* ) cpl_error_get_where());
- return -1;
- }
- return 0;
---- a/sinfoni/sinfo_pro_save.c
-+++ b/sinfoni/sinfo_pro_save.c
-@@ -165,16 +165,16 @@
- cpl_propertylist * plist =NULL;
- if ((plist = cpl_propertylist_load(file, 0)) == NULL) {
- sinfo_msg_error( "getting header from file %s",file);
-- sinfo_msg_error((char* ) cpl_error_get_message());
-- sinfo_msg_error((char* ) cpl_error_get_where());
-+ sinfo_msg_error("%s", (char* ) cpl_error_get_message());
-+ sinfo_msg_error("%s", (char* ) cpl_error_get_where());
- cpl_propertylist_delete(plist) ;
- return -1 ;
- }
-
- if (CPL_ERROR_NONE!=cpl_propertylist_set_float(plist,card,value)){
- sinfo_msg_error( "setting header of file %s",file);
-- sinfo_msg_error((char* ) cpl_error_get_message());
-- sinfo_msg_error((char* ) cpl_error_get_where());
-+ sinfo_msg_error("%s", (char* ) cpl_error_get_message());
-+ sinfo_msg_error("%s", (char* ) cpl_error_get_where());
- cpl_propertylist_delete(plist) ;
- return -1 ;
- }
-@@ -858,7 +858,7 @@
- if(cpl_dfs_setup_product_header(*plist,product_frame,ref_set,parlist,recid,
- pipe_id,KEY_VALUE_HPRO_DID,NULL) != CPL_ERROR_NONE) {
- sinfo_msg_warning("Problem in the product DFS-compliance");
-- sinfo_msg_warning((char* ) cpl_error_get_message());
-+ sinfo_msg_warning("%s", (char* ) cpl_error_get_message());
- cpl_errorstate_dump(initial_errorstate, CPL_FALSE, NULL);
- cpl_error_reset();
- }
-@@ -885,7 +885,7 @@
- tmp = sinfo_new_get_rootname(in);
- strcpy(name_b,tmp);
- } else {
-- snprintf(name_b, MAX_NAME_SIZE-1,in) ;
-+ snprintf(name_b, MAX_NAME_SIZE-1,"%s", in) ;
- }
- strcpy(*ou,name_b);
- if (type == CPL_FRAME_TYPE_TABLE) {
---- a/sinfoni/sinfo_wcal_functions.c
-+++ b/sinfoni/sinfo_wcal_functions.c
-@@ -100,7 +100,7 @@
- fp=cpl_table_load(filename,1,0);
- if(cpl_error_get_code() != CPL_ERROR_NONE) {
- sinfo_msg("cannot load table %s",filename);
-- sinfo_msg_error((char* ) cpl_error_get_message());
-+ sinfo_msg_error("%s", (char* ) cpl_error_get_message());
- return -1;
- }
-
---- a/sinfoni/sinfo_new_slit_pos.c
-+++ b/sinfoni/sinfo_new_slit_pos.c
-@@ -174,7 +174,7 @@
- cfg->slitposIndicator=1;
- }
- if(cpl_error_get_code() != CPL_ERROR_NONE) {
-- sinfo_msg_error((char* ) cpl_error_get_message());
-+ sinfo_msg_error("%s", (char* ) cpl_error_get_message());
- sinfo_qc_wcal_delete(&qc);
- return -1;
- }
-@@ -239,7 +239,7 @@
- /*---open the line list and read the number of lines---*/
-
- if(cpl_error_get_code() != CPL_ERROR_NONE) {
-- sinfo_msg_error((char* ) cpl_error_get_message());
-+ sinfo_msg_error("%s", (char* ) cpl_error_get_message());
- sinfo_qc_wcal_delete(&qc);
- return -1;
- }
-@@ -247,14 +247,14 @@
- tbl_line_list_name=cfg->lineList;
- tbl_line_list = cpl_table_load(tbl_line_list_name,1,0);
- if(cpl_error_get_code() != CPL_ERROR_NONE) {
-- sinfo_msg_error((char* ) cpl_error_get_message());
-+ sinfo_msg_error("%s", (char* ) cpl_error_get_message());
- sinfo_qc_wcal_delete(&qc);
- return -1;
- }
- n = cpl_table_get_nrow(tbl_line_list);
- n_lines = n;
- if(cpl_error_get_code() != CPL_ERROR_NONE) {
-- sinfo_msg_error((char* ) cpl_error_get_message());
-+ sinfo_msg_error("%s", (char* ) cpl_error_get_message());
- sinfo_qc_wcal_delete(&qc);
- return -1;
- }
-@@ -271,14 +271,14 @@
-
- wave = cpl_table_get_data_float(tbl_line_list,"wave");
- if(cpl_error_get_code() != CPL_ERROR_NONE) {
-- sinfo_msg_error((char* ) cpl_error_get_message());
-+ sinfo_msg_error("%s", (char* ) cpl_error_get_message());
- sinfo_qc_wcal_delete(&qc);
- return -1;
- }
-
- intens = cpl_table_get_data_float(tbl_line_list,"int");
- if(cpl_error_get_code() != CPL_ERROR_NONE) {
-- sinfo_msg_error((char* ) cpl_error_get_message());
-+ sinfo_msg_error("%s", (char* ) cpl_error_get_message());
- sinfo_qc_wcal_delete(&qc);
- return -1;
- }
-@@ -571,7 +571,7 @@
- tbl_wcal = cpl_table_load(tbl_name,1,0);
- if(cpl_error_get_code() != CPL_ERROR_NONE) {
- sinfo_msg("cannot load table %s",tbl_name);
-- sinfo_msg_error((char* ) cpl_error_get_message());
-+ sinfo_msg_error("%s", (char* ) cpl_error_get_message());
- sinfo_qc_wcal_delete(&qc);
- return -1;
- }
-@@ -583,7 +583,7 @@
- }
- if(cpl_error_get_code() != CPL_ERROR_NONE) {
- sinfo_msg("cannot read table %s",tbl_name);
-- sinfo_msg_error((char* ) cpl_error_get_message());
-+ sinfo_msg_error("%s", (char* ) cpl_error_get_message());
- sinfo_qc_wcal_delete(&qc);
- return -1;
- }
---- a/sinfoni/sinfo_utilities.c
-+++ b/sinfoni/sinfo_utilities.c
-@@ -760,7 +760,7 @@
- if ((iset = sinfo_new_imagelist_load_frameset(fset,
- CPL_TYPE_FLOAT, 0, 0)) == NULL) {
- sinfo_msg_error( "Cannot load *** the image set") ;
-- sinfo_msg_error((char* ) cpl_error_get_message());
-+ sinfo_msg_error("%s", (char* ) cpl_error_get_message());
-
- cpl_free(filenames) ;
- return NULL ;
---- a/sinfoni/sinfo_utilities_scired.c
-+++ b/sinfoni/sinfo_utilities_scired.c
-@@ -443,14 +443,14 @@
- /*READ TFITS TABLE*/
- if(cpl_error_get_code() != CPL_ERROR_NONE) {
- sinfo_msg_error("Before loading input table");
-- sinfo_msg_error((char* ) cpl_error_get_message());
-+ sinfo_msg_error("%s", (char* ) cpl_error_get_message());
- return NULL;
- }
- strcpy(tbl_distances_name,distlist);
- tbl_distances = cpl_table_load(tbl_distances_name,1,0);
- if(cpl_error_get_code() != CPL_ERROR_NONE) {
- sinfo_msg_error("loading input table %s",tbl_distances_name);
-- sinfo_msg_error((char* ) cpl_error_get_message());
-+ sinfo_msg_error("%s", (char* ) cpl_error_get_message());
- return NULL;
- }
-
-@@ -459,7 +459,7 @@
- if(cpl_error_get_code() != CPL_ERROR_NONE) {
- sinfo_msg_error("reading col %s from table %s","slitlet_distance",
- tbl_distances_name);
-- sinfo_msg_error((char* ) cpl_error_get_message());
-+ sinfo_msg_error("%s", (char* ) cpl_error_get_message());
- return NULL;
- }
- sinfo_new_array_set_value(distances,tmp_float,i);
-@@ -498,7 +498,7 @@
- tbl_slitpos = cpl_table_load(tbl_slitpos_name,1,0);
- if(cpl_error_get_code() != CPL_ERROR_NONE) {
- sinfo_msg_error("error loading tbl %s",tbl_slitpos_name);
-- sinfo_msg_error((char* ) cpl_error_get_message());
-+ sinfo_msg_error("%s", (char* ) cpl_error_get_message());
- return NULL;
- }
- n = cpl_table_get_nrow(tbl_slitpos);
-@@ -512,7 +512,7 @@
- edge_y=cpl_table_get_double(tbl_slitpos,"pos2",i,status);
- if(cpl_error_get_code() != CPL_ERROR_NONE) {
- sinfo_msg_error("error reading tbl %s row %d",tbl_slitpos_name,i);
-- sinfo_msg_error((char* ) cpl_error_get_message());
-+ sinfo_msg_error("%s", (char* ) cpl_error_get_message());
- return NULL;
- }
- sinfo_new_array2D_set_value(slit_edges,edge_x,i,0);
-@@ -521,7 +521,7 @@
- cpl_table_delete(tbl_slitpos);
- if(cpl_error_get_code() != CPL_ERROR_NONE) {
- sinfo_msg_error("error reading tbl %s",tbl_slitpos_name);
-- sinfo_msg_error((char* ) cpl_error_get_message());
-+ sinfo_msg_error("%s", (char* ) cpl_error_get_message());
- return NULL;
- }
-
---- a/recipes/sinfo_rec_distortion.c
-+++ b/recipes/sinfo_rec_distortion.c
-@@ -793,7 +793,7 @@
- if( (img = cpl_imagelist_collapse_minmax_create(imset_tot,
- lo_cut,hi_cut)) == NULL) {
- sinfo_msg_error("Error code");
-- sinfo_msg_error((char* ) cpl_error_get_message());
-+ sinfo_msg_error("%s", (char* ) cpl_error_get_message());
- cpl_imagelist_delete(imset_tot);
- cpl_frameset_delete(sof);
- cpl_propertylist_delete(plist) ;
diff --git a/debian/patches/libadd_cpl.patch b/debian/patches/libadd_cpl.patch
deleted file mode 100644
index 4988a8b..0000000
--- a/debian/patches/libadd_cpl.patch
+++ /dev/null
@@ -1,249 +0,0 @@
-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
-@@ -75,205 +75,205 @@
- #New recipes
-
- #sinfo_utl_table_test_la_SOURCES = sinfo_utl_table_test.c
--#sinfo_utl_table_test_la_LIBADD = $(LIBSINFONI)
-+#sinfo_utl_table_test_la_LIBADD = $(LIBSINFONI) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- #sinfo_utl_table_test_la_LDFLAGS = -module -avoid-version
- #sinfo_utl_table_test_la_DEPENDENCIES = $(LIBSINFONI)
-
- #sinfo_rec_mdark_detmon_la_SOURCES = sinfo_rec_mdark_detmon.c
--#sinfo_rec_mdark_detmon_la_LIBADD = $(LIBSINFONI)
-+#sinfo_rec_mdark_detmon_la_LIBADD = $(LIBSINFONI) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- #sinfo_rec_mdark_detmon_la_LDFLAGS = -module -avoid-version
- #sinfo_rec_mdark_detmon_la_DEPENDENCIES = $(LIBSINFONI)
-
- sinfo_rec_detlin_la_SOURCES = sinfo_rec_detlin.c
--sinfo_rec_detlin_la_LIBADD = $(LIBSINFONI)
-+sinfo_rec_detlin_la_LIBADD = $(LIBSINFONI) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- sinfo_rec_detlin_la_LDFLAGS = -module -avoid-version
- sinfo_rec_detlin_la_DEPENDENCIES = $(LIBSINFONI)
-
- sinfo_rec_distortion_la_SOURCES = sinfo_rec_distortion.c
--sinfo_rec_distortion_la_LIBADD = $(LIBSINFONI)
-+sinfo_rec_distortion_la_LIBADD = $(LIBSINFONI) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- sinfo_rec_distortion_la_LDFLAGS = -module -avoid-version
- sinfo_rec_distortion_la_DEPENDENCIES = $(LIBSINFONI)
-
- sinfo_rec_jitter_la_SOURCES = sinfo_rec_jitter.c
--sinfo_rec_jitter_la_LIBADD = $(LIBSINFONI)
-+sinfo_rec_jitter_la_LIBADD = $(LIBSINFONI) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- sinfo_rec_jitter_la_LDFLAGS = -module -avoid-version
- sinfo_rec_jitter_la_DEPENDENCIES = $(LIBSINFONI)
-
-
- #sinfo_rec_lingain_la_SOURCES = sinfo_rec_lingain.c
--#sinfo_rec_lingain_la_LIBADD = $(LIBSINFONI)
-+#sinfo_rec_lingain_la_LIBADD = $(LIBSINFONI) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- #sinfo_rec_lingain_la_LDFLAGS = -module -avoid-version
- #sinfo_rec_lingain_la_DEPENDENCIES = $(LIBSINFONI)
-
- sinfo_rec_mdark_la_SOURCES = sinfo_rec_mdark.c
--sinfo_rec_mdark_la_LIBADD = $(LIBSINFONI)
-+sinfo_rec_mdark_la_LIBADD = $(LIBSINFONI) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- sinfo_rec_mdark_la_LDFLAGS = -module -avoid-version
- sinfo_rec_mdark_la_DEPENDENCIES = $(LIBSINFONI)
-
- sinfo_rec_mflat_la_SOURCES = sinfo_rec_mflat.c
--sinfo_rec_mflat_la_LIBADD = $(LIBSINFONI)
-+sinfo_rec_mflat_la_LIBADD = $(LIBSINFONI) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- sinfo_rec_mflat_la_LDFLAGS = -module -avoid-version
- sinfo_rec_mflat_la_DEPENDENCIES = $(LIBSINFONI)
-
- #sinfo_rec_objnod_la_SOURCES = sinfo_rec_objnod.c
--#sinfo_rec_objnod_la_LIBADD = $(LIBSINFONI)
-+#sinfo_rec_objnod_la_LIBADD = $(LIBSINFONI) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- #sinfo_rec_objnod_la_LDFLAGS = -module -avoid-version
- #sinfo_rec_objnod_la_DEPENDENCIES = $(LIBSINFONI)
-
- #sinfo_rec_psf_la_SOURCES = sinfo_rec_psf.c
--#sinfo_rec_psf_la_LIBADD = $(LIBSINFONI)
-+#sinfo_rec_psf_la_LIBADD = $(LIBSINFONI) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- #sinfo_rec_psf_la_LDFLAGS = -module -avoid-version
- #sinfo_rec_psf_la_DEPENDENCIES = $(LIBSINFONI)
-
- sinfo_rec_pupil_la_SOURCES = sinfo_rec_pupil.c
--sinfo_rec_pupil_la_LIBADD = $(LIBSINFONI)
-+sinfo_rec_pupil_la_LIBADD = $(LIBSINFONI) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- sinfo_rec_pupil_la_LDFLAGS = -module -avoid-version
- sinfo_rec_pupil_la_DEPENDENCIES = $(LIBSINFONI)
-
- #sinfo_rec_stdstar_la_SOURCES = sinfo_rec_stdstar.c
--#sinfo_rec_stdstar_la_LIBADD = $(LIBSINFONI)
-+#sinfo_rec_stdstar_la_LIBADD = $(LIBSINFONI) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- #sinfo_rec_stdstar_la_LDFLAGS = -module -avoid-version
- #sinfo_rec_stdstar_la_DEPENDENCIES = $(LIBSINFONI)
-
- sinfo_rec_wavecal_la_SOURCES = sinfo_rec_wavecal.c
--sinfo_rec_wavecal_la_LIBADD = $(LIBSINFONI)
-+sinfo_rec_wavecal_la_LIBADD = $(LIBSINFONI) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- sinfo_rec_wavecal_la_LDFLAGS = -module -avoid-version
- sinfo_rec_wavecal_la_DEPENDENCIES = $(LIBSINFONI)
-
- #sinfo_step_jitter_la_SOURCES = sinfo_step_jitter.c
--#sinfo_step_jitter_la_LIBADD = $(LIBSINFONI)
-+#sinfo_step_jitter_la_LIBADD = $(LIBSINFONI) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- #sinfo_step_jitter_la_LDFLAGS = -module -avoid-version
- #sinfo_step_jitter_la_DEPENDENCIES = $(LIBSINFONI)
-
-
- #sinfo_step_psf_la_SOURCES = sinfo_step_psf.c
--#sinfo_step_psf_la_LIBADD = $(LIBSINFONI)
-+#sinfo_step_psf_la_LIBADD = $(LIBSINFONI) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- #sinfo_step_psf_la_LDFLAGS = -module -avoid-version
- #sinfo_step_psf_la_DEPENDENCIES = $(LIBSINFONI)
-
- #sinfo_step_stdstar_la_SOURCES = sinfo_step_stdstar.c
--#sinfo_step_stdstar_la_LIBADD = $(LIBSINFONI)
-+#sinfo_step_stdstar_la_LIBADD = $(LIBSINFONI) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- #sinfo_step_stdstar_la_LDFLAGS = -module -avoid-version
- #sinfo_step_stdstar_la_DEPENDENCIES = $(LIBSINFONI)
-
- #sinfo_step_objnod_la_SOURCES = sinfo_step_objnod.c
--#sinfo_step_objnod_la_LIBADD = $(LIBSINFONI)
-+#sinfo_step_objnod_la_LIBADD = $(LIBSINFONI) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- #sinfo_step_objnod_la_LDFLAGS = -module -avoid-version
- #sinfo_step_objnod_la_DEPENDENCIES = $(LIBSINFONI)
-
-
- #sinfo_step_distortion_la_SOURCES = sinfo_step_distortion.c
--#sinfo_step_distortion_la_LIBADD = $(LIBSINFONI)
-+#sinfo_step_distortion_la_LIBADD = $(LIBSINFONI) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- #sinfo_step_distortion_la_LDFLAGS = -module -avoid-version
- #sinfo_step_distortion_la_DEPENDENCIES = $(LIBSINFONI)
-
-
- sinfo_utl_bp_mask_add_la_SOURCES = sinfo_utl_bp_mask_add.c
--sinfo_utl_bp_mask_add_la_LIBADD = $(LIBSINFONI)
-+sinfo_utl_bp_mask_add_la_LIBADD = $(LIBSINFONI) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- sinfo_utl_bp_mask_add_la_LDFLAGS = -module -avoid-version
- sinfo_utl_bp_mask_add_la_DEPENDENCIES = $(LIBSINFONI)
-
- sinfo_utl_cube2ima_la_SOURCES = sinfo_utl_cube2ima.c
--sinfo_utl_cube2ima_la_LIBADD = $(LIBSINFONI)
-+sinfo_utl_cube2ima_la_LIBADD = $(LIBSINFONI) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- sinfo_utl_cube2ima_la_LDFLAGS = -module -avoid-version
- sinfo_utl_cube2ima_la_DEPENDENCIES = $(LIBSINFONI)
-
- #sinfo_utl_ima_cube_ks_test_la_SOURCES = sinfo_utl_ima_cube_ks_test.c
--#sinfo_utl_ima_cube_ks_test_la_LIBADD = $(LIBSINFONI)
-+#sinfo_utl_ima_cube_ks_test_la_LIBADD = $(LIBSINFONI) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- #sinfo_utl_ima_cube_ks_test_la_LDFLAGS = -module -avoid-version
- #sinfo_utl_ima_cube_ks_test_la_DEPENDENCIES = $(LIBSINFONI)
-
- #sinfo_utl_eff_la_SOURCES = sinfo_utl_eff.c
--#sinfo_utl_eff_la_LIBADD = $(LIBSINFONI)
-+#sinfo_utl_eff_la_LIBADD = $(LIBSINFONI) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- #sinfo_utl_eff_la_LDFLAGS = -module -avoid-version
- #sinfo_utl_eff_la_DEPENDENCIES = $(LIBSINFONI)
-
- sinfo_utl_cube2spectrum_la_SOURCES = sinfo_utl_cube2spectrum.c
--sinfo_utl_cube2spectrum_la_LIBADD = $(LIBSINFONI)
-+sinfo_utl_cube2spectrum_la_LIBADD = $(LIBSINFONI) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- sinfo_utl_cube2spectrum_la_LDFLAGS = -module -avoid-version
- sinfo_utl_cube2spectrum_la_DEPENDENCIES = $(LIBSINFONI)
-
- sinfo_utl_cube_arith_la_SOURCES = sinfo_utl_cube_arith.c
--sinfo_utl_cube_arith_la_LIBADD = $(LIBSINFONI)
-+sinfo_utl_cube_arith_la_LIBADD = $(LIBSINFONI) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- sinfo_utl_cube_arith_la_LDFLAGS = -module -avoid-version
- sinfo_utl_cube_arith_la_DEPENDENCIES = $(LIBSINFONI)
-
- sinfo_utl_cube_combine_la_SOURCES = sinfo_utl_cube_combine.c
--sinfo_utl_cube_combine_la_LIBADD = $(LIBSINFONI)
-+sinfo_utl_cube_combine_la_LIBADD = $(LIBSINFONI) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- sinfo_utl_cube_combine_la_LDFLAGS = -module -avoid-version
- sinfo_utl_cube_combine_la_DEPENDENCIES = $(LIBSINFONI)
-
- sinfo_utl_cube_create_la_SOURCES = sinfo_utl_cube_create.c
--sinfo_utl_cube_create_la_LIBADD = $(LIBSINFONI)
-+sinfo_utl_cube_create_la_LIBADD = $(LIBSINFONI) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- sinfo_utl_cube_create_la_LDFLAGS = -module -avoid-version
- sinfo_utl_cube_create_la_DEPENDENCIES = $(LIBSINFONI)
-
- #sinfo_utl_illumcorr_la_SOURCES = sinfo_utl_illumcorr.c
--#sinfo_utl_illumcorr_la_LIBADD = $(LIBSINFONI)
-+#sinfo_utl_illumcorr_la_LIBADD = $(LIBSINFONI) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- #sinfo_utl_illumcorr_la_LDFLAGS = -module -avoid-version
- #sinfo_utl_illumcorr_la_DEPENDENCIES = $(LIBSINFONI)
-
- sinfo_utl_ima_arith_la_SOURCES = sinfo_utl_ima_arith.c
--sinfo_utl_ima_arith_la_LIBADD = $(LIBSINFONI)
-+sinfo_utl_ima_arith_la_LIBADD = $(LIBSINFONI) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- sinfo_utl_ima_arith_la_LDFLAGS = -module -avoid-version
- sinfo_utl_ima_arith_la_DEPENDENCIES = $(LIBSINFONI)
-
- #sinfo_utl_ima_gauss_la_SOURCES = sinfo_utl_ima_gauss.c
--#sinfo_utl_ima_gauss_la_LIBADD = $(LIBSINFONI)
-+#sinfo_utl_ima_gauss_la_LIBADD = $(LIBSINFONI) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- #sinfo_utl_ima_gauss_la_LDFLAGS = -module -avoid-version
- #sinfo_utl_ima_gauss_la_DEPENDENCIES = $(LIBSINFONI)
-
- sinfo_utl_ima_line_corr_la_SOURCES = sinfo_utl_ima_line_corr.c
--sinfo_utl_ima_line_corr_la_LIBADD = $(LIBSINFONI)
-+sinfo_utl_ima_line_corr_la_LIBADD = $(LIBSINFONI) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- sinfo_utl_ima_line_corr_la_LDFLAGS = -module -avoid-version
- sinfo_utl_ima_line_corr_la_DEPENDENCIES = $(LIBSINFONI)
-
- sinfo_utl_skycor_la_SOURCES = sinfo_utl_skycor.c
--sinfo_utl_skycor_la_LIBADD = $(LIBSINFONI)
-+sinfo_utl_skycor_la_LIBADD = $(LIBSINFONI) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- sinfo_utl_skycor_la_LDFLAGS = -module -avoid-version
- sinfo_utl_skycor_la_DEPENDENCIES = $(LIBSINFONI)
-
-
- sinfo_utl_skymap_la_SOURCES = sinfo_utl_skymap.c
--sinfo_utl_skymap_la_LIBADD = $(LIBSINFONI)
-+sinfo_utl_skymap_la_LIBADD = $(LIBSINFONI) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- sinfo_utl_skymap_la_LDFLAGS = -module -avoid-version
- sinfo_utl_skymap_la_DEPENDENCIES = $(LIBSINFONI)
-
- #sinfo_utl_table_ex_la_SOURCES = sinfo_utl_table_ex.c
--#sinfo_utl_table_ex_la_LIBADD = $(LIBSINFONI)
-+#sinfo_utl_table_ex_la_LIBADD = $(LIBSINFONI) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- #sinfo_utl_table_ex_la_LDFLAGS = -module -avoid-version
- #sinfo_utl_table_ex_la_DEPENDENCIES = $(LIBSINFONI)
-
- #sinfo_img_noise_la_SOURCES = sinfo_img_noise.c
--#sinfo_img_noise_la_LIBADD = $(LIBSINFONI)
-+#sinfo_img_noise_la_LIBADD = $(LIBSINFONI) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- #sinfo_img_noise_la_LDFLAGS = -module -avoid-version
- #sinfo_img_noise_la_DEPENDENCIES = $(LIBSINFONI)
-
- sinfo_utl_spectrum_divide_by_blackbody_la_SOURCES = sinfo_utl_spectrum_divide_by_blackbody.c
--sinfo_utl_spectrum_divide_by_blackbody_la_LIBADD = $(LIBSINFONI)
-+sinfo_utl_spectrum_divide_by_blackbody_la_LIBADD = $(LIBSINFONI) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- sinfo_utl_spectrum_divide_by_blackbody_la_LDFLAGS = -module -avoid-version
- sinfo_utl_spectrum_divide_by_blackbody_la_DEPENDENCIES = $(LIBSINFONI)
-
-
- sinfo_utl_spectrum_wavelength_shift_la_SOURCES = sinfo_utl_spectrum_wavelength_shift.c
--sinfo_utl_spectrum_wavelength_shift_la_LIBADD = $(LIBSINFONI)
-+sinfo_utl_spectrum_wavelength_shift_la_LIBADD = $(LIBSINFONI) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- sinfo_utl_spectrum_wavelength_shift_la_LDFLAGS = -module -avoid-version
- sinfo_utl_spectrum_wavelength_shift_la_DEPENDENCIES = $(LIBSINFONI)
-
- #sinfo_utl_stdstars_la_SOURCES = sinfo_utl_stdstars.c
--#sinfo_utl_stdstars_la_LIBADD = $(LIBSINFONI)
-+#sinfo_utl_stdstars_la_LIBADD = $(LIBSINFONI) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- #sinfo_utl_stdstars_la_LDFLAGS = -module -avoid-version
- #sinfo_utl_stdstars_la_DEPENDENCIES = $(LIBSINFONI)
-
-
- #sinfo_utl_seds_la_SOURCES = sinfo_utl_seds.c
--#sinfo_utl_seds_la_LIBADD = $(LIBSINFONI)
-+#sinfo_utl_seds_la_LIBADD = $(LIBSINFONI) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- #sinfo_utl_seds_la_LDFLAGS = -module -avoid-version
- #sinfo_utl_seds_la_DEPENDENCIES = $(LIBSINFONI)
-
-
- sinfo_utl_line_oh_select_la_SOURCES = sinfo_utl_line_oh_select.c
--sinfo_utl_line_oh_select_la_LIBADD = $(LIBSINFONI)
-+sinfo_utl_line_oh_select_la_LIBADD = $(LIBSINFONI) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- sinfo_utl_line_oh_select_la_LDFLAGS = -module -avoid-version
- sinfo_utl_line_oh_select_la_DEPENDENCIES = $(LIBSINFONI)
-
diff --git a/debian/patches/propagate_cppflags.patch b/debian/patches/propagate_cppflags.patch
deleted file mode 100644
index d423ba2..0000000
--- a/debian/patches/propagate_cppflags.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Author: Ole Streicher <debian at liska.ath.cx>
-Description: Propagate CPPFLAGS to allow hardening
---- a/sinfoni/Makefile.am
-+++ b/sinfoni/Makefile.am
-@@ -26,7 +26,7 @@
- EXTRA_DIST =
-
-
--CPPFLAGS = -DCX_LOG_DOMAIN=\"SinfoLib\"
-+AM_CPPFLAGS = -DCX_LOG_DOMAIN=\"SinfoLib\"
-
- INCLUDES = $(all_includes)
-
diff --git a/debian/patches/series b/debian/patches/series
index 2993b36..ab30d86 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,3 @@
-libadd_cpl.patch
set_plugindir.patch
use-std-paths-for-cpl.patch
-format_security.patch
explicite_function_declaration.patch
-propagate_cppflags.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/cpl-plugin-sinfo.git
More information about the debian-science-commits
mailing list