[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 4e96ba64e8f946cf47df97fff40a9a5597ec7af3
Author: Andy Spencer <andy753421 at gmail.com>
Date:   Wed Jun 19 07:29:07 2013 +0000

    Remove repackaging scripts
    
    The non-GPL files have been removed by upstream so these scripts are no
    longer necessary.

diff --git a/debian/orig-tar.sh b/debian/orig-tar.sh
deleted file mode 100755
index 969447f..0000000
--- a/debian/orig-tar.sh
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/bash
-
-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
-mv $FILE $OLD_TAR
-tar -xzf $OLD_TAR
-mv $OLD_DIR $NEW_DIR
-
-# Remove non-free functions
-cat > $NEW_DIR/edge_to_radar.c <<-EOF
-	#include "rsl.h"
-	Radar *RSL_EDGE_to_radar(char *f)
-	{
-	  fprintf(stderr, "%s",
-	    "The RSL interface to load EDGE files and the\n"
-	    "corresponding ETOR library are not GPL compatible\n"
-	    "and have been removed from this version\n");
-	  return NULL;
-	}
-EOF
-
-# Create new tar
-tar -czf $NEW_TAR $NEW_DIR
-ln -s $(basename $NEW_TAR) $FILE
-rm -rf $NEW_DIR
-
-echo "Repackaged $FILE to remove non-free components"
diff --git a/debian/rules b/debian/rules
index f7b0c0e..bace6e8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,3 @@
 #!/usr/bin/make -f
 %:
 	dh $@ --with autoreconf
-
-get-orig-source:
-	uscan --upstream-version 0 --rename
diff --git a/debian/watch b/debian/watch
index 60e90d9..dbe0131 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,4 +1,2 @@
 version=3
-opts="dversionmangle=s/\.dfsg//" \
- ftp://trmm-fc.gsfc.nasa.gov/software/rsl-v([\d.]+)\.tar.gz \
-  debian debian/orig-tar.sh
+ftp://trmm-fc.gsfc.nasa.gov/software/rsl-v([\d.]+)\.tar.gz

-- 
TRMM Radar Software Library