[SCM] epr-api branch, master, updated. debian/2.2-1-29-ge0d9945

Antonio Valentino antonio.valentino at tiscali.it
Tue Aug 13 18:49:10 UTC 2013 

The following commit has been merged in the master branch:
commit 2e725d1afb45f406bbe087425288b38540b0de0b
Author: Antonio Valentino <antonio.valentino at tiscali.it>
Date:   Tue Aug 13 15:23:12 2013 +0000

    New updtrean snapshot and patch refresh

diff --git a/debian/changelog b/debian/changelog
index 3d36775..6df259f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+epr-api (2.3~dev20130813-1) UNRELEASED; urgency=low
+
+  * New upstream snapshot
+  * Refresh all patches: fix-build-flags.patch and spelling.patch have been
+    removed because applied upstream
+
+ -- Antonio Valentino <antonio.valentino at tiscali.it>  Tue, 13 Aug 2013 15:20:14 +0000
+
 epr-api (2.2-3) unstable; urgency=low
 
   * standard version bumped to 3.9.3 (no changes)
diff --git a/debian/patches/0001-fix-build-flags.patch b/debian/patches/0001-fix-build-flags.patch
deleted file mode 100644
index 81b6c08..0000000
--- a/debian/patches/0001-fix-build-flags.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From: Debian GIS Project <pkg-grass-devel at lists.alioth.debian.org>
-Date: Sun, 19 Dec 2010 11:09:07 +0100
-Subject: fix build flags
-
-Fix build and link flags.
----
- makefile |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/makefile b/makefile
-index 42f1400..6824a71 100644
---- a/makefile
-+++ b/makefile
-@@ -15,7 +15,7 @@ OUTDIR = ./build/$(CONFIG)
- # TARGET  = $(OUTDIR)/libepr_api.so
- 
- # for linux
--COMPILE = gcc -fPIC -ansi -c -I$(SRCDIR) -I$(THISDIR) $(OPTIONS)
-+COMPILE = $(CC) $(CFLAGS) -fPIC -ansi -c -I$(SRCDIR) -I$(THISDIR) $(OPTIONS)
- LINK    = ld -shared
- TARGET  = $(OUTDIR)/libepr_api.so
- 
-@@ -119,7 +119,7 @@ clean:
- 
- 
- $(TARGET) : $(OBJECTS)
--	$(LINK) -o $@ $(OBJECTS) -lm
-+	$(LINK) $(LDFLAGS) -o $@ $(OBJECTS) -lm -lc
- 
- SRC_1 = $(SRCDIR)/epr_api.c
- $(OUTDIR)/epr_api.o : $(HEADERS) $(SRC_1)
--- 
diff --git a/debian/patches/0003-static-lib.patch b/debian/patches/0001-static-lib.patch
similarity index 85%
rename from debian/patches/0003-static-lib.patch
rename to debian/patches/0001-static-lib.patch
index 20403ed..fd30101 100644
--- a/debian/patches/0003-static-lib.patch
+++ b/debian/patches/0001-static-lib.patch
@@ -3,8 +3,8 @@ Date: Sat, 17 Mar 2012 18:57:06 +0100
 Subject: static lib
 
 ---
- makefile |    3 +++
- 1 files changed, 3 insertions(+), 0 deletions(-)
+ makefile | 3 +++
+ 1 file changed, 3 insertions(+)
 
 diff --git a/makefile b/makefile
 index 6824a71..0a9bdd0 100644
@@ -20,4 +20,3 @@ index 6824a71..0a9bdd0 100644
  $(TARGET) : $(OBJECTS)
  	$(LINK) $(LDFLAGS) -o $@ $(OBJECTS) -lm -lc
  
