[DebianGIS-dev] [SCM] mapready branch, master, updated. upstream/2.3.6-7-g897d0a5

Antonio Valentino antonio.valentino at tiscali.it
Sun Jan 2 12:27:56 UTC 2011


The following commit has been merged in the master branch:
commit 0fb94faec645746010827342bd253fd1be83c779
Author: Antonio Valentino <antonio.valentino at tiscali.it>
Date:   Sat Jan 1 15:54:10 2011 +0100

    Updated patches

diff --git a/debian/changelog b/debian/changelog
index 1c10bd8..2cb08f2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,10 @@
 mapready (2.3.17-1) unstable; urgency=low
 
   * New upstream release
+  * Updated patches
+  * Removed eol.patch (fixed upstream)
 
- -- Antonio Valentino <antonio.valentino at tiscali.it>  Sat, 01 Jan 2011 15:52:13 +0100
+ -- Antonio Valentino <antonio.valentino at tiscali.it>  Sat, 01 Jan 2011 13:49:39 +0100
 
 mapready (2.3.6-1) unstable; urgency=low
 
diff --git a/debian/patches/config-and-build.patch b/debian/patches/config-and-build.patch
index 0225c6b..c14f8e8 100644
--- a/debian/patches/config-and-build.patch
+++ b/debian/patches/config-and-build.patch
@@ -1,7 +1,7 @@
 Add DESTDIR to install paths and use available Debian libraries instead of internal ones.
 --- a/Makefile.in
 +++ b/Makefile.in
-@@ -267,25 +267,25 @@
+@@ -269,25 +269,25 @@
  
  # This should install any & all package(s) that have been built
  install: 
@@ -44,7 +44,7 @@ Add DESTDIR to install paths and use available Debian libraries instead of inter
  external_libs: mkdirs_for_build
 --- a/configure
 +++ b/configure
-@@ -3714,7 +3714,7 @@
+@@ -3693,7 +3693,7 @@
  ##### --> always use our own libproj because we have the NAD27
  #####     grid shift files, a user's install probably does not
  #AC_CHECK_LIB(proj,pj_transform,have_proj="yes",have_proj="no")
@@ -53,7 +53,7 @@ Add DESTDIR to install paths and use available Debian libraries instead of inter
  if test "$have_proj" = "no" ; then
     ASF_LIB_PROJ="${ext_lib_src_dir}/libproj"
     PROJ_LIBS="\$(LIBDIR)/libproj.a"
-@@ -3937,6 +3937,7 @@
+@@ -3923,6 +3923,7 @@
      have_jpeg="no"
    fi
  fi
@@ -61,16 +61,23 @@ Add DESTDIR to install paths and use available Debian libraries instead of inter
  if test "$have_jpeg" = "no" ; then
    ASF_LIB_JPEG="${ext_lib_src_dir}/libjpeg"
    JPEG_LIBS="\$(LIBDIR)/libjpeg.a"
-@@ -4462,7 +4463,7 @@
-   have_geotiff="no"
+@@ -3935,6 +3936,7 @@
+ #AC_CHECK_HEADER(tiff.h,
+ #  AC_CHECK_LIB(tiff,TIFFGetTagListCount,have_tiff="yes",have_tiff="no"),
+ #  have_tiff="no")
++have_tiff="yes"
+ if test "$sys" = "win32" ; then
+   have_tiff="no"
  fi
- 
--
+@@ -4007,6 +4009,7 @@
+ #AC_CHECK_HEADER(geotiff.h,
+ #  AC_CHECK_LIB(geotiff,main,have_geotiff="yes",have_geotiff="no"),
+ #  have_geotiff="no")
 +have_geotiff="yes"
  if test "$sys" = "win32" ; then
    have_geotiff="no"
  fi
-@@ -4471,6 +4472,7 @@
+@@ -4015,6 +4018,7 @@
     GEOTIFF_LIBS="\$(LIBDIR)/libgeotiff.a"
  else
     GEOTIFF_LIBS="-lgeotiff"
@@ -78,7 +85,7 @@ Add DESTDIR to install paths and use available Debian libraries instead of inter
  fi
  
  
-@@ -4478,6 +4480,7 @@
+@@ -4022,6 +4026,7 @@
  ##### --> always use our own shapelib because different versions
  #####     the user may have installed are not necessarily compatible
  #AC_CHECK_LIB(shp,main,have_shp="yes",have_shp="no")
