[SCM] FastJet: Fast C++ code for the kt and other jet algorithms branch, master, updated. upstream/3.0.2+dfsg-13-gc3fc93e

[Lifeng Sun]

The following commit has been merged in the master branch:
commit 3140042c6514efff5f1dd9d3fe74f522c304ee1f
Author: Lifeng Sun <lifongsun at gmail.com>
Date:   Tue Jul 3 07:54:22 2012 +0800

    debian/get-orig-source: support uscan --destdir option. (Closes: #676983)

diff --git a/debian/changelog b/debian/changelog
index 1e6738c..210eea6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,12 @@
-fastjet (3.0.3+dfsg-1) UNRELEASED; urgency=low
+fastjet (3.0.3+dfsg-1) unstable; urgency=low
 
   * New upstream release.
   * Remove patch missed-this-pointer.patch: applied by upstream.
   * debian/control: move doxygen-latex and graphviz from Build-Depends to
     Build-Depends-Indep.
+  * libfastjetplugins: links against siscone libraries.
+  * Update dependencies of binary packages.
+  * debian/get-orig-source: support uscan --destdir option. (Closes: #676983)
 
  -- Lifeng Sun <lifongsun at gmail.com>  Tue, 03 Jul 2012 07:37:02 +0800
 
diff --git a/debian/get-orig-source b/debian/get-orig-source
index c54f227..067831c 100755
--- a/debian/get-orig-source
+++ b/debian/get-orig-source
@@ -2,27 +2,31 @@
 
 set -e
 
-[ $# == 3 ] || exit 1
+test $# == 3
 
-ver="$2"
-debver="$ver+dfsg"
-pkg="fastjet"
-url="http://www.fastjet.fr/repo/"
+URL="http://www.fastjet.fr/repo/"
+VER="$2"
 
-[ ! -f "../$pkg-$ver.tar.gz" ] && wget -c "$url/$pkg-$ver.tar.gz" -O "../$pkg-$ver.tar.gz"
+UPTAR="fastjet-$VER.tar.gz"
+UPDIR="fastjet-$VER"
 
-[ -d "$pkg-$ver" ] && rm -rf "$pkg-$ver"
+ORIGTAR="$(echo "$3" | sed -e 's/\.orig/+dfsg.orig/')"
+ORIGDIR="fastjet-$VER+dfsg.orig"
 
-tar xf "../$pkg-$ver.tar.gz"
+DESTDIR="$(dirname "$ORIGTAR")"
 
-rm -rf "$pkg-$ver/plugins/ATLASCone"
-rm -rf "$pkg-$ver/plugins/CDFCones"
+test ! -f "$DESTDIR/$UPTAR" && wget "$URL/$UPTAR" -O "$DESTDIR/$UPTAR"
+test -d "$UPDIR" && rm -rf "$UPDIR"
 
-[ -d "$pkg-$debver.orig" ] && rm -rf "$pkg-$debver.orig"
+tar -xf "$DESTDIR/$UPTAR"
 
-mv "$pkg-$ver" "$pkg-$debver.orig"
-rm -f "../${pkg}_$debver.orig.tar.gz"
-rm -f "../${pkg}_$ver.orig.tar.gz"
-tar -zcf "../${pkg}_$debver.orig.tar.gz" "$pkg-$debver.orig"
+rm -rf "$UPDIR/plugins/ATLASCone"
+rm -rf "$UPDIR/plugins/CDFCones"
+
+mv "$UPDIR" "$ORIGDIR"
+
+test -e "$ORIGTAR" && rm -f "$ORIGTAR"
+GZIP=-9 tar --remove-files -zcf "$ORIGTAR" "$ORIGDIR"
+
+rm -f "$3"
 
-rm -rf "$pkg-$debver.orig"

-- 
FastJet: Fast C++ code for the kt and other jet algorithms