[SCM] LHAPDF: Les Houches Accord PDF Interface branch, master, updated. upstream/5.8.7+repack-22-g1881c7b

[Lifeng Sun]

The following commit has been merged in the master branch:
commit 5d2b0cb35f52b8871fe1cb0db7f3683f4e8e826d
Author: Lifeng Sun <lifongsun at gmail.com>
Date:   Fri Jul 13 21:58:09 2012 +0800

    Update d/watch, d/get-orig-source and d/README.Debian for 5.8.8.

diff --git a/debian/README.Debian b/debian/README.Debian
index 2dda30b..29f3dfe 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -2,11 +2,10 @@ LHAPDF for Debian
 -----------------
 
 The source package was downloaded from [1]. A minimal PDF sets (cteq5l.LHgrid,
-cteq61.LHgrid, cteq61.LHpdf, MRST2004nlo.LHgrid, cteq6ll.LHpdf, GRV98nlo.LHgrid
-and MRST2001nlo.LHgrid) is also included to make the test suites of LHAPDF
-and ThePEG happy.
+cteq6ll.LHpdf, CT10.LHgrid, GRV98nlo.LHgrid and MRST2001nlo.LHgrid) is also
+included to make the test suites of LHAPDF and ThePEG happy.
 
 
 [1] http://projects.hepforge.org/lhapdf/
 
- -- Lifeng Sun <lifongsun at gmail.com>  Mon, 18 Jun 2012 10:19:50 +0800
+ -- Lifeng Sun <lifongsun at gmail.com>  Sat, 14 Jul 2012 08:11:58 +0800
diff --git a/debian/get-orig-source b/debian/get-orig-source
index d4498dd..601a485 100755
--- a/debian/get-orig-source
+++ b/debian/get-orig-source
@@ -10,8 +10,8 @@ VER="$2"
 UPTAR="lhapdf-$VER.tar.gz"
 UPDIR="lhapdf-$VER"
 
-ORIGTAR="$(echo "$3" | sed -e 's/\.orig/+repack.orig/')"
-ORIGDIR="lhapdf-$VER+repack.orig"
+ORIGTAR="$3"
+ORIGDIR="lhapdf-$VER.orig"
 
 DESTDIR="$(dirname "$ORIGTAR")"
 
@@ -24,9 +24,9 @@ tar -xf "$DESTDIR/$UPTAR"
 
 mkdir -p "$UPDIR/PDFsets"
 
-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"
+for pdf in cteq5l.LHgrid cteq6ll.LHpdf CT10.LHgrid GRV98nlo.LHgrid \
+       	MRST2001nlo.LHgrid; do
+	wget "$URL/pdfsets/current/$pdf" -O "$UPDIR/PDFsets/$pdf"
 done
 
 # remove generated source files
@@ -37,5 +37,3 @@ mv "$UPDIR" "$ORIGDIR"
 
 test -e "$ORIGTAR" && rm -f "$ORIGTAR"
 GZIP=-9 tar --remove-files -zcf "$ORIGTAR" "$ORIGDIR"
-
-rm -f "$3"
diff --git a/debian/watch b/debian/watch
index 57ebce7..55575c9 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,5 +1,4 @@
 version=3
 
-opts=dversionmangle=s/\+repack.*$// \
-	http://projects.hepforge.org/lhapdf/ .*lhapdf-(.*)\.tar\.gz \
+http://projects.hepforge.org/lhapdf/ .*lhapdf-(.*)\.tar\.gz \
 	debian ./debian/get-orig-source

-- 
LHAPDF: Les Houches Accord PDF Interface