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

[Andy Spencer]

The following commit has been merged in the master branch:
commit 1c79a67d7ee2983edb25d54ea9c4bbdb9b7d5a40
Author: Andy Spencer <andy753421 at gmail.com>
Date:   Sun Sep 11 23:15:57 2011 +0000

    Change /usr/share/rsl -> /usr/share/rsl1

diff --git a/debian/changelog b/debian/changelog
index ed67687..37e6f9d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+librsl (1.42-2) unstable; urgency=low
+
+  * Add version to in /share folder name (Closes: #639293)
+
+ -- Andy Spencer <andy753421 at gmail.com>  Sun, 11 Sep 2011 23:42:06 +0000
+
 librsl (1.42-1) unstable; urgency=low
 
   * Initial debian package (Closes: #604185)
diff --git a/debian/librsl1.install b/debian/librsl1.install
index d5ef3ae..f23b7c9 100644
--- a/debian/librsl1.install
+++ b/debian/librsl1.install
@@ -1,2 +1,2 @@
 usr/lib/lib*.so.*
-usr/share/rsl/*
+usr/share/rsl1/*
diff --git a/debian/patches/rsl-automake.patch b/debian/patches/rsl-automake.patch
index c9b87ea..e17c84b 100644
--- a/debian/patches/rsl-automake.patch
+++ b/debian/patches/rsl-automake.patch
@@ -10,7 +10,7 @@ index 709a367..b043f7f 100644
  AUTOMAKE_OPTIONS = foreign
  
 -colordir = $(prefix)/lib/colors
-+colordir = $(datadir)/rsl/colors
++colordir = $(datadir)/rsl1/colors
  color_DATA = *.???
  
  EXTRA_DIST = $(color_DATA)
@@ -20,7 +20,7 @@ index 3c106a8..6aca2ec 100644
 +++ b/Makefile.am
 @@ -1,73 +1,49 @@
  ## Process w/ automake.  Or, autoreconf; make ##
-+AM_CFLAGS = -DDATADIR="\"$(datadir)/rsl\""
++AM_CFLAGS = -DDATADIR="\"$(datadir)/rsl1\""
  AUTOMAKE_OPTIONS = foreign
  SUBDIRS = . colors doc examples
  INCLUDES = -I. -I$(srcdir) -I$(prefix)/include -I$(prefix)/toolkit/include
@@ -48,7 +48,7 @@ index 3c106a8..6aca2ec 100644
 - radar_to_hdf_1.c rainbow.c rainbow_to_radar.c $(headers)
 -
 -librsl_la_DEPENDENCIES = $(build_headers)
-+wsr88ddir = $(datadir)/rsl/
++wsr88ddir = $(datadir)/rsl1/
 +dist_wsr88d_DATA = wsr88d_locations.dat
  
 -build_headers = rsl.h wsr88d.h toolkit_1BC-51_appl.h

-- 
TRMM Radar Software Library