[SCM] Rivet: Robust Independent Validation of Experiment and Theory branch, master, updated. upstream/1.8.2-21-g0925059

Wed May 8 14:25:58 UTC 2013

The following commit has been merged in the master branch:
commit 0925059d537386c41f5d451182346f38daf0952a
Author: Lifeng Sun <lifongsun at gmail.com>
Date:   Tue May 7 09:27:47 2013 +0800

    Revise patchset.

diff --git a/debian/changelog b/debian/changelog
index e196e4d..65c4a50 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+rivet (1.8.3-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Lifeng Sun <lifongsun at gmail.com>  Tue, 07 May 2013 09:24:27 +0800
+
 rivet (1.8.2-1~exp1) experimental; urgency=low
 
   * New upstream release.
diff --git a/debian/control b/debian/control
index a37c9be..a9a4b42 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,6 @@ Section: science
 Priority: optional
 Maintainer: Debian Science Maintainers <debian-science-maintainers at lists.alioth.debian.org>
 Uploaders: Lifeng Sun <lifongsun at gmail.com>
-DM-Upload-Allowed: yes
 Build-Depends: debhelper (>= 8.0.0), autotools-dev, libhepmc-dev, libfastjet-dev, libfastjetplugins-dev, libfastjettools-dev, libyaml-cpp-dev, dh-autoreconf, libgsl0-dev, libtinyxml-dev, chrpath, libboost-dev, python-dev, python-support, swig, gfortran
 Build-Depends-Indep: texlive-science, doxygen-latex
 Standards-Version: 3.9.3
diff --git a/debian/patches/doc-building.patch b/debian/patches/doc-building.patch
index fc56a32..8d992bc 100644
--- a/debian/patches/doc-building.patch
+++ b/debian/patches/doc-building.patch
@@ -1,14 +1,14 @@
 --- a/Doxyfile.in
 +++ b/Doxyfile.in
-@@ -615,7 +615,7 @@
- # excluded from the INPUT source files. This way you can easily exclude a
- # subdirectory from a directory tree whose root is specified with the INPUT tag.
+@@ -692,7 +692,7 @@
+ # Note that relative paths are relative to the directory from which doxygen is
+ # run.
  
 -EXCLUDE                =
 +EXCLUDE                = debian
  
- # The EXCLUDE_SYMLINKS tag can be used select whether or not files or
- # directories that are symbolic links (a Unix filesystem feature) are excluded
+ # The EXCLUDE_SYMLINKS tag can be used to select whether or not files or
+ # directories that are symbolic links (a Unix file system feature) are excluded
 --- a/Makefile.am
 +++ b/Makefile.am
 @@ -1,5 +1,5 @@
diff --git a/debian/patches/fix-analysis-plugin-path.patch b/debian/patches/fix-analysis-plugin-path.patch
index 5b17356..c53dca8 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
-@@ -22,7 +22,7 @@
+@@ -21,7 +21,7 @@
    $(AM_CPPFLAGS) \
    -DENABLE_BINRELOC \
    -DDEFAULTDATADIR=\"$(datadir)\" \
@@ -20,7 +20,7 @@
  
  noinst_LTLIBRARIES = libRivetAnalysisTools.la
  libRivetAnalysisTools_la_SOURCES = \
-@@ -34,7 +34,7 @@
+@@ -35,7 +35,7 @@
  ## --disable-obsolete configure flag.
  
  
@@ -29,7 +29,7 @@
  RivetALICEAnalyses_la_SOURCES = \
      ALICE_2010_S8624100.cc \
      ALICE_2010_S8625980.cc \
-@@ -44,7 +44,7 @@
+@@ -45,7 +45,7 @@
      ALICE_2012_I1181770.cc
  
  
@@ -38,7 +38,7 @@
  RivetATLASAnalyses_la_SOURCES = \
      ATLAS_2010_S8591806.cc \
      ATLAS_2010_S8817804.cc \
-@@ -112,7 +112,7 @@
+@@ -117,7 +117,7 @@
  endif
  
  
@@ -47,7 +47,7 @@
  RivetCMSAnalyses_la_SOURCES = \
      CMS_2010_S8547297.cc \
      CMS_2010_S8656010.cc \
-@@ -141,7 +141,7 @@
+@@ -146,7 +146,7 @@
  endif
  
  
@@ -56,7 +56,7 @@
  RivetLHCbAnalyses_la_SOURCES = \
      LHCB_2010_I867355.cc
  if ENABLE_UNVALIDATED
-@@ -153,18 +153,18 @@
+@@ -158,18 +158,18 @@
  endif
  
  
@@ -78,7 +78,7 @@
  RivetCDFAnalyses_la_SOURCES = \
      CDF_1988_S1865951.cc \
      CDF_1990_S2089246.cc \
-@@ -213,7 +213,7 @@
+@@ -218,7 +218,7 @@
  endif
  
  
@@ -87,7 +87,7 @@
  RivetD0Analyses_la_SOURCES = \
      D0_2000_S4480767.cc \
      D0_2001_S4674421.cc \
-@@ -241,7 +241,7 @@
+@@ -246,7 +246,7 @@
  endif
  
  
@@ -96,7 +96,7 @@
  RivetHERAAnalyses_la_SOURCES = \
      H1_1994_S2919893.cc \
      H1_2000_S4129130.cc
-@@ -251,12 +251,12 @@
+@@ -256,12 +256,12 @@
      ZEUS_2001_S4815815.cc
  endif
  
@@ -111,7 +111,7 @@
  RivetLEPAnalyses_la_SOURCES = \
      ALEPH_1991_S2435284.cc \
      ALEPH_1996_S3486095.cc \
-@@ -296,7 +296,7 @@
+@@ -301,7 +301,7 @@
  endif
  
  
@@ -120,7 +120,7 @@
  RivetRHICAnalyses_la_SOURCES = \
      STAR_2006_S6500200.cc \
      STAR_2006_S6860818.cc \
-@@ -312,7 +312,7 @@
+@@ -317,7 +317,7 @@
  endif
  
  
@@ -129,7 +129,7 @@
  RivetSPSAnalyses_la_SOURCES = \
      UA1_1990_S2044935.cc \
      UA5_1982_S875503.cc \
-@@ -322,7 +322,7 @@
+@@ -327,7 +327,7 @@
      UA5_1989_S1926373.cc
  
  
@@ -138,7 +138,7 @@
  RivetMiscAnalyses_la_SOURCES = \
      PDG_HADRON_MULTIPLICITIES.cc \
      PDG_HADRON_MULTIPLICITIES_RATIOS.cc \
-@@ -343,7 +343,7 @@
+@@ -349,7 +349,7 @@
  endif
  
  
@@ -146,7 +146,7 @@
 +pkglib_LTLIBRARIES += RivetMCAnalyses.la
  RivetMCAnalyses_la_SOURCES = \
      EXAMPLE.cc \
-     MC_DIPHOTON.cc \
+     MC_QCD_PARTONS.cc \
 --- a/src/Tools/RivetPaths.cc
 +++ b/src/Tools/RivetPaths.cc
 @@ -22,20 +22,12 @@
diff --git a/debian/patches/purge-convenient-tinyxml-lib.patch b/debian/patches/purge-convenient-tinyxml-lib.patch
index 83941a7..fd0f2e5 100644
--- a/debian/patches/purge-convenient-tinyxml-lib.patch
+++ b/debian/patches/purge-convenient-tinyxml-lib.patch
@@ -7,10 +7,10 @@
 -  TinyXML/tinyxml.cpp \
 -  TinyXML/tinyxmlerror.cpp \
 -  TinyXML/tinyxmlparser.cpp \
-   BinnedHistogram.cc \
    mt2_bisect.cc \
    RivetMT2.cc \
-@@ -23,7 +20,6 @@
+   BinnedHistogram.cc
+@@ -22,7 +19,6 @@
  
  libRivetTools_la_CPPFLAGS = \
    $(AM_CPPFLAGS) \
@@ -18,7 +18,7 @@
    -DENABLE_BINRELOC \
    -DDEFAULTDATADIR=\"$(datadir)\" \
    -DDEFAULTLIBDIR=\"$(libdir)\"
-@@ -35,3 +31,4 @@
+@@ -34,3 +30,4 @@
  else
  libRivetTools_la_LIBADD = $(top_builddir)/src/Tools/yaml-cpp/libyaml-cpp.la
  endif

-- 
Rivet: Robust Independent Validation of Experiment and Theory

