[SCM] LHAPDF: Les Houches Accord PDF Interface branch, master, updated. upstream/5.8.7-10-g908e983

[Lifeng Sun]

The following commit has been merged in the master branch:
commit 13feec3843d76de271ac2e058a70d8bf6811ee3d
Author: Lifeng Sun <lifongsun at gmail.com>
Date:   Fri Jun 15 22:52:01 2012 +0800

    Repack source tarball.
    
    Include new pdfsets (cteq6ll.LHpdf, GRV98nlo.LHgrid and
    MRST2001nlo.LHgrid) to make test-suite of ThePEG happy.

diff --git a/debian/changelog b/debian/changelog
index 699290c..0178e0f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,12 @@
-lhapdf (5.8.7-3) UNRELEASED; urgency=low
+lhapdf (5.8.7+repack-1) UNRELEASED; urgency=low
 
   * Disable test-suite on hurd-i386, mips, mipsel and s390.
   * Set priority of octave-lhapdf to extra.
+  * Include new pdfsets (cteq6ll.LHpdf, GRV98nlo.LHgrid and
+    MRST2001nlo.LHgrid) to make test-suite of ThePEG happy, so repack
+    source tarball.
 
- -- Lifeng Sun <lifongsun at gmail.com>  Fri, 15 Jun 2012 11:06:57 +0800
+ -- Lifeng Sun <lifongsun at gmail.com>  Fri, 15 Jun 2012 22:51:03 +0800
 
 lhapdf (5.8.7-2) unstable; urgency=low
 
diff --git a/debian/get-orig-source b/debian/get-orig-source
index 2e5ee95..d4498dd 100755
--- a/debian/get-orig-source
+++ b/debian/get-orig-source
@@ -2,39 +2,40 @@
 
 set -e
 
-[ $# == 3 ] || exit 1
+test $# == 3
 
-ver="$2"
-pkg="lhapdf"
-url="http://www.hepforge.org/archive/lhapdf"
+URL="http://www.hepforge.org/archive/lhapdf"
+VER="$2"
 
-# get official tarball
-[ ! -f "../$pkg-$ver.tar.gz" ] && \
-        wget "$url/$pkg-$ver.tar.gz" -O ../$pkg-$ver.tar.gz
+UPTAR="lhapdf-$VER.tar.gz"
+UPDIR="lhapdf-$VER"
 
-[ -d "$pkg-$ver" ] && rm -rf "$pkg-$ver"
-tar xf "../$pkg-$ver.tar.gz"
+ORIGTAR="$(echo "$3" | sed -e 's/\.orig/+repack.orig/')"
+ORIGDIR="lhapdf-$VER+repack.orig"
+
+DESTDIR="$(dirname "$ORIGTAR")"
+
+test ! -f "$DESTDIR/$UPTAR" && wget "$URL/$UPTAR" -O "$DESTDIR/$UPTAR"
+test -d "$UPDIR" && rm -rf "$UPDIR"
+
+tar -xf "$DESTDIR/$UPTAR"
 
 # get PDFsets
-mkdir -p "$pkg-$ver/PDFsets"
-cd "$pkg-$ver/PDFsets"
 
-for pdf in cteq5l.LHgrid cteq61.LHgrid cteq61.LHpdf MRST2004nlo.LHgrid; do
-	wget "$url/pdfsets/$ver/$pdf"
-done
+mkdir -p "$UPDIR/PDFsets"
 
-cd ../..
+for pdf in cteq5l.LHgrid cteq61.LHgrid cteq61.LHpdf MRST2004nlo.LHgrid \
+	cteq6ll.LHpdf GRV98nlo.LHgrid MRST2001nlo.LHgrid; do
+	wget "$URL/pdfsets/$VER/$pdf" -O "$UPDIR/PDFsets/$pdf"
+done
 
 # remove generated source files
-rm -f "$pkg-$ver/pyext/lhapdf.py" "$pkg-$ver/pyext/lhapdf_wrap.cc" \
-	"$pkg-$ver/src/parmsetup.inc"
-
-# repackage tarball
-[ -d "$pkg-$ver.orig" ] && rm -rf "$pkg-$ver.orig"
+rm -f "$UPDIR/pyext/lhapdf.py" "$UPDIR/pyext/lhapdf_wrap.cc" \
+	"$UPDIR/src/parmsetup.inc"
 
-mv "$pkg-$ver" "$pkg-$ver.orig"
-[ -e "../${pkg}_$ver.orig.tar.gz" ] && rm -f "../${pkg}_$ver.orig.tar.gz"
-tar zcf "../${pkg}_$ver.orig.tar.gz" "$pkg-$ver.orig"
+mv "$UPDIR" "$ORIGDIR"
 
-rm -rf "$pkg-$ver.orig"
+test -e "$ORIGTAR" && rm -f "$ORIGTAR"
+GZIP=-9 tar --remove-files -zcf "$ORIGTAR" "$ORIGDIR"
 
+rm -f "$3"
diff --git a/debian/rules b/debian/rules
index 27c033d..4635091 100755
--- a/debian/rules
+++ b/debian/rules
@@ -39,7 +39,7 @@ PKGNAME=$(strip $(shell head -n1 debian/changelog | cut -d' ' -f1))
 DEBVER=$(strip $(shell head -n1 debian/changelog | cut -d' ' -f2 | tr -d '()'))
 
 # current upstream version (remove any epoch and Debian release number)
-UPVER=$(shell echo $(DEBVER) | sed -e 's/-[^-]*$$//' -e 's/^[^:]*://')
+UPVER=$(shell echo $(DEBVER) | sed -e 's/[-\+].*$$//' -e 's/^[^:]*://')
 
 ../$(PKGNAME)_$(UPVER).orig.tar.gz:
 	dh_testdir
diff --git a/debian/watch b/debian/watch
index 4c82fd2..57ebce7 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,5 @@
 version=3
 
-http://projects.hepforge.org/lhapdf/ .*lhapdf-(.*)\.tar\.gz debian ./debian/get-orig-source
+opts=dversionmangle=s/\+repack.*$// \
+	http://projects.hepforge.org/lhapdf/ .*lhapdf-(.*)\.tar\.gz \
+	debian ./debian/get-orig-source

-- 
LHAPDF: Les Houches Accord PDF Interface