@@ -86,16 +93,16 @@ Add DESTDIR to install paths and use available Debian libraries instead of inter
  if test "$have_shp" = "no" ; then
     ASF_LIB_SHAPELIB="${ext_lib_src_dir}/shapelib"
     SHAPELIB_LIBS="\$(LIBDIR)/libshp.a"
-@@ -4493,7 +4496,7 @@
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -4037,7 +4042,7 @@
+   $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
 -LIBS="-lfftw  $LIBS"
 +LIBS="-lfftw3  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -4555,7 +4558,7 @@
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+@@ -4071,7 +4076,7 @@
     ASF_LIB_FFTW="${ext_lib_src_dir}/libfftw"
     FFTW_LIBS="\$(LIBDIR)/libfftw3f.a"
  else
@@ -126,20 +133,6 @@ Add DESTDIR to install paths and use available Debian libraries instead of inter
  
  OBJS = \
  	functions.o \
---- a/src/asf_import/asf_import.c
-+++ b/src/asf_import/asf_import.c
-@@ -219,9 +219,11 @@
- #include "asf_raster.h"
- #include <ctype.h>
- 
-+/*
- #ifdef linux
- char *strdup(char *);
- #endif
-+*/
- 
- #define REQUIRED_ARGS 2
- 
 --- a/src/asf_export/Makefile
 +++ b/src/asf_export/Makefile
 @@ -33,7 +33,8 @@
@@ -277,7 +270,7 @@ Add DESTDIR to install paths and use available Debian libraries instead of inter
  	$(LIBDIR)/libasf_proj.a \
 --- a/src/asf_view/Makefile
 +++ b/src/asf_view/Makefile
-@@ -133,7 +133,8 @@
+@@ -134,7 +134,8 @@
  	$(PROJ_CFLAGS) \
  	$(TIFF_CFLAGS) \
  	$(GEOTIFF_CFLAGS) \
@@ -287,7 +280,7 @@ Add DESTDIR to install paths and use available Debian libraries instead of inter
  
  LDLIBS = \
  	$(LIBDIR)/libasf_metadata.a \
-@@ -146,7 +147,7 @@
+@@ -147,7 +148,7 @@
  	$(LIBDIR)/asf_meta.a \
  	$(LIBDIR)/libasf_proj.a \
  	$(LIBDIR)/asf.a \
@@ -299,21 +292,34 @@ Add DESTDIR to install paths and use available Debian libraries instead of inter
 --- a/src/proj2proj/Makefile
 +++ b/src/proj2proj/Makefile
 @@ -112,7 +112,8 @@
- 	$(PROJ_CFLAGS) \
- 	$(TIFF_CFLAGS) \
- 	$(GEOTIFF_CFLAGS) \
--	$(JPEG_CFLAGS)
-+	$(JPEG_CFLAGS) \
-+	$(SHAPELIB_CFLAGS)
- 
- LDLIBS = \
- 	$(LIBDIR)/libasf_metadata.a \
+ 	$(PROJ_CFLAGS) \
+ 	$(TIFF_CFLAGS) \
+ 	$(GEOTIFF_CFLAGS) \
+-	$(JPEG_CFLAGS)
++	$(JPEG_CFLAGS) \
++	$(SHAPELIB_CFLAGS)
+ 
+ LDLIBS = \
+ 	$(LIBDIR)/libasf_metadata.a \
 @@ -123,7 +124,7 @@