--- 
diff --git a/debian/patches/0002-spelling.patch b/debian/patches/0002-spelling.patch
deleted file mode 100644
index ac00228..0000000
--- a/debian/patches/0002-spelling.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From: Antonio Valentino <antonio.valentino at tiscali.it>
-Date: Fri, 17 Dec 2010 00:03:11 +0100
-Subject: spelling
-
-Fix spelling errors in record descriptions.
----
- src/epr_dddb.c |    8 ++++----
- 1 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/src/epr_dddb.c b/src/epr_dddb.c
-index bcbde0a..038f460 100644
---- a/src/epr_dddb.c
-+++ b/src/epr_dddb.c
-@@ -3280,7 +3280,7 @@ static const struct DatasetDescriptor ATS_TOA_1P_dataset_data[] = {
- static const struct DatasetDescriptor MER_FR__1P_dataset_data[] = {
-     {"Quality_ADS", "Quality ADS", MER_RR__1P_ADSR_sq_meris_rec_data, "Level 1b Summary Quality ADS(SQ ADS)"},
-     {"Scaling_Factor_GADS", "Scaling Factor GADS", MER_RR__1P_GADS_sfgi_meris_rec_data, "Level 1b GADS Scaling Factor and General  Info"},
--    {"Tie_points_ADS", "Tie points ADS", MER_RR__1P_ADSR_tie_pt_meris_rec_data, "Level 1b ADS Tie Point Location and Auxilliary Data (LADS)"},
-+    {"Tie_points_ADS", "Tie points ADS", MER_RR__1P_ADSR_tie_pt_meris_rec_data, "Level 1b ADS Tie Point Location and Auxiliary Data (LADS)"},
-     {"Radiance_1", "Radiance MDS(1)", MER_RR__1P_MDSR_1_15_meris_rec_data, "Level 1b MDS (1) TOA Radiance"},
-     {"Radiance_2", "Radiance MDS(2)", MER_RR__1P_MDSR_1_15_meris_rec_data, "Level 1b MDS (2) TOA Radiance"},
-     {"Radiance_3", "Radiance MDS(3)", MER_RR__1P_MDSR_1_15_meris_rec_data, "Level 1b MDS (3) TOA Radiance"},
-@@ -3302,7 +3302,7 @@ static const struct DatasetDescriptor MER_FR__1P_dataset_data[] = {
- static const struct DatasetDescriptor MER_FR__1P_IODD5_dataset_data[] = {
-     {"Quality_ADS", "Quality ADS", MER_RR__1P_ADSR_sq_meris_rec_data, "Level 1b Summary Quality ADS(SQ ADS)"},
-     {"Scaling_Factor_GADS", "Scaling Factor GADS", MER_RR__1P_GADS_sfgi_meris_rec_data, "Level 1b GADS Scaling Factor and General  Info"},
--    {"Tie_points_ADS", "Tie points ADS", MER_RR__1P_ADSR_tie_pt_meris_rec_data, "Level 1b ADS Tie Point Location and Auxilliary Data (LADS)"},
-+    {"Tie_points_ADS", "Tie points ADS", MER_RR__1P_ADSR_tie_pt_meris_rec_data, "Level 1b ADS Tie Point Location and Auxiliary Data (LADS)"},
-     {"Radiance_1", "Radiance MDS(1)", MER_RR__1P_MDSR_1_15_meris_rec_data, "Level 1b MDS (1) TOA Radiance"},
-     {"Radiance_2", "Radiance MDS(2)", MER_RR__1P_MDSR_1_15_meris_rec_data, "Level 1b MDS (2) TOA Radiance"},
-     {"Radiance_3", "Radiance MDS(3)", MER_RR__1P_MDSR_1_15_meris_rec_data, "Level 1b MDS (3) TOA Radiance"},
-@@ -3405,7 +3405,7 @@ static const struct DatasetDescriptor MER_RRV_2P_dataset_data[] = {
- static const struct DatasetDescriptor MER_RR__1P_dataset_data[] = {
-     {"Quality_ADS", "Quality ADS", MER_RR__1P_ADSR_sq_meris_rec_data, "Level 1b Summary Quality ADS(SQ ADS)"},
-     {"Scaling_Factor_GADS", "Scaling Factor GADS", MER_RR__1P_GADS_sfgi_meris_rec_data, "Level 1b GADS Scaling Factor and General  Info"},
--    {"Tie_points_ADS", "Tie points ADS", MER_RR__1P_ADSR_tie_pt_meris_rec_data, "Level 1b ADS Tie Point Location and Auxilliary Data (LADS)"},
-+    {"Tie_points_ADS", "Tie points ADS", MER_RR__1P_ADSR_tie_pt_meris_rec_data, "Level 1b ADS Tie Point Location and Auxiliary Data (LADS)"},
-     {"Radiance_1", "Radiance MDS(1)", MER_RR__1P_MDSR_1_15_meris_rec_data, "Level 1b MDS (1) TOA Radiance"},
-     {"Radiance_2", "Radiance MDS(2)", MER_RR__1P_MDSR_1_15_meris_rec_data, "Level 1b MDS (2) TOA Radiance"},
-     {"Radiance_3", "Radiance MDS(3)", MER_RR__1P_MDSR_1_15_meris_rec_data, "Level 1b MDS (3) TOA Radiance"},
-@@ -3427,7 +3427,7 @@ static const struct DatasetDescriptor MER_RR__1P_dataset_data[] = {
- static const struct DatasetDescriptor MER_RR__1P_IODD5_dataset_data[] = {
-     {"Quality_ADS", "Quality ADS", MER_RR__1P_ADSR_sq_meris_rec_data, "Level 1b Summary Quality ADS(SQ ADS)"},
-     {"Scaling_Factor_GADS", "Scaling Factor GADS", MER_RR__1P_GADS_sfgi_meris_rec_data, "Level 1b GADS Scaling Factor and General  Info"},
--    {"Tie_points_ADS", "Tie points ADS", MER_RR__1P_ADSR_tie_pt_meris_rec_data, "Level 1b ADS Tie Point Location and Auxilliary Data (LADS)"},
-+    {"Tie_points_ADS", "Tie points ADS", MER_RR__1P_ADSR_tie_pt_meris_rec_data, "Level 1b ADS Tie Point Location and Auxiliary Data (LADS)"},
-     {"Radiance_1", "Radiance MDS(1)", MER_RR__1P_MDSR_1_15_meris_rec_data, "Level 1b MDS (1) TOA Radiance"},
-     {"Radiance_2", "Radiance MDS(2)", MER_RR__1P_MDSR_1_15_meris_rec_data, "Level 1b MDS (2) TOA Radiance"},
-     {"Radiance_3", "Radiance MDS(3)", MER_RR__1P_MDSR_1_15_meris_rec_data, "Level 1b MDS (3) TOA Radiance"},
--- 
diff --git a/debian/patches/series b/debian/patches/series
index 32b1d47..a86781a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1 @@
-0001-fix-build-flags.patch
-0002-spelling.patch
-0003-static-lib.patch
+0001-static-lib.patch

-- 
ENVISAT Product Reader API for C

More information about the Pkg-grass-devel mailing list