[SCM] SISCONE: Seedless Infrared Safe Cone jet finder branch, master, updated. upstream/2.0.5-2-gb21cac3

[Lifeng Sun]

The following commit has been merged in the master branch:
commit b21cac388d08fc8ca5ff99bab24093e16552fa53
Author: Lifeng Sun <lifongsun at gmail.com>
Date:   Wed May 30 10:30:56 2012 +0800

    uscan supports repackaging source tarball.

diff --git a/debian/get-orig-source b/debian/get-orig-source
index e91754a..52a3ebe 100755
--- a/debian/get-orig-source
+++ b/debian/get-orig-source
@@ -2,32 +2,29 @@
 
 set -e
 
-[ $# == 1 ]
+[ $# == 3 ]
 
-ver="$1"
+ver="$2"
+pkg="siscone"
+url="http://www.hepforge.org/archive/siscone"
+svn="http://siscone.hepforge.org/svn/tags/siscone-$ver"
 
-cd ..
-
-if [ ! -f "siscone-$ver.tar.gz" ]; then
-    wget -c http://www.hepforge.org/archive/siscone/siscone-$ver.tar.gz
-fi
-
-if [ -d "siscone-$ver" ]; then
-    rm -rf "siscone-$ver"
-fi
+# get official tarball
+[ ! -f "../$pkg-$ver.tar.gz" ] && \
+        wget "$url/$pkg-$ver.tar.gz" -O ../$pkg-$ver.tar.gz
 
-tar xf siscone-$ver.tar.gz
+[ -d "$pkg-$ver" ] && rm -rf "$pkg-$ver"
+tar xf "../$pkg-$ver.tar.gz"
 
-cd siscone-$ver
-svn co http://siscone.hepforge.org/svn/tags/siscone-$ver/doc/
+cd "$pkg-$ver"
+svn co "$svn/doc/"
 find doc -name .svn | xargs rm -rf
 cd ..
 
-if [ -d "siscone-$ver.orig" ]; then
-    rm -rf "siscone-$ver.orig"
-fi
+[ -d "$pkg-$ver.orig" ] && rm -rf "$pkg-$ver.orig"
 
-mv siscone-$ver siscone-$ver.orig
-tar -zcf siscone_$ver.orig.tar.gz siscone-$ver.orig
+mv "$pkg-$ver" "$pkg-$ver.orig"
+rm -f "../${pkg}_$ver.orig.tar.gz"
+tar -zcf "../${pkg}_$ver.orig.tar.gz" "$pkg-$ver.orig"
 
-rm -rf siscone-$ver.orig
+rm -rf "$pkg-$ver.orig"
diff --git a/debian/rules b/debian/rules
index fff9447..84a8505 100755
--- a/debian/rules
+++ b/debian/rules
@@ -41,7 +41,7 @@ UPVER=$(shell echo $(DEBVER) | sed -e 's/-[^-]*$$//' -e 's/^[^:]*://')
 
 
 ../$(PKGNAME)_$(UPVER).orig.tar.gz:
-	./debian/get-orig-source $(UPVER)
+	./debian/get-orig-source --upstream-version $(UPVER) $@
 
 get-orig-source: ../$(PKGNAME)_$(UPVER).orig.tar.gz
 
diff --git a/debian/watch b/debian/watch
index f5c2558..2d13653 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,4 +1,4 @@
 version=3
 
-http://www.hepforge.org/archive/siscone/ siscone-(.*)\.tar\.gz
+http://www.hepforge.org/archive/siscone/ siscone-(.*)\.tar\.gz debian ./debian/get-orig-source
 

-- 
SISCONE: Seedless Infrared Safe Cone jet finder