[SCM] ThePEG: Toolkit for High Energy Physics Event Generation branch, master, updated. upstream/1.8.0-16-gca908b1

[Lifeng Sun]

The following commit has been merged in the master branch:
commit ca908b1e6420c96d3d2a797a7f89f78676bfe301
Author: Lifeng Sun <lifongsun at gmail.com>
Date:   Sat Jul 14 08:50:23 2012 +0800

    Remove lhapdf-tests.patch.

diff --git a/debian/changelog b/debian/changelog
index 38488d5..23d1a34 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,8 +6,10 @@ thepeg (1.8.0-2) unstable; urgency=low
     RAM.
   * debian/control: add time and graphviz package to build-deps and
     build-deps-indep respectively.
+  * Remove lhapdf-tests.patch: lhapdf-pdfsets-minimal now ships PDF sets
+    required by the test-suites.
 
- -- Lifeng Sun <lifongsun at gmail.com>  Sat, 30 Jun 2012 22:26:19 +0800
+ -- Lifeng Sun <lifongsun at gmail.com>  Sat, 14 Jul 2012 10:15:46 +0800
 
 thepeg (1.8.0-1) unstable; urgency=low
 
diff --git a/debian/patches/lhapdf-tests.patch b/debian/patches/lhapdf-tests.patch
deleted file mode 100644
index c5977e2..0000000
--- a/debian/patches/lhapdf-tests.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-Disable LHAPDF test, which requires additional PDF sets not shipped
-with LHAPDF package right now.
-
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -78,10 +78,6 @@
- 	rm SimpleLEP.cmp
- 	./setupThePEG --exitonerror -r ThePEGDefaults.rpo MultiLEP.in
- 	time ./runThePEG -d 0 MultiLEP.run
--if USELHAPDF
--	./setupThePEG --exitonerror -r ThePEGDefaults.rpo TestLHAPDF.in
--	time ./runThePEG -d 1 -x .libs/TestLHAPDF.so TestLHAPDF.run
--endif
- 
- SimpleLEP.run: done-all-links setupThePEG ThePEGDefaults.rpo SimpleLEP.in
- 	./setupThePEG --exitonerror -r ThePEGDefaults.rpo SimpleLEP.in
-@@ -95,14 +91,6 @@
- MultiLEP.out: runThePEG MultiLEP.run
- 	time ./runThePEG -d 0 MultiLEP.run
- 
--if USELHAPDF
--TestLHAPDF.run: done-all-links setupThePEG ThePEGDefaults.rpo TestLHAPDF.in TestLHAPDF.la
--	./setupThePEG --exitonerror -r ThePEGDefaults.rpo TestLHAPDF.in
--
--TestLHAPDF.out: runThePEG TestLHAPDF.run
--	time ./runThePEG -d 1 -x .libs/TestLHAPDF.so TestLHAPDF.run
--endif
--
- install-exec-hook:
- 	cd $(DESTDIR)$(pkglibdir); \
- 	rm -f setupThePEG-$(VERSION) runThePEG-$(VERSION); \
-@@ -133,11 +121,6 @@
- diff SimpleLEP.out SimpleLEP.cmp; \
- $(DESTDIR)$(bindir)/setupThePEG --exitonerror $(DESTDIR)$(pkgdatadir)/MultiLEP.in; \
- $(DESTDIR)$(bindir)/runThePEG MultiLEP.run;
--if USELHAPDF
--	cd _test_thepeg_installation_; \
--$(DESTDIR)$(bindir)/setupThePEG --exitonerror $(DESTDIR)$(pkgdatadir)/TestLHAPDF.in; \
--$(DESTDIR)$(bindir)/runThePEG -x $(DESTDIR)$(pkglibdir)/TestLHAPDF.so TestLHAPDF.run
--endif
- 	rm -rf _test_thepeg_installation_
- 
- %.run: %.in done-all-links ThePEGDefaults.rpo
diff --git a/debian/patches/series b/debian/patches/series
index ad561fb..bcf7fd4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
-lhapdf-tests.patch
 thepeg-gui.patch
 doxygen-exclude-debian-dir.patch

-- 
ThePEG: Toolkit for High Energy Physics Event Generation