[SCM] Rivet: Robust Independent Validation of Experiment and Theory branch, master, updated. upstream/1.8.3-26-gc501cf7

[Lifeng Sun]

The following commit has been merged in the master branch:
commit c7b9a0ba5d30b9b650c92b4865d63966adabe37b
Author: Lifeng Sun <lifongsun at gmail.com>
Date:   Sat Jun 15 10:23:54 2013 +0800

    Refresh patchset.

diff --git a/debian/patches/fix-analysis-plugin-path.patch b/debian/patches/fix-analysis-plugin-path.patch
index c53dca8..9360838 100644
--- a/debian/patches/fix-analysis-plugin-path.patch
+++ b/debian/patches/fix-analysis-plugin-path.patch
@@ -1,14 +1,14 @@
 --- a/src/Tools/Makefile.am
 +++ b/src/Tools/Makefile.am
-@@ -21,7 +21,7 @@
+@@ -17,7 +17,7 @@
    $(AM_CPPFLAGS) \
    -DENABLE_BINRELOC \
    -DDEFAULTDATADIR=\"$(datadir)\" \
--  -DDEFAULTLIBDIR=\"$(libdir)\"
-+  -DDEFAULTLIBDIR=\"$(pkglibdir)\"
+-  -DDEFAULTLIBDIR=\"$(libdir)\" \
++  -DDEFAULTLIBDIR=\"$(pkglibdir)\" \
+   -I$(YAML_CPPINCDIR)
  
- ## NB. Using $(top_builddir)/src/Tools rather than $(builddir) because of SL4 automake bug
- if WITH_YAML_CPP
+ libRivetTools_la_LDFLAGS = $(AM_LDFLAGS) -L$(YAML_CPPLIBPATH)
 --- a/src/Analyses/Makefile.am
 +++ b/src/Analyses/Makefile.am
 @@ -1,7 +1,7 @@
@@ -38,7 +38,7 @@
  RivetATLASAnalyses_la_SOURCES = \
      ATLAS_2010_S8591806.cc \
      ATLAS_2010_S8817804.cc \
-@@ -117,7 +117,7 @@
+@@ -116,7 +116,7 @@
  endif
  
  
@@ -47,7 +47,7 @@
  RivetCMSAnalyses_la_SOURCES = \
      CMS_2010_S8547297.cc \
      CMS_2010_S8656010.cc \
-@@ -146,7 +146,7 @@
+@@ -145,7 +145,7 @@
  endif
  
  
@@ -56,7 +56,7 @@
  RivetLHCbAnalyses_la_SOURCES = \
      LHCB_2010_I867355.cc
  if ENABLE_UNVALIDATED
-@@ -158,18 +158,18 @@
+@@ -157,18 +157,18 @@
  endif
  
  
@@ -78,7 +78,7 @@
  RivetCDFAnalyses_la_SOURCES = \
      CDF_1988_S1865951.cc \
      CDF_1990_S2089246.cc \
-@@ -218,7 +218,7 @@
+@@ -217,7 +217,7 @@
  endif
  
  
@@ -87,7 +87,7 @@
  RivetD0Analyses_la_SOURCES = \
      D0_2000_S4480767.cc \
      D0_2001_S4674421.cc \
-@@ -246,7 +246,7 @@
+@@ -245,7 +245,7 @@
  endif
  
  
@@ -96,7 +96,7 @@
  RivetHERAAnalyses_la_SOURCES = \
      H1_1994_S2919893.cc \
      H1_2000_S4129130.cc
-@@ -256,12 +256,12 @@
+@@ -255,12 +255,12 @@
      ZEUS_2001_S4815815.cc
  endif
  
@@ -111,7 +111,7 @@
  RivetLEPAnalyses_la_SOURCES = \
      ALEPH_1991_S2435284.cc \
      ALEPH_1996_S3486095.cc \
-@@ -301,7 +301,7 @@
+@@ -300,7 +300,7 @@
  endif
  
  
@@ -120,7 +120,7 @@
  RivetRHICAnalyses_la_SOURCES = \
      STAR_2006_S6500200.cc \
      STAR_2006_S6860818.cc \
-@@ -317,7 +317,7 @@
+@@ -316,7 +316,7 @@
  endif
  
  
@@ -129,7 +129,7 @@
  RivetSPSAnalyses_la_SOURCES = \
      UA1_1990_S2044935.cc \
      UA5_1982_S875503.cc \
-@@ -327,7 +327,7 @@
+@@ -326,7 +326,7 @@
      UA5_1989_S1926373.cc
  
  
@@ -138,7 +138,7 @@
  RivetMiscAnalyses_la_SOURCES = \
      PDG_HADRON_MULTIPLICITIES.cc \
      PDG_HADRON_MULTIPLICITIES_RATIOS.cc \
-@@ -349,7 +349,7 @@
+@@ -348,7 +348,7 @@
  endif
  
  
@@ -149,7 +149,7 @@
      MC_QCD_PARTONS.cc \
 --- a/src/Tools/RivetPaths.cc
 +++ b/src/Tools/RivetPaths.cc
-@@ -22,20 +22,12 @@
+@@ -17,20 +17,12 @@
  
  
    string getLibPath() {
diff --git a/debian/patches/siscone.patch b/debian/patches/siscone.patch
index 8f54f7d..bbf9ad5 100644
--- a/debian/patches/siscone.patch
+++ b/debian/patches/siscone.patch
@@ -1,6 +1,6 @@
 --- a/configure.ac
 +++ b/configure.ac
-@@ -118,7 +118,7 @@
+@@ -117,7 +117,7 @@
      -o "$fjmajor" -eq 2 -a "$fjminor" -eq 4 -a "$fjmicro" -lt 2; then
      AC_MSG_ERROR([FastJet version 2.4.2 or later is required])
    fi

-- 
Rivet: Robust Independent Validation of Experiment and Theory