[SCM] Rivet: Robust Independent Validation of Experiment and Theory branch, master, updated. upstream/1.8.1-18-g337eb7b

[Lifeng Sun]

The following commit has been merged in the master branch:
commit 337eb7b35766423f5ecd7c1998a178485cca62a2
Author: Lifeng Sun <lifongsun at gmail.com>
Date:   Tue Mar 5 23:02:46 2013 +0800

    Revise patchset.

diff --git a/debian/changelog b/debian/changelog
index 966288c..e196e4d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+rivet (1.8.2-1~exp1) experimental; urgency=low
+
+  * New upstream release.
+
+ -- Lifeng Sun <lifongsun at gmail.com>  Tue, 05 Mar 2013 23:02:23 +0800
+
 rivet (1.8.1-1~exp1) experimental; urgency=low
 
   * New upstream release.
diff --git a/debian/patches/fix-analysis-plugin-path.patch b/debian/patches/fix-analysis-plugin-path.patch
index c8082f8..5b17356 100644
--- a/debian/patches/fix-analysis-plugin-path.patch
+++ b/debian/patches/fix-analysis-plugin-path.patch
@@ -1,6 +1,6 @@
 --- a/src/Tools/Makefile.am
 +++ b/src/Tools/Makefile.am
-@@ -21,7 +21,7 @@
+@@ -22,7 +22,7 @@
    $(AM_CPPFLAGS) \
    -DENABLE_BINRELOC \
    -DDEFAULTDATADIR=\"$(datadir)\" \
@@ -29,8 +29,8 @@
  RivetALICEAnalyses_la_SOURCES = \
      ALICE_2010_S8624100.cc \
      ALICE_2010_S8625980.cc \
-@@ -43,7 +43,7 @@
-     ALICE_2011_S8945144.cc
+@@ -44,7 +44,7 @@
+     ALICE_2012_I1181770.cc
  
  
 -lib_LTLIBRARIES += RivetATLASAnalyses.la
@@ -38,7 +38,7 @@
  RivetATLASAnalyses_la_SOURCES = \
      ATLAS_2010_S8591806.cc \
      ATLAS_2010_S8817804.cc \
-@@ -97,7 +97,7 @@
+@@ -112,7 +112,7 @@
  endif
  
  
@@ -47,23 +47,30 @@
  RivetCMSAnalyses_la_SOURCES = \
      CMS_2010_S8547297.cc \
      CMS_2010_S8656010.cc \
-@@ -118,7 +118,7 @@
+@@ -141,7 +141,7 @@
  endif
  
  
 -lib_LTLIBRARIES += RivetLHCbAnalyses.la
 +pkglib_LTLIBRARIES += RivetLHCbAnalyses.la
- RivetLHCbAnalyses_la_SOURCES =
+ RivetLHCbAnalyses_la_SOURCES = \
+     LHCB_2010_I867355.cc
  if ENABLE_UNVALIDATED
- RivetLHCbAnalyses_la_SOURCES += \
-@@ -128,12 +128,12 @@
+@@ -153,18 +153,18 @@
  endif
  
  
+-lib_LTLIBRARIES += RivetLHCfAnalyses.la
++pkglib_LTLIBRARIES += RivetLHCfAnalyses.la
+ RivetLHCfAnalyses_la_SOURCES = \
+     LHCF_2012_I1115479.cc
+ 
+ 
 -lib_LTLIBRARIES += RivetTOTEMAnalyses.la
 +pkglib_LTLIBRARIES += RivetTOTEMAnalyses.la
  RivetTOTEMAnalyses_la_SOURCES = \
-     TOTEM_2012_DNDETA.cc
+     TOTEM_2012_I1115294.cc \
+     TOTEM_2012_002.cc # TODO: update to Inspire ID
  
  
 -lib_LTLIBRARIES += RivetCDFAnalyses.la
@@ -71,7 +78,7 @@
  RivetCDFAnalyses_la_SOURCES = \
      CDF_1988_S1865951.cc \
      CDF_1990_S2089246.cc \
-@@ -181,7 +181,7 @@
+@@ -213,7 +213,7 @@
  endif
  
  
@@ -80,7 +87,7 @@
  RivetD0Analyses_la_SOURCES = \
      D0_2000_S4480767.cc \
      D0_2001_S4674421.cc \
-@@ -209,7 +209,7 @@
+@@ -241,7 +241,7 @@
  endif
  
  
@@ -89,7 +96,7 @@
  RivetHERAAnalyses_la_SOURCES = \
      H1_1994_S2919893.cc \
      H1_2000_S4129130.cc
-@@ -219,12 +219,12 @@
+@@ -251,12 +251,12 @@
      ZEUS_2001_S4815815.cc
  endif
  
@@ -104,7 +111,7 @@
  RivetLEPAnalyses_la_SOURCES = \
      ALEPH_1991_S2435284.cc \
      ALEPH_1996_S3486095.cc \
-@@ -264,7 +264,7 @@
+@@ -296,7 +296,7 @@
  endif
  
  
@@ -113,7 +120,7 @@
  RivetRHICAnalyses_la_SOURCES = \
      STAR_2006_S6500200.cc \
      STAR_2006_S6860818.cc \
-@@ -280,7 +280,7 @@
+@@ -312,7 +312,7 @@
  endif
  
  
@@ -122,7 +129,7 @@
  RivetSPSAnalyses_la_SOURCES = \
      UA1_1990_S2044935.cc \
      UA5_1982_S875503.cc \
-@@ -290,7 +290,7 @@
+@@ -322,7 +322,7 @@
      UA5_1989_S1926373.cc
  
  
@@ -131,7 +138,7 @@
  RivetMiscAnalyses_la_SOURCES = \
      PDG_HADRON_MULTIPLICITIES.cc \
      PDG_HADRON_MULTIPLICITIES_RATIOS.cc \
-@@ -311,7 +311,7 @@
+@@ -343,7 +343,7 @@
  endif
  
  
diff --git a/debian/patches/purge-convenient-tinyxml-lib.patch b/debian/patches/purge-convenient-tinyxml-lib.patch
index dc8a486..83941a7 100644
--- a/debian/patches/purge-convenient-tinyxml-lib.patch
+++ b/debian/patches/purge-convenient-tinyxml-lib.patch
@@ -9,8 +9,8 @@
 -  TinyXML/tinyxmlparser.cpp \
    BinnedHistogram.cc \
    mt2_bisect.cc \
-   RivetMT2.cc
-@@ -22,7 +19,6 @@
+   RivetMT2.cc \
+@@ -23,7 +20,6 @@
  
  libRivetTools_la_CPPFLAGS = \
    $(AM_CPPFLAGS) \
@@ -18,7 +18,7 @@
    -DENABLE_BINRELOC \
    -DDEFAULTDATADIR=\"$(datadir)\" \
    -DDEFAULTLIBDIR=\"$(libdir)\"
-@@ -34,3 +30,4 @@
+@@ -35,3 +31,4 @@
  else
  libRivetTools_la_LIBADD = $(top_builddir)/src/Tools/yaml-cpp/libyaml-cpp.la
  endif

-- 
Rivet: Robust Independent Validation of Experiment and Theory