[SCM] TRMM Radar Software Library branch, master, updated. upstream/1.41-15-gea677a3

[Andy Spencer]

The following commit has been merged in the master branch:
commit ea677a3297e9effde2589981e9855f70046ac35c
Author: Andy Spencer <andy753421 at gmail.com>
Date:   Sun Jul 31 23:41:05 2011 +0000

    Improve format for orig-tar scripts

diff --git a/debian/orig-tar.sh b/debian/orig-tar.sh
index e951ce2..969447f 100755
--- a/debian/orig-tar.sh
+++ b/debian/orig-tar.sh
@@ -1,15 +1,20 @@
 #!/bin/bash
 
-VER=$2 # e.g. 1.42 
-OLD=$3 # e.g. ../librsl_1.42.orig.tar.gz 
-NEW=${OLD/orig/dfsg.orig}
-DIR=rsl-v$VER
+VER=$2  # e.g. 1.42 
+FILE=$3 # e.g. ../librsl_1.42.orig.tar.gz 
+
+OLD_DIR=rsl-v$VER
+OLD_TAR=${FILE/orig/nonfree.orig}
+NEW_DIR=rsl-v$VER.dfsg
+NEW_TAR=${FILE/orig/dfsg.orig}
 
 # Extract old tar
-tar -xzf $OLD
+mv $FILE $OLD_TAR
+tar -xzf $OLD_TAR
+mv $OLD_DIR $NEW_DIR
 
 # Remove non-free functions
-cat > $DIR/edge_to_radar.c <<-EOF
+cat > $NEW_DIR/edge_to_radar.c <<-EOF
 	#include "rsl.h"
 	Radar *RSL_EDGE_to_radar(char *f)
 	{
@@ -22,7 +27,8 @@ cat > $DIR/edge_to_radar.c <<-EOF
 EOF
 
 # Create new tar
-tar -czf $NEW $DIR
+tar -czf $NEW_TAR $NEW_DIR
+ln -s $(basename $NEW_TAR) $FILE
+rm -rf $NEW_DIR
 
-# Cleanup
-rm -rf $DIR
+echo "Repackaged $FILE to remove non-free components"
diff --git a/debian/rules b/debian/rules
index bace6e8..f7b0c0e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,3 +1,6 @@
 #!/usr/bin/make -f
 %:
 	dh $@ --with autoreconf
+
+get-orig-source:
+	uscan --upstream-version 0 --rename

-- 
TRMM Radar Software Library