[SCM] TRMM Radar Software Library branch, master, updated. upstream/1.42-27-gfa3a2c0

[Andy Spencer]

The following commit has been merged in the master branch:
commit 5f2c5d3e2ece14690f59b415b377550f62b8228d
Author: Andy Spencer <andy753421 at gmail.com>
Date:   Wed Jun 19 07:18:39 2013 +0000

    Update automake patch for 1.43

diff --git a/debian/patches/rsl-automake.patch b/debian/patches/rsl-automake.patch
index e17c84b..675eca1 100644
--- a/debian/patches/rsl-automake.patch
+++ b/debian/patches/rsl-automake.patch
@@ -1,9 +1,7 @@
 Update automake files
 
-- Avoid modifying source code at compile time
-- Avoid install-exec-hook
-diff --git a/colors/Makefile.am b/colors/Makefile.am
-index 709a367..b043f7f 100644
+* Avoid modifying source code at compile time
+* Avoid install-exec-hook
 --- a/colors/Makefile.am
 +++ b/colors/Makefile.am
 @@ -1,6 +1,6 @@
@@ -14,11 +12,9 @@ index 709a367..b043f7f 100644
  color_DATA = *.???
  
  EXTRA_DIST = $(color_DATA)
-diff --git a/Makefile.am b/Makefile.am
-index 3c106a8..6aca2ec 100644
 --- a/Makefile.am
 +++ b/Makefile.am
-@@ -1,73 +1,49 @@
+@@ -1,72 +1,48 @@
  ## Process w/ automake.  Or, autoreconf; make ##
 +AM_CFLAGS = -DDATADIR="\"$(datadir)/rsl1\""
  AUTOMAKE_OPTIONS = foreign
@@ -30,12 +26,11 @@ index 3c106a8..6aca2ec 100644
 -
  lib_LTLIBRARIES = librsl.la
  
--librsl_la_LDFLAGS = -version-info 1:42
+-librsl_la_LDFLAGS = -version-info 1:43
 -librsl_la_SOURCES = \
 -$(rapic_c) $(radtec_c)\
 -dorade.c dorade_print.c dorade_to_radar.c\
 -lassen.c lassen_to_radar.c \
--edge_to_radar.c \
 - radar.c volume.c image_gen.c cappi.c fraction.c read_write.c farea.c \
 - range.c radar_to_uf.c uf_to_radar.c wsr88d_to_radar.c \
 - carpi.c cube.c sort_rays.c toga_to_radar.c gts.c histogram.c \
@@ -61,12 +56,11 @@ index 3c106a8..6aca2ec 100644
 +          wsr88d.h \
 +	  $(include_HEADERS)
 +
-+librsl_la_LDFLAGS = -version-info 1:42
++librsl_la_LDFLAGS = -version-info 1:43
 +librsl_la_SOURCES = \
 +    $(rapic_c) $(radtec_c) \
 +    dorade.c dorade_print.c dorade_to_radar.c \
 +    lassen.c lassen_to_radar.c \
-+    edge_to_radar.c \
 +    radar.c volume.c image_gen.c cappi.c fraction.c read_write.c farea.c \
 +    range.c radar_to_uf.c uf_to_radar.c wsr88d_to_radar.c \
 +    carpi.c cube.c sort_rays.c toga_to_radar.c gts.c histogram.c \
@@ -116,8 +110,6 @@ index 3c106a8..6aca2ec 100644
  EXTRA_DIST = CHANGES Copyright GPL LGPL wsr88d_locations.dat rapic.h
  
  DISTCLEANFILES = rapic.c rapic-lex.c
-diff --git a/radar.c b/radar.c
-index 4078f17..7c07d01 100644
 --- a/radar.c
 +++ b/radar.c
 @@ -60,7 +60,7 @@
@@ -129,8 +121,6 @@ index 4078f17..7c07d01 100644
  }
  
  /* Debug printing global variable: radar_verbose_flag */
-diff --git a/radar_to_uf.c b/radar_to_uf.c
-index 0d3af56..53d2d8d 100644
 --- a/radar_to_uf.c
 +++ b/radar_to_uf.c
 @@ -321,7 +321,7 @@ void RSL_radar_to_uf_fp(Radar *r, FILE *fp)
@@ -142,8 +132,6 @@ index 0d3af56..53d2d8d 100644
          if (little_endian()) swap2(&uf_ma[40], 8/2);
          uf_ma[44] = (signed short)UF_NO_DATA;
          len_ma = 45;
-diff --git a/read_write.c b/read_write.c
-index 644a7b2..1e5f319 100644
 --- a/read_write.c
 +++ b/read_write.c
 @@ -314,7 +314,7 @@ int RSL_write_radar_fp(Radar *radar, FILE *fp)
@@ -155,15 +143,13 @@ index 644a7b2..1e5f319 100644
    n += fwrite(title, sizeof(char), sizeof(title), fp);
    
    memset(header_buf, 0, sizeof(header_buf));
-diff --git a/rsl.h b/rsl.h
-index a821765..597069c 100644
 --- a/rsl.h
 +++ b/rsl.h
 @@ -27,8 +27,6 @@
  #include "config.h"
  #endif
  
--#define RSL_VERSION_STR "v1.42"
+-#define RSL_VERSION_STR "v1.43"
 -
  /**********************************************************************/
  /* Configure: Define USE_TWO_BYTE_PRECISION to have RSL store internal*/
@@ -172,7 +158,7 @@ index a821765..597069c 100644
  /*            so you shouldn't have to modify anything here.          */
  /**********************************************************************/
  #ifndef COLORDIR
--#define COLORDIR "/usr/local/trmm/GVBOX/lib/colors"
+-#define COLORDIR "/usr/local/trmm/lib/colors"
 +#define COLORDIR DATADIR "/colors"
  #endif
  
@@ -208,21 +194,17 @@ index a821765..597069c 100644
  #define RAINFALL_RED_FILE   COLORDIR "/red_rainfall.clr"
  #define RAINFALL_GREEN_FILE COLORDIR "/grn_rainfall.clr"
  #define RAINFALL_BLUE_FILE  COLORDIR "/blu_rainfall.clr"
-diff --git a/wsr88d.h b/wsr88d.h
-index ecad620..7d22427 100644
 --- a/wsr88d.h
 +++ b/wsr88d.h
 @@ -7,7 +7,7 @@
   * The directory should be the same as the LIBDIR in the makefile.
   */
  #ifndef WSR88D_SITE_INFO_FILE
--#define WSR88D_SITE_INFO_FILE "/usr/local/trmm/GVBOX/lib/wsr88d_locations.dat"
+-#define WSR88D_SITE_INFO_FILE "/usr/local/trmm/lib/wsr88d_locations.dat"
 +#define WSR88D_SITE_INFO_FILE DATADIR "/wsr88d_locations.dat"
  #endif
  /*===============================================================*/
  typedef struct {
-diff --git a/doc/Makefile.am b/doc/Makefile.am
-index 6acc059..d4fc3fd 100644
 --- a/doc/Makefile.am
 +++ b/doc/Makefile.am
 @@ -1,12 +1,3 @@
@@ -239,6 +221,3 @@ index 6acc059..d4fc3fd 100644
 -	$(INSTALL) -m 444 ../README $(docdir)
 -	$(INSTALL) -m 444 ../CHANGES $(docdir)
 +dist_doc_DATA = *.html *.gif *.jpg *.fig ../README ../CHANGES
--- 
-1.7.3.4
-

-- 
TRMM Radar Software Library