[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 6954cbbd8dd3f4c147527fe1a4b9d7a02e6f6b79
Author: Lifeng Sun <lifongsun at gmail.com>
Date:   Fri Jul 13 22:22:36 2012 +0800

    Revise patchset for new upstream.

diff --git a/debian/patches/fix-test-environment.patch b/debian/patches/fix-test-environment.patch
index 893e8ef..26f9e32 100644
--- a/debian/patches/fix-test-environment.patch
+++ b/debian/patches/fix-test-environment.patch
@@ -1,21 +1,17 @@
 Fix test environment.
 
-diff --git a/octave/Makefile.am b/octave/Makefile.am
-index 7ef2eac..f8f5b52 100644
 --- a/octave/Makefile.am
 +++ b/octave/Makefile.am
-@@ -5,5 +5,5 @@ pkgdata_DATA = lhapdf.oct
+@@ -5,5 +5,5 @@
  lhapdf.oct: wrapoctave.cc
  	$(MKOCTFILE) -I$(top_srcdir)/include -v -g -o lhapdf.oct wrapoctave.cc -L$(top_builddir)/lib -L$(top_builddir)/lib/.libs -lLHAPDF
  
 -TESTS_ENVIRONMENT = LHAPATH=$(top_srcdir)/PDFsets $(OCTAVE)
 +TESTS_ENVIRONMENT = LHAPATH=$(top_srcdir)/PDFsets LD_LIBRARY_PATH="$(top_builddir)/lib/.libs$${LD_LIBRARY_PATH:+:$$LD_LIBRARY_PATH}" $(OCTAVE)
  TESTS = $(srcdir)/lhapdf-octave-example1.m
-diff --git a/octave/Makefile.in b/octave/Makefile.in
-index 55098b1..b774174 100644
 --- a/octave/Makefile.in
 +++ b/octave/Makefile.in
-@@ -196,7 +196,7 @@ top_builddir = @top_builddir@
+@@ -195,7 +195,7 @@
  top_srcdir = @top_srcdir@
  EXTRA_DIST = lhapdf-octave-example1.m wrapoctave.cc
  pkgdata_DATA = lhapdf.oct
@@ -24,13 +20,11 @@ index 55098b1..b774174 100644
  TESTS = $(srcdir)/lhapdf-octave-example1.m
  all: all-am
  
-diff --git a/examples/Makefile.am b/examples/Makefile.am
-index 8faf5fb..0d8a558 100644
 --- a/examples/Makefile.am
 +++ b/examples/Makefile.am
-@@ -11,7 +11,7 @@ lhapdf_example7_SOURCES = Example7.f
- lhapdf_example8_SOURCES = Example8.f
+@@ -12,7 +12,7 @@
  lhapdf_example9_SOURCES = Example9.f
+ lhapdf_example10_SOURCES = Example10.f
  
 -#TESTS_ENVIRONMENT = LHAPATH=$(top_srcdir)/PDFsets
 +TESTS_ENVIRONMENT = LHAPATH=$(top_srcdir)/PDFsets
diff --git a/debian/patches/fix-typo.patch b/debian/patches/fix-typo.patch
index 3fb7520..71eb447 100644
--- a/debian/patches/fix-typo.patch
+++ b/debian/patches/fix-typo.patch
@@ -2,7 +2,7 @@ Fix typo: AVAIABLE->AVAILABLE.
 
 --- a/src/wrapevolve.F
 +++ b/src/wrapevolve.F
-@@ -314,7 +314,7 @@
+@@ -315,7 +315,7 @@
        if(index(setpath,'NNPDF').gt.0) then
            if(nset.gt.1) then
                if((index(setpath,'1000.').gt.0.and.nnpdf.gt.0).or.(index(setpath,'100.').gt.0.and.nnpdf1000.gt.0)) then

-- 
LHAPDF: Les Houches Accord PDF Interface