- 	$(LIBDIR)/asf_meta.a \
- 	$(LIBDIR)/libasf_proj.a \
- 	$(LIBDIR)/asf.a \
--	$(LIBDIR)/libshp.a \
-+	$(SHAPELIB_LIBS) \
- 	$(GSL_LIBS) \
- 	$(PROJ_LIBS) \
- 	$(TIFF_LIBS) \
+ 	$(LIBDIR)/asf_meta.a \
+ 	$(LIBDIR)/libasf_proj.a \
+ 	$(LIBDIR)/asf.a \
+-	$(LIBDIR)/libshp.a \
++	$(SHAPELIB_LIBS) \
+ 	$(GSL_LIBS) \
+ 	$(PROJ_LIBS) \
+ 	$(TIFF_LIBS) \
+--- a/src/asf/Makefile
++++ b/src/asf/Makefile
+@@ -37,7 +37,9 @@
+ 	if [ "$(SYS)x" != "solarisx" ]; \
+ 	then echo "-D_XOPEN_SOURCE=600"; \
+ 	else echo "-D_XOPEN_SOURCE=600 -std=c99"; \
+-	fi)
++	fi) \
++	$(TIFF_CFLAGS) \
++	$(GEOTIFF_CFLAGS)
+ 
+ all: build_only
+ 	mv asf.a $(LIBDIR)
diff --git a/debian/patches/eol.patch b/debian/patches/eol.patch
deleted file mode 100644
index 6345189..0000000
--- a/debian/patches/eol.patch
+++ /dev/null
@@ -1,317 +0,0 @@
-Fix line ending.
---- a/src/proj2proj/Makefile
-+++ b/src/proj2proj/Makefile
-@@ -1,157 +1,157 @@
--include ../../make_support/system_rules
--
--TARGET = proj2proj
--SRCS = proj2proj.c utility.c font.c projfile.c geocode.c execute.c new.c
--
--REQUIRED_LIBS = \
--	$(LIBDIR)/libasf_geocode.a \
--	$(LIBDIR)/asf_meta.a \
--	$(LIBDIR)/libasf_proj.a \
--        $(LIBDIR)/asf.a \
--	$(GSL_LIBS) \
--	$(GLIB_LIBS) \
--	$(PROJ_LIBS) -lm
--
--CFLAGS += $(GLIB_CFLAGS)
--
--default: asf_proj2proj proj2proj
--cli.o: cli.c
--
--asf_proj2proj: cli.o
--	$(CC) $(CFLAGS) -o asf_proj2proj cli.o $(REQUIRED_LIBS) $(LDFLAGS)
--	mv asf_proj2proj$(BIN_POSTFIX) $(BINDIR)
--
--# Unfortunately compilation is completely different on windows
--ifeq ($(SYS),win32)
--
--### Begin Windows Section
--
--GCC = gcc
--GTK_INC = $(GTKWIN32_DIR)/include
--GTK_LIB = $(GTKWIN32_DIR)/lib
--
--ASF_LIB = ../../lib
--
--INCLUDE = \
--	-I$(GTK_INC) \
--	-I$(GTK_INC)/glib-2.0 \
--	-I$(GTK_INC)/pango-1.0 \
--	-I$(GTK_INC)/gtk-2.0 \
--	-I$(GTK_INC)/freetype2/freetype \
--	-I$(GTK_LIB)/glib-2.0/include \
--	-I$(GTK_LIB)/gtk-2.0/include \
--	-I$(GTK_INC)/atk-1.0 \
--	-I$(GTK_INC)/libglade-2.0 \
--	-I$(ASF_INCLUDE_DIR)
--
--LIB = \
--	$(LDFLAGS) \
--	-L$(GTK_LIB) \
--	-L$(GTK_LIB)/glib-2.0 \
--	-L$(GTK_LIB)/gtk-2.0 \
--	-L$(GTK_LIB)/pango \
--	-L$(GTK_LIB)/libglade \
--	-llibgthread-2.0 \
--	-lintl \
--	-liconv \
--	-lm \
--	-lgtk-win32-2.0 \
--	-lgobject-2.0 \
--	-llibglade-2.0 \
--	-llibgdk_pixbuf-2.0 \
--	-lpango-1.0 \
--	-L/usr/lib/w32api \
--	-lgdi32 \
--	-llibgdk-win32-2.0 \
--	$(ASF_LIB)/libasf_convert.a \
--	$(ASF_LIB)/libasf_import.a \
--	$(ASF_LIB)/libasf_export.a \
--	$(ASF_LIB)/libasf_geocode.a \
--	$(ASF_LIB)/libasf_terrcorr.a \
--	$(ASF_LIB)/libasf_ardop.a \
--	$(ASF_LIB)/libasf_proj.a \
--	$(ASF_LIB)/libasf_sar.a \
--	$(ASF_LIB)/libasf_vector.a \
--	$(ASF_LIB)/libasf_raster.a \
--	$(ASF_LIB)/libshp.a \
--	$(ASF_LIB)/asf_meta.a \
--	$(ASF_LIB)/libasf_proj.a \
--	$(ASF_LIB)/asf.a \
--	$(ASF_LIB)/asf_fft.a \
--	$(GSL_LIBS) \
--	$(TIFF_LIBS) \
--	$(GEOTIFF_LIBS) \
--	$(JPEG_LIBS) \
--	$(PNG_LIBS) \
--	$(PROJ_LIBS) \
-+include ../../make_support/system_rules
-+
-+TARGET = proj2proj
-+SRCS = proj2proj.c utility.c font.c projfile.c geocode.c execute.c new.c
-+
-+REQUIRED_LIBS = \
-+	$(LIBDIR)/libasf_geocode.a \
-+	$(LIBDIR)/asf_meta.a \
-+	$(LIBDIR)/libasf_proj.a \
-+        $(LIBDIR)/asf.a \
-+	$(GSL_LIBS) \
-+	$(GLIB_LIBS) \
-+	$(PROJ_LIBS) -lm
-+
-+CFLAGS += $(GLIB_CFLAGS)
-+
-+default: asf_proj2proj proj2proj
-+cli.o: cli.c
-+
-+asf_proj2proj: cli.o
-+	$(CC) $(CFLAGS) -o asf_proj2proj cli.o $(REQUIRED_LIBS) $(LDFLAGS)
-+	mv asf_proj2proj$(BIN_POSTFIX) $(BINDIR)
-+
-+# Unfortunately compilation is completely different on windows
-+ifeq ($(SYS),win32)
-+
-+### Begin Windows Section
-+
-+GCC = gcc
-+GTK_INC = $(GTKWIN32_DIR)/include
-+GTK_LIB = $(GTKWIN32_DIR)/lib
-+
-+ASF_LIB = ../../lib
-+
-+INCLUDE = \
-+	-I$(GTK_INC) \
-+	-I$(GTK_INC)/glib-2.0 \
-+	-I$(GTK_INC)/pango-1.0 \
-+	-I$(GTK_INC)/gtk-2.0 \
-+	-I$(GTK_INC)/freetype2/freetype \
-+	-I$(GTK_LIB)/glib-2.0/include \
-+	-I$(GTK_LIB)/gtk-2.0/include \
-+	-I$(GTK_INC)/atk-1.0 \
-+	-I$(GTK_INC)/libglade-2.0 \
-+	-I$(ASF_INCLUDE_DIR)
-+
-+LIB = \
-+	$(LDFLAGS) \
-+	-L$(GTK_LIB) \
-+	-L$(GTK_LIB)/glib-2.0 \
-+	-L$(GTK_LIB)/gtk-2.0 \
-+	-L$(GTK_LIB)/pango \
-+	-L$(GTK_LIB)/libglade \
-+	-llibgthread-2.0 \
-+	-lintl \
-+	-liconv \
-+	-lm \
-+	-lgtk-win32-2.0 \
-+	-lgobject-2.0 \
-+	-llibglade-2.0 \
-+	-llibgdk_pixbuf-2.0 \
-+	-lpango-1.0 \
-+	-L/usr/lib/w32api \
-+	-lgdi32 \
-+	-llibgdk-win32-2.0 \
-+	$(ASF_LIB)/libasf_convert.a \
-+	$(ASF_LIB)/libasf_import.a \
-+	$(ASF_LIB)/libasf_export.a \
-+	$(ASF_LIB)/libasf_geocode.a \
-+	$(ASF_LIB)/libasf_terrcorr.a \
-+	$(ASF_LIB)/libasf_ardop.a \
-+	$(ASF_LIB)/libasf_proj.a \
-+	$(ASF_LIB)/libasf_sar.a \
-+	$(ASF_LIB)/libasf_vector.a \
-+	$(ASF_LIB)/libasf_raster.a \
-+	$(ASF_LIB)/libshp.a \
-+	$(ASF_LIB)/asf_meta.a \
-+	$(ASF_LIB)/libasf_proj.a \
-+	$(ASF_LIB)/asf.a \
-+	$(ASF_LIB)/asf_fft.a \
-+	$(GSL_LIBS) \
-+	$(TIFF_LIBS) \
-+	$(GEOTIFF_LIBS) \
-+	$(JPEG_LIBS) \
-+	$(PNG_LIBS) \
-+	$(PROJ_LIBS) \
- 	$(ZLIB_LIBS) \
--	-lglib-2.0 \
--	-lcomdlg32
--
--CFLAGS += -DLARGE64_FILES -D_REENTRANT -mms-bitfields -Dwin32 -g -Wall
--
--$(TARGET): $(TARGET).c
--	$(GCC) -o $(TARGET).exe $(SRCS) $(INCLUDE) $(LIB) $(CFLAGS)
--	mv $(TARGET).exe $(BINDIR)
--	cp $(TARGET).glade $(SHAREDIR)
--	cp $(TARGET)_icon.ico $(SHAREDIR)
--
--clean:
--	rm -rf $(GTK_DIR) $(TARGET).exe asf_$(TARGET) core.*
--
--### End Windows Section
--
--else
--
--### Begin Unix Section
--
--CFLAGS += \
--	$(GTK_CFLAGS) \
--	$(shell /usr/bin/pkg-config --cflags libglade-2.0) \
--	$(GSL_CFLAGS) \
--	$(PROJ_CFLAGS) \
--	$(TIFF_CFLAGS) \
--	$(GEOTIFF_CFLAGS) \
--	$(JPEG_CFLAGS) \
--	$(SHAPELIB_CFLAGS)
--
--LDLIBS = \
--	$(LIBDIR)/libasf_metadata.a \
--	$(LIBDIR)/libasf_geocode.a \
--	$(LIBDIR)/libasf_raster.a \
--	$(LIBDIR)/libasf_vector.a \
--	$(LIBDIR)/libasf_import.a \
--	$(LIBDIR)/asf_meta.a \
--	$(LIBDIR)/libasf_proj.a \
--	$(LIBDIR)/asf.a \
--	$(SHAPELIB_LIBS) \
--	$(GSL_LIBS) \
--	$(PROJ_LIBS) \
--	$(TIFF_LIBS) \
--	$(GEOTIFF_LIBS) \
--	$(JPEG_LIBS) \
--	$(PNG_LIBS) \
--	$(GTK_LIBS) \
--	$(shell /usr/bin/pkg-config --libs libglade-2.0) \
--	$(shell /usr/bin/pkg-config --libs gthread-2.0)
--
--LDFLAGS = -Wl,--export-dynamic
--
--OBJS = $(patsubst %.c, %.o, $(SRCS))
--
--proj2proj: $(OBJS)
--	$(CC) $(CFLAGS) -o $(TARGET) $(OBJS) $(LDLIBS) $(LDFLAGS)
--	mv $(TARGET) $(BINDIR)
--	cp $(TARGET).glade $(SHAREDIR)
--	cp $(TARGET)_icon.ico $(SHAREDIR)
--
--%.c: %.h
--
--clean:
--	rm -f *.o $(BINDIR)/$(TARGET)* $(TARGET).txt \
--	    $(SHAREDIR)/$(TARGET)* asf_$(TARGET)
--
--### End Unix Section
--
--endif
--
-+	-lglib-2.0 \
-+	-lcomdlg32
-+
-+CFLAGS += -DLARGE64_FILES -D_REENTRANT -mms-bitfields -Dwin32 -g -Wall
-+
-+$(TARGET): $(TARGET).c
-+	$(GCC) -o $(TARGET).exe $(SRCS) $(INCLUDE) $(LIB) $(CFLAGS)
-+	mv $(TARGET).exe $(BINDIR)
-+	cp $(TARGET).glade $(SHAREDIR)
-+	cp $(TARGET)_icon.ico $(SHAREDIR)
-+
-+clean:
-+	rm -rf $(GTK_DIR) $(TARGET).exe asf_$(TARGET) core.*
-+
-+### End Windows Section
-+
-+else
-+
-+### Begin Unix Section
-+
-+CFLAGS += \
-+	$(GTK_CFLAGS) \
-+	$(shell /usr/bin/pkg-config --cflags libglade-2.0) \
-+	$(GSL_CFLAGS) \
-+	$(PROJ_CFLAGS) \
-+	$(TIFF_CFLAGS) \
-+	$(GEOTIFF_CFLAGS) \
-+	$(JPEG_CFLAGS) \
-+	$(SHAPELIB_CFLAGS)
-+
-+LDLIBS = \
-+	$(LIBDIR)/libasf_metadata.a \
-+	$(LIBDIR)/libasf_geocode.a \
-+	$(LIBDIR)/libasf_raster.a \
-+	$(LIBDIR)/libasf_vector.a \
-+	$(LIBDIR)/libasf_import.a \
-+	$(LIBDIR)/asf_meta.a \
-+	$(LIBDIR)/libasf_proj.a \
-+	$(LIBDIR)/asf.a \
-+	$(SHAPELIB_LIBS) \
-+	$(GSL_LIBS) \
-+	$(PROJ_LIBS) \
-+	$(TIFF_LIBS) \
-+	$(GEOTIFF_LIBS) \
-+	$(JPEG_LIBS) \
-+	$(PNG_LIBS) \
-+	$(GTK_LIBS) \
-+	$(shell /usr/bin/pkg-config --libs libglade-2.0) \
-+	$(shell /usr/bin/pkg-config --libs gthread-2.0)
-+
-+LDFLAGS = -Wl,--export-dynamic
-+
-+OBJS = $(patsubst %.c, %.o, $(SRCS))
-+
-+proj2proj: $(OBJS)
-+	$(CC) $(CFLAGS) -o $(TARGET) $(OBJS) $(LDLIBS) $(LDFLAGS)
-+	mv $(TARGET) $(BINDIR)
-+	cp $(TARGET).glade $(SHAREDIR)
-+	cp $(TARGET)_icon.ico $(SHAREDIR)
-+
-+%.c: %.h
-+
-+clean:
-+	rm -f *.o $(BINDIR)/$(TARGET)* $(TARGET).txt \
-+	    $(SHAREDIR)/$(TARGET)* asf_$(TARGET)
-+
-+### End Unix Section
-+
-+endif
-+
diff --git a/debian/patches/fix-implicit-pointer-conversion.patch b/debian/patches/fix-implicit-pointer-conversion.patch
index d5460a9..954424a 100644
--- a/debian/patches/fix-implicit-pointer-conversion.patch
+++ b/debian/patches/fix-implicit-pointer-conversion.patch
@@ -9,15 +9,15 @@ Include glib.h to prevent an "implicit pointer conversion" warning that makes pa
 +#include <glib.h>
  
  datum_type_t get_datum(FILE *fp);
