[SCM] TRMM Radar Software Library branch, master, updated. upstream/1.40-4-g9e5e74c
Andy Spencer
andy753421 at gmail.com
Sat Jun 25 02:53:29 UTC 2011
The following commit has been merged in the master branch:
commit 9e5e74caba2039121161bd88caac1d79264e6591
Author: Andy Spencer <andy753421 at gmail.com>
Date: Sat Jun 25 00:45:46 2011 +0000
Update debian directory for Version 1.41
diff --git a/debian/changelog b/debian/changelog
index b5bde24..71b8aa8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+librsl (1.41-1) unstable; urgency=low
+
+ * Version bump for RSl 1.41
+
+ -- Andy Spencer <andy753421 at gmail.com> Sat, 25 Jun 2011 00:42:11 +0000
+
librsl (1.40-1) unstable; urgency=low
* Initial debian package (Closes: #604185)
diff --git a/debian/control b/debian/control
index 49df26a..8684c2b 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Priority: extra
Maintainer: Debian Science Maintainers <debian-science-maintainers at lists.alioth.debian.org>
Uploaders: Andy Spencer <andy753421 at gmail.com>
Build-Depends: debhelper (>= 7.0.50~), dh-autoreconf, libhdf4-dev, libjpeg-dev
-Standards-Version: 3.9.1
+Standards-Version: 3.9.2
Section: science
Homepage: http://trmm-fc.gsfc.nasa.gov/trmm_gv/software/rsl/
DM-Upload-Allowed: yes
@@ -13,7 +13,7 @@ Vcs-Browser: http://git.debian.org/?p=debian-science/packages/rsl.git
Package: librsl1
Architecture: any
Depends: ${misc:Depends}, ${shlibs:Depends}
-Description: The TRMM Radar Software Library
+Description: TRMM Radar Software Library
RSL is a library produced by the NASA TRMM Satellite Validation Office and
used to access several radar file formats. It can generated images directly
or be used to load data files for other programs.
diff --git a/debian/patches/rsl-automake.patch b/debian/patches/rsl-automake.patch
index 2a0e43a..cea46a4 100644
--- a/debian/patches/rsl-automake.patch
+++ b/debian/patches/rsl-automake.patch
@@ -2,9 +2,10 @@ Update automake files
- Avoid modifying source code at compile time
- Avoid install-exec-hook
-diff -ru rsl-v1.40/colors/Makefile.am rsl-v1.40.new/colors/Makefile.am
---- rsl-v1.40/colors/Makefile.am 1999-12-10 03:28:38.000000000 +0000
-+++ rsl-v1.40.new/colors/Makefile.am 2008-12-27 11:26:01.000000000 +0000
+diff --git a/colors/Makefile.am b/colors/Makefile.am
+index 709a367..b043f7f 100644
+--- a/colors/Makefile.am
++++ b/colors/Makefile.am
@@ -1,6 +1,6 @@
AUTOMAKE_OPTIONS = foreign
@@ -13,21 +14,10 @@ diff -ru rsl-v1.40/colors/Makefile.am rsl-v1.40.new/colors/Makefile.am
color_DATA = *.???
EXTRA_DIST = $(color_DATA)
-diff -ru rsl-v1.40/colors/Makefile.in rsl-v1.40.new/colors/Makefile.in
---- rsl-v1.40/colors/Makefile.in 2008-12-27 11:30:45.000000000 +0000
-+++ rsl-v1.40.new/colors/Makefile.in 2008-12-27 11:26:07.000000000 +0000
-@@ -166,7 +166,7 @@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
- AUTOMAKE_OPTIONS = foreign
--colordir = $(prefix)/lib/colors
-+colordir = $(datadir)/rsl/colors
- color_DATA = *.???
- EXTRA_DIST = $(color_DATA)
- all: all-am
-diff -ru rsl-v1.40/Makefile.am rsl-v1.40.new/Makefile.am
---- rsl-v1.40/Makefile.am 2008-10-10 20:06:57.000000000 +0000
-+++ rsl-v1.40.new/Makefile.am 2008-12-27 11:25:59.000000000 +0000
+diff --git a/Makefile.am b/Makefile.am
+index 3c106a8..6aca2ec 100644
+--- a/Makefile.am
++++ b/Makefile.am
@@ -1,73 +1,49 @@
## Process w/ automake. Or, autoreconf; make ##
+AM_CFLAGS = -DDATADIR="\"$(datadir)/rsl\""
@@ -40,7 +30,7 @@ diff -ru rsl-v1.40/Makefile.am rsl-v1.40.new/Makefile.am
-
lib_LTLIBRARIES = librsl.la
--librsl_la_LDFLAGS = -version-info 1:40
+-librsl_la_LDFLAGS = -version-info 1:41
-librsl_la_SOURCES = \
-$(rapic_c) $(radtec_c)\
-dorade.c dorade_print.c dorade_to_radar.c\
@@ -71,7 +61,7 @@ diff -ru rsl-v1.40/Makefile.am rsl-v1.40.new/Makefile.am
+ wsr88d.h \
+ $(include_HEADERS)
+
-+librsl_la_LDFLAGS = -version-info 1:40
++librsl_la_LDFLAGS = -version-info 1:41
+librsl_la_SOURCES = \
+ $(rapic_c) $(radtec_c) \
+ dorade.c dorade_print.c dorade_to_radar.c \
@@ -123,12 +113,13 @@ diff -ru rsl-v1.40/Makefile.am rsl-v1.40.new/Makefile.am
- $(INSTALL) -m 644 toolkit_1BC-51_appl.h $(includedir)
- $(INSTALL) -m 644 wsr88d_locations.dat $(libdir)
-
- EXTRA_DIST = CHANGES CHECK_LIST Copyright GPL LGPL wsr88d_locations.dat rapic.h
+ EXTRA_DIST = CHANGES Copyright GPL LGPL wsr88d_locations.dat rapic.h
DISTCLEANFILES = rapic.c rapic-lex.c
-diff -ru rsl-v1.40/radar.c rsl-v1.40.new/radar.c
---- rsl-v1.40/radar.c 2006-08-09 19:35:53.000000000 +0000
-+++ rsl-v1.40.new/radar.c 2008-12-27 11:13:43.000000000 +0000
+diff --git a/radar.c b/radar.c
+index 4078f17..7c07d01 100644
+--- a/radar.c
++++ b/radar.c
@@ -60,7 +60,7 @@
void RSL_print_version()
@@ -138,22 +129,24 @@ diff -ru rsl-v1.40/radar.c rsl-v1.40.new/radar.c
}
/* Debug printing global variable: radar_verbose_flag */
-diff -ru rsl-v1.40/radar_to_uf.c rsl-v1.40.new/radar_to_uf.c
---- rsl-v1.40/radar_to_uf.c 2008-04-16 19:34:41.000000000 +0000
-+++ rsl-v1.40.new/radar_to_uf.c 2008-12-27 11:13:58.000000000 +0000
-@@ -316,7 +316,7 @@
- uf_ma[37] = tm->tm_year % 100; /* Same format as data year */
- uf_ma[38] = tm->tm_mon+1;
- uf_ma[39] = tm->tm_mday;
-- memcpy(&uf_ma[40], "RSL" RSL_VERSION_STR, 8);
-+ memcpy(&uf_ma[40], "RSL" VERSION, 8);
- if (little_endian()) swap2(&uf_ma[40], 8/2);
- uf_ma[44] = (signed short)UF_NO_DATA;
- len_ma = 45;
-diff -ru rsl-v1.40/read_write.c rsl-v1.40.new/read_write.c
---- rsl-v1.40/read_write.c 2008-10-07 22:30:06.000000000 +0000
-+++ rsl-v1.40.new/read_write.c 2008-12-27 11:14:05.000000000 +0000
-@@ -314,7 +314,7 @@
+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)
+ uf_ma[37] = tm->tm_year % 100; /* Same format as data year */
+ uf_ma[38] = tm->tm_mon+1;
+ uf_ma[39] = tm->tm_mday;
+- memcpy(&uf_ma[40], "RSL" RSL_VERSION_STR, 8);
++ memcpy(&uf_ma[40], "RSL" VERSION, 8);
+ 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)
if (radar == NULL) return 0;
memset(title, 0, sizeof(title));
@@ -162,14 +155,15 @@ diff -ru rsl-v1.40/read_write.c rsl-v1.40.new/read_write.c
n += fwrite(title, sizeof(char), sizeof(title), fp);
memset(header_buf, 0, sizeof(header_buf));
-diff -ru rsl-v1.40/rsl.h rsl-v1.40.new/rsl.h
---- rsl-v1.40/rsl.h 2008-10-10 20:09:36.000000000 +0000
-+++ rsl-v1.40.new/rsl.h 2008-12-27 11:15:24.000000000 +0000
+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.40"
+-#define RSL_VERSION_STR "v1.41"
-
/**********************************************************************/
/* Configure: Define USE_TWO_BYTE_PRECISION to have RSL store internal*/
@@ -214,9 +208,10 @@ diff -ru rsl-v1.40/rsl.h rsl-v1.40.new/rsl.h
#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 -ru rsl-v1.40/wsr88d.h rsl-v1.40.new/wsr88d.h
---- rsl-v1.40/wsr88d.h 2004-03-12 17:12:09.000000000 +0000
-+++ rsl-v1.40.new/wsr88d.h 2008-12-27 11:16:01.000000000 +0000
+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.
*/
@@ -226,9 +221,10 @@ diff -ru rsl-v1.40/wsr88d.h rsl-v1.40.new/wsr88d.h
#endif
/*===============================================================*/
typedef struct {
-diff -ru rsl-v1.40/doc/Makefile.am rsl-v1.40.new/doc/Makefile.am
---- rsl-v1.40/doc/Makefile.am
-+++ rsl-v1.40.new/doc/Makefile.am
+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 @@
AUTOMAKE_OPTIONS = foreign
@@ -243,3 +239,6 @@ diff -ru rsl-v1.40/doc/Makefile.am rsl-v1.40.new/doc/Makefile.am
- $(INSTALL) -m 444 ../README $(docdir)
- $(INSTALL) -m 444 ../CHANGES $(docdir)
+dist_doc_DATA = *.html *.gif *.jpg *.fig ../README ../CHANGES
+--
+1.7.3.4
+
diff --git a/debian/patches/rsl-type_str.patch b/debian/patches/rsl-type_str.patch
deleted file mode 100644
index 1e4149b..0000000
--- a/debian/patches/rsl-type_str.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-Add type strings for message 31 format
---- rsl-v1.40/wsr88d_m31.c 2008-10-08 23:43:03.000000000 +0000
-+++ rsl-mine/wsr88d_m31.c 2009-05-10 12:58:17.000000000 +0000
-@@ -546,6 +548,7 @@
- Range (*invf)(float x);
- float (*f)(Range x);
- int vol_index, waveform;
-+ char *type_str;
-
- enum waveforms {surveillance=1, doppler_ambres, doppler_no_ambres, batch};
-
-@@ -572,10 +575,10 @@
- if (wsr88d_ray.ray_hdr.dbptr_ref > 0) {
- vol_index = wsr88d_get_vol_index(wsr88d_ray.ref->data_hdr.dataname);
- switch (vol_index) {
-- case DZ_INDEX: f = DZ_F; invf = DZ_INVF; break;
-- case VR_INDEX: f = VR_F; invf = VR_INVF; break;
-- case SW_INDEX: f = SW_F; invf = SW_INVF; break;
-- default: f = DZ_F; invf = DZ_INVF; break;
-+ case DZ_INDEX: f = DZ_F; invf = DZ_INVF; type_str = "Reflectivity"; break;
-+ case VR_INDEX: f = VR_F; invf = VR_INVF; type_str = "Velocity"; break;
-+ case SW_INDEX: f = SW_F; invf = SW_INVF; type_str = "Spectrum width"; break;
-+ default: f = DZ_F; invf = DZ_INVF; type_str = "Unknown"; break;
- }
- /* If this is reflectivity, check the waveform type to make sure
- * it isn't from a Doppler split cut.
-@@ -591,6 +594,7 @@
- radar->v[vol_index] = RSL_new_volume(MAXSWEEPS);
- radar->v[vol_index]->h.f = f;
- radar->v[vol_index]->h.invf = invf;
-+ radar->v[vol_index]->h.type_str = type_str;
- }
- if (radar->v[vol_index]->sweep[isweep] == NULL) {
- radar->v[vol_index]->sweep[isweep] = RSL_new_sweep(MAXRAYS_M31);
-@@ -608,15 +612,16 @@
- if (wsr88d_ray.ray_hdr.dbptr_vel > 0) {
- vol_index = wsr88d_get_vol_index(wsr88d_ray.vel->data_hdr.dataname);
- switch (vol_index) {
-- case DZ_INDEX: f = DZ_F; invf = DZ_INVF; break;
-- case VR_INDEX: f = VR_F; invf = VR_INVF; break;
-- case SW_INDEX: f = SW_F; invf = SW_INVF; break;
-- default: f = DZ_F; invf = DZ_INVF; break;
-+ case DZ_INDEX: f = DZ_F; invf = DZ_INVF; type_str = "Reflectivity"; break;
-+ case VR_INDEX: f = VR_F; invf = VR_INVF; type_str = "Velocity"; break;
-+ case SW_INDEX: f = SW_F; invf = SW_INVF; type_str = "Spectrum width"; break;
-+ default: f = DZ_F; invf = DZ_INVF; type_str = "Unknown"; break;
- }
- if (radar->v[vol_index] == NULL) {
- radar->v[vol_index] = RSL_new_volume(MAXSWEEPS);
- radar->v[vol_index]->h.f = f;
- radar->v[vol_index]->h.invf = invf;
-+ radar->v[vol_index]->h.type_str = type_str;
- }
- if (radar->v[vol_index]->sweep[isweep] == NULL) {
- radar->v[vol_index]->sweep[isweep] = RSL_new_sweep(MAXRAYS_M31);
-@@ -633,15 +638,16 @@
- if (wsr88d_ray.ray_hdr.dbptr_sw > 0) {
- vol_index = wsr88d_get_vol_index(wsr88d_ray.sw->data_hdr.dataname);
- switch (vol_index) {
-- case DZ_INDEX: f = DZ_F; invf = DZ_INVF; break;
-- case VR_INDEX: f = VR_F; invf = VR_INVF; break;
-- case SW_INDEX: f = SW_F; invf = SW_INVF; break;
-- default: f = DZ_F; invf = DZ_INVF; break;
-+ case DZ_INDEX: f = DZ_F; invf = DZ_INVF; type_str = "Reflectivity"; break;
-+ case VR_INDEX: f = VR_F; invf = VR_INVF; type_str = "Velocity"; break;
-+ case SW_INDEX: f = SW_F; invf = SW_INVF; type_str = "Spectrum width"; break;
-+ default: f = DZ_F; invf = DZ_INVF; type_str = "Unknown"; break;
- }
- if (radar->v[vol_index] == NULL) {
- radar->v[vol_index] = RSL_new_volume(MAXSWEEPS);
- radar->v[vol_index]->h.f = f;
- radar->v[vol_index]->h.invf = invf;
-+ radar->v[vol_index]->h.type_str = type_str;
- }
- if (radar->v[vol_index]->sweep[isweep] == NULL) {
- radar->v[vol_index]->sweep[isweep] = RSL_new_sweep(MAXRAYS_M31);
diff --git a/debian/patches/rsl-valgrind.patch b/debian/patches/rsl-valgrind.patch
deleted file mode 100644
index 2768d43..0000000
--- a/debian/patches/rsl-valgrind.patch
+++ /dev/null
@@ -1,136 +0,0 @@
-Fix memory leaks
-diff -w -ru rsl-v1.40/wsr88d_m31.c rsl-v1.40.test/wsr88d_m31.c
---- rsl-v1.40/wsr88d_m31.c 2008-10-08 23:43:03.000000000 +0000
-+++ rsl-v1.40.test/wsr88d_m31.c 2009-05-14 10:06:23.000000000 +0000
-@@ -515,6 +515,7 @@
- m1_ray.vol_cpat = vcp_data.vcp;
- m1_ray.elev_num = ray_hdr.elev_num;
- m1_ray.unam_rng = wsr88d_ray.unamb_rng;
-+ m1_ray.nyq_vel = wsr88d_ray.nyq_vel; // TODO: is this correct?
- if (ray_hdr.azm_res != 1)
- ray->h.beam_width = 1.0;
- else ray->h.beam_width = 0.5;
-@@ -603,6 +604,8 @@
- radar->v[vol_index]->sweep[isweep]->ray[iray] = ray;
- radar->v[vol_index]->sweep[isweep]->h.nrays = iray+1;
- }
-+ free(wsr88d_ray.ref->data);
-+ free(wsr88d_ray.ref);
- }
-
- if (wsr88d_ray.ray_hdr.dbptr_vel > 0) {
-@@ -628,6 +631,8 @@
- wsr88d_load_ray_hdr(wsr88d_ray, ray);
- radar->v[vol_index]->sweep[isweep]->ray[iray] = ray;
- radar->v[vol_index]->sweep[isweep]->h.nrays = iray+1;
-+ free(wsr88d_ray.vel->data);
-+ free(wsr88d_ray.vel);
- }
-
- if (wsr88d_ray.ray_hdr.dbptr_sw > 0) {
-@@ -653,6 +658,8 @@
- wsr88d_load_ray_hdr(wsr88d_ray, ray);
- radar->v[vol_index]->sweep[isweep]->ray[iray] = ray;
- radar->v[vol_index]->sweep[isweep]->h.nrays = iray+1;
-+ free(wsr88d_ray.sw->data);
-+ free(wsr88d_ray.sw);
- }
-
- }
-@@ -706,15 +713,27 @@
- * at the WSR-88D Radar Operations Center web site.
- */
-
-- n = fread(&msghdr, sizeof(Wsr88d_msg_hdr), 1, wf->fptr);
--
-- /* printf("msgtype = %d\n", msghdr.msg_type); */
-- msg_hdr_size = sizeof(Wsr88d_msg_hdr) - sizeof(msghdr.rpg);
-
-
- radar = RSL_new_radar(MAX_RADAR_VOLUMES);
-
- while (! end_of_vos) {
-+ /* Read current header */
-+ n = fread(&msghdr, sizeof(Wsr88d_msg_hdr), 1, wf->fptr);
-+ if (n < 1) {
-+ fprintf(stderr,"Warning: load_wsr88d_m31_into_radar: ");
-+ if (feof(wf->fptr) != 0) fprintf(stderr,
-+ "Unexpected end of file.\n");
-+ else fprintf(stderr,"Failed reading msghdr.\n");
-+ fprintf(stderr,"Current sweep number: %d\n"
-+ "Last ray read: %d\n", isweep+1, iray);
-+ wsr88d_load_sweep_header(radar, isweep, wsr88d_ray);
-+ return radar;
-+ }
-+
-+ /* printf("msgtype = %d\n", msghdr.msg_type); */
-+ msg_hdr_size = sizeof(Wsr88d_msg_hdr) - sizeof(msghdr.rpg);
-+
- if (msghdr.msg_type == 31) {
- if (little_endian()) wsr88d_swap_m31_hdr(&msghdr);
-
-@@ -729,6 +748,18 @@
- /* Load this ray into radar structure ray. */
- wsr88d_load_ray_into_radar(wsr88d_ray, isweep, iray, radar);
- iray++;
-+
-+ /* Check for end of sweep */
-+ if (wsr88d_ray.ray_hdr.radial_status == END_OF_ELEV) {
-+ wsr88d_load_sweep_header(radar, isweep, wsr88d_ray);
-+ isweep++;
-+ iray = 0;
-+ }
-+
-+ if (wsr88d_ray.ray_hdr.radial_status == END_VOS) {
-+ //wsr88d_load_sweep_header(radar, isweep, wsr88d_ray);
-+ end_of_vos = 1;
-+ }
- }
- else { /* msg_type not 31 */
- n = fread(&non31_seg_remainder, sizeof(non31_seg_remainder), 1,
-@@ -748,33 +779,11 @@
- radar->h.vcp = vcp_data.vcp;
- /* printf("VCP = %d\n", vcp_data.vcp); */
- }
-+ /* TODO: check for end of sweep/volume */
- }
-
-- /* Check for end of sweep */
-- if (wsr88d_ray.ray_hdr.radial_status == END_OF_ELEV) {
-- wsr88d_load_sweep_header(radar, isweep, wsr88d_ray);
-- isweep++;
-- iray = 0;
-- }
--
-- if (wsr88d_ray.ray_hdr.radial_status != END_VOS) {
-- n = fread(&msghdr, sizeof(Wsr88d_msg_hdr), 1, wf->fptr);
-- if (n < 1) {
-- fprintf(stderr,"Warning: load_wsr88d_m31_into_radar: ");
-- if (feof(wf->fptr) != 0) fprintf(stderr,
-- "Unexpected end of file.\n");
-- else fprintf(stderr,"Failed reading msghdr.\n");
-- fprintf(stderr,"Current sweep number: %d\n"
-- "Last ray read: %d\n", isweep+1, iray);
-- wsr88d_load_sweep_header(radar, isweep, wsr88d_ray);
-- return radar;
-- }
-- }
-- else {
-+ if (feof(wf->fptr) != 0)
- end_of_vos = 1;
-- wsr88d_load_sweep_header(radar, isweep, wsr88d_ray);
-- }
-- if (feof(wf->fptr) != 0) end_of_vos = 1;
- }
-
- return radar;
-diff -w -ru rsl-v1.40/wsr88d_to_radar.c rsl-v1.40.test/wsr88d_to_radar.c
---- rsl-v1.40/wsr88d_to_radar.c 2008-07-30 22:41:20.000000000 +0000
-+++ rsl-v1.40.test/wsr88d_to_radar.c 2009-05-14 10:07:09.000000000 +0000
-@@ -429,5 +429,6 @@
- radar->h.lpulse = sitep->lpulse;
-
- radar = RSL_prune_radar(radar);
-+ free(sitep);
- return radar;
- }
diff --git a/debian/patches/rsl-warnings.patch b/debian/patches/rsl-warnings.patch
deleted file mode 100644
index a035cd8..0000000
--- a/debian/patches/rsl-warnings.patch
+++ /dev/null
@@ -1,206 +0,0 @@
-Fix compiler warnings
-diff -ru rsl-v1.40/africa.c warnings/africa.c
---- rsl-v1.40/africa.c 1999-12-01 03:48:29.000000000 +0000
-+++ warnings/africa.c 2008-12-27 11:53:44.000000000 +0000
-@@ -22,6 +22,7 @@
- */
- #include <stdio.h>
- #include <stdlib.h>
-+#include <string.h>
- #include "africa.h"
-
- int africa_read_buffer(FILE *fp, Africa_buffer *buffer)
-diff -ru rsl-v1.40/dorade_to_radar.c warnings/dorade_to_radar.c
---- rsl-v1.40/dorade_to_radar.c 1999-12-01 03:48:29.000000000 +0000
-+++ warnings/dorade_to_radar.c 2008-12-27 11:53:44.000000000 +0000
-@@ -24,7 +24,7 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <unistd.h>
--#include <strings.h>
-+#include <string.h>
- #define USE_RSL_VARS
- #include "rsl.h"
- #include "dorade.h"
-diff -ru rsl-v1.40/examples/any_to_gif.c warnings/examples/any_to_gif.c
---- rsl-v1.40/examples/any_to_gif.c 1999-01-26 16:20:25.000000000 +0000
-+++ warnings/examples/any_to_gif.c 2008-12-27 11:53:44.000000000 +0000
-@@ -73,7 +73,7 @@
- }
-
-
--void main(int argc, char **argv)
-+int main(int argc, char **argv)
- {
- Radar *radar;
- Sweep *sweep;
-diff -ru rsl-v1.40/examples/any_to_ppm.c warnings/examples/any_to_ppm.c
---- rsl-v1.40/examples/any_to_ppm.c 1998-09-16 18:35:56.000000000 +0000
-+++ warnings/examples/any_to_ppm.c 2008-12-27 11:53:44.000000000 +0000
-@@ -9,11 +9,12 @@
- * the RSL.
- *
- */
-+#include <stdlib.h>
-
- #define USE_RSL_VARS
- #include "rsl.h"
-
--void main(int argc, char **argv)
-+int main(int argc, char **argv)
- {
- Radar *radar;
- Sweep *sweep;
-diff -ru rsl-v1.40/examples/cappi_image.c warnings/examples/cappi_image.c
---- rsl-v1.40/examples/cappi_image.c 1998-09-16 18:35:56.000000000 +0000
-+++ warnings/examples/cappi_image.c 2008-12-27 11:53:44.000000000 +0000
-@@ -7,6 +7,7 @@
- */
-
- #include <stdio.h>
-+#include <stdlib.h>
- #include <string.h>
- #include "rsl.h"
-
-diff -ru rsl-v1.40/examples/dorade_main.c warnings/examples/dorade_main.c
---- rsl-v1.40/examples/dorade_main.c 1999-08-12 20:44:30.000000000 +0000
-+++ warnings/examples/dorade_main.c 2008-12-27 11:53:44.000000000 +0000
-@@ -1,4 +1,5 @@
- #include <stdio.h>
-+#include <stdlib.h>
- #include "rsl.h"
-
- int main(int argc, char **argv)
-diff -ru rsl-v1.40/examples/killer_sweep.c warnings/examples/killer_sweep.c
---- rsl-v1.40/examples/killer_sweep.c 1998-09-16 18:35:56.000000000 +0000
-+++ warnings/examples/killer_sweep.c 2008-12-27 11:53:44.000000000 +0000
-@@ -146,7 +146,7 @@
- }
- }
-
--void main(int argc, char **argv)
-+int main(int argc, char **argv)
- {
- Radar *radar;
- Sweep *sweep;
-diff -ru rsl-v1.40/examples/kwaj_subtract_one_day.c warnings/examples/kwaj_subtract_one_day.c
---- rsl-v1.40/examples/kwaj_subtract_one_day.c 1999-08-13 14:26:40.000000000 +0000
-+++ warnings/examples/kwaj_subtract_one_day.c 2008-12-27 11:53:44.000000000 +0000
-@@ -1,3 +1,4 @@
-+#include <stdlib.h>
- #include "rsl.h"
-
- /**********************************************************************/
-diff -ru rsl-v1.40/examples/lassen_to_gif.c warnings/examples/lassen_to_gif.c
---- rsl-v1.40/examples/lassen_to_gif.c 1998-09-16 18:35:56.000000000 +0000
-+++ warnings/examples/lassen_to_gif.c 2008-12-27 11:53:44.000000000 +0000
-@@ -4,9 +4,10 @@
- * This program can read the file from stdin.
- */
-
-+#include <stdlib.h>
- #include "rsl.h"
-
--void main(int argc, char **argv)
-+int main(int argc, char **argv)
- {
- Radar *radar;
-
-diff -ru rsl-v1.40/examples/print_hash_table.c warnings/examples/print_hash_table.c
---- rsl-v1.40/examples/print_hash_table.c 1998-09-16 18:35:56.000000000 +0000
-+++ warnings/examples/print_hash_table.c 2008-12-27 11:53:44.000000000 +0000
-@@ -9,6 +9,7 @@
- *
- */
-
-+#include <stdlib.h>
- #include "rsl.h"
-
- void print_link_list(Azimuth_hash *list)
-@@ -87,7 +88,7 @@
- }
-
-
--void main(int argc, char **argv)
-+int main(int argc, char **argv)
- {
- Radar *radar;
- Sweep *sweep;
-diff -ru rsl-v1.40/examples/sector.c warnings/examples/sector.c
---- rsl-v1.40/examples/sector.c 1998-09-16 18:35:57.000000000 +0000
-+++ warnings/examples/sector.c 2008-12-27 11:53:44.000000000 +0000
-@@ -1,4 +1,5 @@
- #include <stdio.h>
-+#include <stdlib.h>
- #include "rsl.h"
-
- /*
-@@ -84,7 +85,7 @@
- }
-
-
--void main(int argc, char **argv)
-+int main(int argc, char **argv)
- {
- Radar *radar;
- Sweep *sector;
-diff -ru rsl-v1.40/examples/wsr88d_to_gif.c warnings/examples/wsr88d_to_gif.c
---- rsl-v1.40/examples/wsr88d_to_gif.c 1998-09-16 18:35:57.000000000 +0000
-+++ warnings/examples/wsr88d_to_gif.c 2008-12-27 11:53:44.000000000 +0000
-@@ -14,9 +14,10 @@
- * wsr88d_to_gif file [tape_header_file]
- */
-
-+#include <stdlib.h>
- #include "rsl.h"
-
--void main(int argc, char **argv)
-+int main(int argc, char **argv)
- {
- Radar *radar;
-
-diff -ru rsl-v1.40/lassen_to_radar.c warnings/lassen_to_radar.c
---- rsl-v1.40/lassen_to_radar.c 2008-07-24 13:40:50.000000000 +0000
-+++ warnings/lassen_to_radar.c 2008-12-27 11:53:44.000000000 +0000
-@@ -31,6 +31,7 @@
-
- */
- #include <stdio.h>
-+#include <stdlib.h>
- #include <unistd.h>
- #include <string.h>
- #include <math.h>
-diff -ru rsl-v1.40/rainbow.c warnings/rainbow.c
---- rsl-v1.40/rainbow.c 2004-02-10 17:10:28.000000000 +0000
-+++ warnings/rainbow.c 2008-12-27 11:53:44.000000000 +0000
-@@ -22,6 +22,7 @@
- */
-
- #include <stdio.h>
-+#include <stdlib.h>
- #include <string.h>
- #include "rsl.h"
- #include "rainbow.h"
-diff -ru rsl-v1.40/rainbow_to_radar.c warnings/rainbow_to_radar.c
---- rsl-v1.40/rainbow_to_radar.c 2004-02-11 16:54:37.000000000 +0000
-+++ warnings/rainbow_to_radar.c 2008-12-27 11:53:44.000000000 +0000
-@@ -22,6 +22,7 @@
- */
-
- #include <stdio.h>
-+#include <stdlib.h>
- #include <string.h>
- #include "rsl.h"
- #include "rainbow.h"
-diff -ru rsl-v1.40/wsr88d_m31.c warnings/wsr88d_m31.c
---- rsl-v1.40/wsr88d_m31.c 2008-10-08 23:43:03.000000000 +0000
-+++ warnings/wsr88d_m31.c 2008-12-27 11:53:44.000000000 +0000
-@@ -25,6 +25,8 @@
- * This file contains routines for processing Message Type 31, the digital
- * radar message type introduced in WSR-88D Level II Build 10.
- */
-+#include <stdlib.h>
-+#include <string.h>
-
- #include "rsl.h"
- #include "wsr88d.h"
diff --git a/debian/patches/series b/debian/patches/series
index 709d47e..a7e0fbd 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1 @@
-rsl-type_str.patch
-rsl-valgrind.patch
-rsl-warnings.patch
rsl-automake.patch
diff --git a/debian/symbols b/debian/symbols
index 0f3263b..306fc29 100644
--- a/debian/symbols
+++ b/debian/symbols
@@ -25,6 +25,8 @@ librsl.so.1 librsl1 #MINVER#
FREE_HASH_NODE at Base 1.40
FREE_HASH_TABLE at Base 1.40
F_label at Base 1.40
+ HC_F at Base 1.41
+ HC_INVF at Base 1.41
H_label at Base 1.40
INSERT_SWEEP at Base 1.40
KD_F at Base 1.40
@@ -35,6 +37,8 @@ librsl.so.1 librsl1 #MINVER#
MD_INVF at Base 1.40
MZ_F at Base 1.40
MZ_INVF at Base 1.40
+ NP_F at Base 1.41
+ NP_INVF at Base 1.41
NSIG2_I2 at Base 1.40
NSIG2_I4 at Base 1.40
NSIG_I2 at Base 1.40
@@ -235,6 +239,8 @@ librsl.so.1 librsl1 #MINVER#
RSL_z_to_r at Base 1.40
R_label at Base 1.40
Re at Base 1.40
+ SD_F at Base 1.41
+ SD_INVF at Base 1.41
SQ_F at Base 1.40
SQ_INVF at Base 1.40
SWEEP_INDEX at Base 1.40
@@ -242,11 +248,21 @@ librsl.so.1 librsl1 #MINVER#
SW_INVF at Base 1.40
TI_F at Base 1.40
TI_INVF at Base 1.40
- UF_field_name at Base 1.40
+#MISSING: 1.41-1# UF_field_name at Base 1.40
+ VC_F at Base 1.41
+ VC_INVF at Base 1.41
VE_F at Base 1.40
VE_INVF at Base 1.40
+ VG_F at Base 1.41
+ VG_INVF at Base 1.41
+ VL_F at Base 1.41
+ VL_INVF at Base 1.41
VR_F at Base 1.40
VR_INVF at Base 1.40
+ VS_F at Base 1.41
+ VS_INVF at Base 1.41
+ VT_F at Base 1.41
+ VT_INVF at Base 1.41
W_label at Base 1.40
XZ_F at Base 1.40
XZ_INVF at Base 1.40
@@ -305,7 +321,7 @@ librsl.so.1 librsl1 #MINVER#
dorade_verbose_off at Base 1.40
dorade_verbose_on at Base 1.40
elev at Base 1.40
- file at Base 1.40
+#MISSING: 1.41-1# file at Base 1.40
fill_header at Base 1.40
fill_radar_header at Base 1.40
fill_ray at Base 1.40
@@ -325,6 +341,7 @@ librsl.so.1 librsl1 #MINVER#
get_pixel_area at Base 1.40
get_surrounding_ray at Base 1.40
get_surrounding_sweep at Base 1.40
+ get_wsr88d_unamb_and_nyq_vel at Base 1.41
get_xyz_coord at Base 1.40
hash_bin at Base 1.40
hash_table_for_sweep at Base 1.40
@@ -335,7 +352,7 @@ librsl.so.1 librsl1 #MINVER#
ivolume at Base 1.40
lassen_load_sweep at Base 1.40
little_endian at Base 1.40
- load_wsr88d_m31_into_radar at Base 1.40
+#MISSING: 1.41-1# load_wsr88d_m31_into_radar at Base 1.40
mcgFileClose at Base 1.40
mcgFileOpen at Base 1.40
mcgRayBuild at Base 1.40
@@ -375,6 +392,7 @@ librsl.so.1 librsl1 #MINVER#
print_head at Base 1.40
print_packet_info at Base 1.40
print_vect at Base 1.40
+ prt_skipped_field_msg at Base 1.41
radar at Base 1.40
radar_load_date_time at Base 1.40
radar_verbose_flag at Base 1.40
@@ -407,8 +425,9 @@ librsl.so.1 librsl1 #MINVER#
rapictext at Base 1.40
rapicwrap at Base 1.40
ray at Base 1.40
- read_data_moment at Base 1.40
+#MISSING: 1.41-1# read_data_moment at Base 1.40
read_entire_lassen_file at Base 1.40
+ read_extra_bytes at Base 1.41
read_lassen_head at Base 1.40
read_lassen_ray at Base 1.40
read_lassen_volume at Base 1.40
@@ -434,7 +453,7 @@ librsl.so.1 librsl1 #MINVER#
swap_uf_buffer at Base 1.40
sweep at Base 1.40
sweepcount at Base 1.40
- testprt at Base 1.40
+#MISSING: 1.41-1# testprt at Base 1.40
tg_decode_ray_data at Base 1.40
tg_make_ang at Base 1.40
tg_open at Base 1.40
@@ -474,7 +493,8 @@ librsl.so.1 librsl1 #MINVER#
wsr88d_get_vol_index at Base 1.40
wsr88d_get_volume_coverage at Base 1.40
wsr88d_get_wavelength at Base 1.40
- wsr88d_load_ray_data at Base 1.40
+ wsr88d_load_m31_into_radar at Base 1.41
+#MISSING: 1.41-1# wsr88d_load_ray_data at Base 1.40
wsr88d_load_ray_hdr at Base 1.40
wsr88d_load_ray_into_radar at Base 1.40
wsr88d_load_sweep_header at Base 1.40
@@ -489,9 +509,11 @@ librsl.so.1 librsl1 #MINVER#
wsr88d_read_ray_header at Base 1.40
wsr88d_read_sweep at Base 1.40
wsr88d_read_tape_header at Base 1.40
- wsr88d_swap_data_moment at Base 1.40
+ wsr88d_swap_data_hdr at Base 1.41
+#MISSING: 1.41-1# wsr88d_swap_data_moment at Base 1.40
wsr88d_swap_file_header at Base 1.40
wsr88d_swap_m31_hdr at Base 1.40
- wsr88d_swap_m31_ray at Base 1.40
+#MISSING: 1.41-1# wsr88d_swap_m31_ray at Base 1.40
+ wsr88d_swap_m31_ray_hdr at Base 1.41
wsr88d_swap_ray at Base 1.40
yywrap at Base 1.40
--
TRMM Radar Software Library
More information about the debian-science-commits
mailing list