[SCM] polsarpro branch, master, updated. upstream/4.2.0+dfsg-27-ga51075e
The following commit has been merged in the master branch: commit a51075e337da5abe698d937ee9c01de3028285ca Author: Antonio Valentino Date: Sun Mar 10 12:20:38 2013 + Update copyright format diff --git a/debian/changelog b/debian/changelog index a970df6..00113c5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,4 +2,5 @@ polsarpro (4.2.0+dfsg-1) unstable; urgency=low * Initial release (Closes: #606876) - -- Antonio Valentino Mon, 05 Dec 2011 21:46:10 +0100 + -- Antonio Valentino Sun, 10 Mar 2013 12:17:43 + + diff --git a/debian/copyright b/debian/copyright index 70abda2..607d5f9 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,4 +1,4 @@ -Format: http://anonscm.debian.org/viewvc/dep/web/deps/dep5.mdwn?revision=202 +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0 Upstream-Name: polsarpro Source: http://earth.esa.int/polsarpro -- Polarimetric SAR Data Processing and Educational Tool ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[SCM] polsarpro branch, master, updated. upstream/4.2.0+dfsg-27-ga51075e
The following commit has been merged in the master branch:
commit cdfdbd43c883f05396565e522ece39c56d4aaec0
Author: Antonio Valentino
Date: Sat Mar 9 20:40:45 2013 +
New patch: fix build problems with hardening flags
diff --git a/debian/patches/hardening.patch b/debian/patches/hardening.patch
new file mode 100644
index 000..81d2386
--- /dev/null
+++ b/debian/patches/hardening.patch
@@ -0,0 +1,434 @@
+Fix issues that break building with hardening flags enabled
+--- a/Soft/data_process_dual/supervised_classifier_S2.c
b/Soft/data_process_dual/supervised_classifier_S2.c
+@@ -256,7 +256,7 @@
+ edit_error("Could not open input file : ", file_name);
+ }
+
+-sprintf(file_name, cluster_file);
++sprintf(file_name, "%s", cluster_file);
+ if ((trn_file = fopen(file_name, "rb")) == NULL)
+ edit_error("Could not open parameter file : ", file_name);
+
+--- a/Soft/data_process_dual/supervised_classifier_T6.c
b/Soft/data_process_dual/supervised_classifier_T6.c
+@@ -260,7 +260,7 @@
+ }
+ }
+
+-sprintf(file_name, cluster_file);
++sprintf(file_name, "%s", cluster_file);
+ if ((trn_file = fopen(file_name, "rb")) == NULL)
+ edit_error("Could not open parameter file : ", file_name);
+
+--- a/Soft/data_process_dual/training_set_sampler_S2.c
b/Soft/data_process_dual/training_set_sampler_S2.c
+@@ -497,7 +497,7 @@
+ } /* Class */
+ if (border_error_flag == 0)
+ {
+- sprintf(file_name, cluster_file);
++ sprintf(file_name, "%s", cluster_file);
+ if ((trn_file = fopen(file_name, "wb")) == NULL)
+ edit_error("Could not open output file : ", file_name);
+
+--- a/Soft/data_process_dual/training_set_sampler_T6.c
b/Soft/data_process_dual/training_set_sampler_T6.c
+@@ -412,7 +412,7 @@
+ } /* Class */
+ if (border_error_flag == 0)
+ {
+- sprintf(file_name, cluster_file);
++ sprintf(file_name, "%s", cluster_file);
+ if ((trn_file = fopen(file_name, "wb")) == NULL)
+ edit_error("Could not open output file : ", file_name);
+
+--- a/Soft/data_process_dual/wishart_opt_coh_classifier_S2.c
b/Soft/data_process_dual/wishart_opt_coh_classifier_S2.c
+@@ -224,7 +224,7 @@
+ if ((fich_mask=fopen(nom_fich, "rb"))==NULL)
+ edit_error("Could not open input file : ", nom_fich);
+
+- sprintf(nom_fich,class_file_name);
++ sprintf(nom_fich, "%s", class_file_name);
+ if ((fich_classe_in=fopen(nom_fich,"rb"))==NULL)
+ edit_error("Could not open input file : ", nom_fich);
+
+--- a/Soft/data_process_dual/wishart_opt_coh_classifier_T6.c
b/Soft/data_process_dual/wishart_opt_coh_classifier_T6.c
+@@ -219,7 +219,7 @@
+ if ((fich_mask=fopen(nom_fich, "rb"))==NULL)
+ edit_error("Could not open input file : ", nom_fich);
+
+- sprintf(nom_fich,class_file_name);
++ sprintf(nom_fich, "%s", class_file_name);
+ if ((fich_classe_in=fopen(nom_fich,"rb"))==NULL)
+ edit_error("Could not open input file : ", nom_fich);
+
+--- a/Soft/data_process_sngl/training_set_sampler_T4.c
b/Soft/data_process_sngl/training_set_sampler_T4.c
+@@ -426,7 +426,7 @@
+ } /* Class */
+ if (border_error_flag == 0)
+ {
+- sprintf(file_name, cluster_file);
++ sprintf(file_name, "%s", cluster_file);
+ if ((trn_file = fopen(file_name, "wb")) == NULL)
+ edit_error("Could not open output file : ", file_name);
+
+--- a/Soft/tools/create_mask_file.c
b/Soft/tools/create_mask_file.c
+@@ -192,7 +192,7 @@
+ }/* Class */
+
+ if (border_error_flag == 0) {
+- sprintf(file_name, mask_file);
++ sprintf(file_name, "%s", mask_file);
+ if ((trn_file = fopen(file_name, "wb")) == NULL)
+ edit_error("Could not open output file : ", file_name);
+ for (lig = 0; lig < Nlig; lig++) fwrite(&im[lig][0], sizeof(float),
Ncol, trn_file);
+--- a/Soft/tools/create_mask_roi_file.c
b/Soft/tools/create_mask_roi_file.c
+@@ -192,13 +192,13 @@
+ }/* Class */
+
+ if (border_error_flag == 0) {
+- sprintf(file_name, mask_file_bin);
++ sprintf(file_name, "%s", mask_file_bin);
+ if ((trn_file = fopen(file_name, "wb")) == NULL)
+ edit_error("Could not open output file : ", file_name);
+ for (lig = 0; lig < Sub_Nlig; lig++) fwrite(&im[lig][0],
sizeof(float), Sub_Ncol, trn_file);
+ fclose(trn_file);
+
+- sprintf(file_name, mask_file_txt);
++ sprintf(file_name, "%s", mask_file_txt);
+ if ((trn_file = fopen(file_name, "w")) == NULL)
+ edit_error("Could not open output file : ", file_name);
+ fprintf(trn_file,"%i\n",Off_lig);
+--- a/Soft/data_process_sngl/supervised_classifier_C4.c
b/Soft/data_process_sngl/supervised_classi
[SCM] polsarpro branch, master, updated. upstream/4.2.0+dfsg-27-ga51075e
The following commit has been merged in the master branch: commit 4e3ddc36260697e723cecab5ecdac54caad3e6af Author: Antonio Valentino Date: Sun Mar 10 12:53:23 2013 +0100 Bunp standards version to 3.9.4 (no changes) diff --git a/debian/control b/debian/control index 81b06d4..f0880fb 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Debian GIS Project Uploaders: Antonio Valentino Build-Depends: debhelper (>= 9.0.0), dos2unix -Standards-Version: 3.9.2 +Standards-Version: 3.9.4 Homepage: http://earth.esa.int/polsarpro Vcs-Git: git://git.debian.org/git/pkg-grass/polsarpro.git Vcs-Browser: http://git.debian.org/?p=pkg-grass/polsarpro.git -- Polarimetric SAR Data Processing and Educational Tool ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[SCM] polsarpro branch, master, updated. upstream/4.2.0+dfsg-27-ga51075e
The following commit has been merged in the master branch: commit d766fe0ecfd5cbe915436bd06f115724c01d0e0f Author: Antonio Valentino Date: Sat Mar 9 20:16:47 2013 + Set compat to 9wq diff --git a/debian/Makefile b/debian/Makefile index 80bac32..246a9b6 100644 --- a/debian/Makefile +++ b/debian/Makefile @@ -1,8 +1,8 @@ # Makefile -CFLAGS = -Wall -O2 -CXXFLAGS = $(CFLAGS) -Wconversion -LDFLAGS = -lm +CFLAGS += -Wall -O2 +CXXFLAGS += $(CFLAGS) -Wconversion +LDFLAGS += -lm LIB_FILES = \ lib/graphics.c \ diff --git a/debian/compat b/debian/compat index 45a4fb7..ec63514 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -8 +9 diff --git a/debian/control b/debian/control index 125a5f4..81b06d4 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: contrib/science Priority: optional Maintainer: Debian GIS Project Uploaders: Antonio Valentino -Build-Depends: debhelper (>= 8.0.0), dos2unix +Build-Depends: debhelper (>= 9.0.0), dos2unix Standards-Version: 3.9.2 Homepage: http://earth.esa.int/polsarpro Vcs-Git: git://git.debian.org/git/pkg-grass/polsarpro.git -- Polarimetric SAR Data Processing and Educational Tool ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[SCM] polsarpro branch, master, updated. upstream/4.2.0+dfsg-27-ga51075e
The following commit has been merged in the master branch:
commit f5af1cd0bcf79105d454733efdbd107c512421c1
Author: Antonio Valentino
Date: Tue Feb 26 14:47:04 2013 +
Ignore errors in recursive copy
diff --git a/debian/rules b/debian/rules
index 225bc8e..f2a3176 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,9 +16,9 @@ override_dh_auto_build:
override_dh_auto_install:
# usr/lib/share/polsarpro
mkdir -p debian/tmp/usr/share/polsarpro
- cp -R --no-preserve=mode ColorMap debian/tmp/usr/share/polsarpro
- cp -R --no-preserve=mode Config debian/tmp/usr/share/polsarpro
- cp -R --no-preserve=mode GUI debian/tmp/usr/share/polsarpro
+ -cp -R --no-preserve=mode ColorMap debian/tmp/usr/share/polsarpro
+ -cp -R --no-preserve=mode Config debian/tmp/usr/share/polsarpro
+ -cp -R --no-preserve=mode GUI debian/tmp/usr/share/polsarpro
install -D --mode=0755 PolSARpro_v$(UPSTREAM_VERSION).tcl \
debian/tmp/usr/share/polsarpro/PolSARpro_v$(UPSTREAM_VERSION).tcl
install -D --mode=0755 PolSARpro.sh \
@@ -52,7 +52,7 @@ override_dh_auto_install:
# binaries
mkdir -p debian/tmp/usr/lib/polsarpro
- cp -R --no-preserve=mode Soft/* debian/tmp/usr/lib/polsarpro
+ -cp -R --no-preserve=mode Soft/* debian/tmp/usr/lib/polsarpro
find debian/tmp/usr/lib/polsarpro -name '*.exe' -exec chmod 0755 '{}' \;
find debian/tmp/usr/lib/polsarpro -name '*.[hco]' -delete
--
Polarimetric SAR Data Processing and Educational Tool
___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