- 
+ spheroid_type_t get_spheroid(FILE *fp);
 --- a/src/asf_meta/Makefile
 +++ b/src/asf_meta/Makefile
-@@ -17,6 +17,8 @@
+@@ -17,7 +17,7 @@
    CFLAGS += $(CC_PARSER_DEBUG_FLAGS)
  endif
  
-+CFLAGS += $(GLIB_CFLAGS)
-+
+-CFLAGS += $(XML_CFLAGS)
++CFLAGS += $(XML_CFLAGS) $(GLIB_CFLAGS)
+ 
  # All global lexer and parser symbols are preceded by 'meta_' namespace hack.
  YFLAGS = $(YDEBUG_FLAGS) -d -p meta_yy
- LFLAGS = $(LDEBUG_FLAGS) -Pmeta_yy -s
diff --git a/debian/patches/series b/debian/patches/series
index 3ef4a28..e9d0426 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
 config-and-build.patch
-eol.patch
 fix-implicit-pointer-conversion.patch
 spelling.patch
diff --git a/debian/patches/spelling.patch b/debian/patches/spelling.patch
index 602a50a..da03dfa 100644
--- a/debian/patches/spelling.patch
+++ b/debian/patches/spelling.patch
@@ -1,7 +1,7 @@
 Fix spelling.
 --- a/src/asf_import/asf_import.c
 +++ b/src/asf_import/asf_import.c
-@@ -115,7 +115,7 @@
+@@ -130,7 +130,7 @@
  "        file, and the acquisition date is on or after what is given in the\n"\
  "        file, the look up table will be automatically applied.\n"\
  "   -lat <lower> <upper>\n"\
@@ -34,7 +34,7 @@ Fix spelling.
  
 --- a/src/asf_meta/meta_write.c
 +++ b/src/asf_meta/meta_write.c
-@@ -310,7 +310,7 @@
+@@ -313,7 +313,7 @@
      meta_put_double(fp,"earth_radius:",meta->sar->earth_radius,
          "Earth radius at scene center [m]");
      meta_put_double(fp,"earth_radius_pp:",meta->sar->earth_radius_pp,
@@ -67,7 +67,7 @@ Fix spelling.
  #include "asf.h"
 --- a/src/libasf_geocode/geocode_options.c
 +++ b/src/libasf_geocode/geocode_options.c
-@@ -277,7 +277,7 @@
+@@ -294,7 +294,7 @@
  "     ============================\n"
  "\n"
  "     All these options take arguments, unless otherwise noted.  Groups\n"

-- 
The MapReady Remote Sensing Tool Kit



More information about the Pkg-grass-devel mailing list