[rivet] 02/02: Revert changes made after the import of the last upstream. We'll stick with the old one for now

[Mattia Rizzolo]

This is an automated email from the git hooks/post-receive script.

mattia pushed a commit to branch master
in repository rivet.

commit 1f487cee703a1ab4d44a989d4ab78436a460cc7e
Author: Mattia Rizzolo <mattia at debian.org>
Date:   Mon Jun 13 17:17:57 2016 +0000

    Revert changes made after the import of the last upstream.  We'll stick with the old one for now
    
    This reverts 3f44f6f..c501cf7
---
 debian/patches/fix-analysis-plugin-path.patch | 32 +++++++++++++--------------
 debian/patches/series                         |  2 ++
 debian/patches/siscone.patch                  |  2 +-
 debian/rules                                  |  1 -
 4 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/debian/patches/fix-analysis-plugin-path.patch b/debian/patches/fix-analysis-plugin-path.patch
index 9360838..c53dca8 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
-@@ -17,7 +17,7 @@
+@@ -21,7 +21,7 @@
    $(AM_CPPFLAGS) \
    -DENABLE_BINRELOC \
    -DDEFAULTDATADIR=\"$(datadir)\" \
--  -DDEFAULTLIBDIR=\"$(libdir)\" \
-+  -DDEFAULTLIBDIR=\"$(pkglibdir)\" \
-   -I$(YAML_CPPINCDIR)
+-  -DDEFAULTLIBDIR=\"$(libdir)\"
++  -DDEFAULTLIBDIR=\"$(pkglibdir)\"
  
- libRivetTools_la_LDFLAGS = $(AM_LDFLAGS) -L$(YAML_CPPLIBPATH)
+ ## NB. Using $(top_builddir)/src/Tools rather than $(builddir) because of SL4 automake bug
+ if WITH_YAML_CPP
 --- 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 \
-@@ -116,7 +116,7 @@
+@@ -117,7 +117,7 @@
  endif
  
  
@@ -47,7 +47,7 @@
  RivetCMSAnalyses_la_SOURCES = \
      CMS_2010_S8547297.cc \
      CMS_2010_S8656010.cc \
-@@ -145,7 +145,7 @@
+@@ -146,7 +146,7 @@
  endif
  
  
@@ -56,7 +56,7 @@
  RivetLHCbAnalyses_la_SOURCES = \
      LHCB_2010_I867355.cc
  if ENABLE_UNVALIDATED
-@@ -157,18 +157,18 @@
+@@ -158,18 +158,18 @@
  endif
  
  
@@ -78,7 +78,7 @@
  RivetCDFAnalyses_la_SOURCES = \
      CDF_1988_S1865951.cc \
      CDF_1990_S2089246.cc \
-@@ -217,7 +217,7 @@
+@@ -218,7 +218,7 @@
  endif
  
  
@@ -87,7 +87,7 @@
  RivetD0Analyses_la_SOURCES = \
      D0_2000_S4480767.cc \
      D0_2001_S4674421.cc \
-@@ -245,7 +245,7 @@
+@@ -246,7 +246,7 @@
  endif
  
  
@@ -96,7 +96,7 @@
  RivetHERAAnalyses_la_SOURCES = \
      H1_1994_S2919893.cc \
      H1_2000_S4129130.cc
-@@ -255,12 +255,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 \
-@@ -300,7 +300,7 @@
+@@ -301,7 +301,7 @@
  endif
  
  
@@ -120,7 +120,7 @@
  RivetRHICAnalyses_la_SOURCES = \
      STAR_2006_S6500200.cc \
      STAR_2006_S6860818.cc \
-@@ -316,7 +316,7 @@
+@@ -317,7 +317,7 @@
  endif
  
  
@@ -129,7 +129,7 @@
  RivetSPSAnalyses_la_SOURCES = \
      UA1_1990_S2044935.cc \
      UA5_1982_S875503.cc \
-@@ -326,7 +326,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 \
-@@ -348,7 +348,7 @@
+@@ -349,7 +349,7 @@
  endif
  
  
@@ -149,7 +149,7 @@
      MC_QCD_PARTONS.cc \
 --- a/src/Tools/RivetPaths.cc
 +++ b/src/Tools/RivetPaths.cc
-@@ -17,20 +17,12 @@
+@@ -22,20 +22,12 @@
  
  
    string getLibPath() {
diff --git a/debian/patches/series b/debian/patches/series
index 19f4465..3618379 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,7 @@
 doc-building.patch
+purge-convenient-tinyxml-lib.patch
 purge-non-free-fastjet-plugins.patch
+yaml-cpp.patch
 siscone.patch
 fix-analysis-plugin-path.patch
 path-max.patch
diff --git a/debian/patches/siscone.patch b/debian/patches/siscone.patch
index bbf9ad5..8f54f7d 100644
--- a/debian/patches/siscone.patch
+++ b/debian/patches/siscone.patch
@@ -1,6 +1,6 @@
 --- a/configure.ac
 +++ b/configure.ac
-@@ -117,7 +117,7 @@
+@@ -118,7 +118,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
diff --git a/debian/rules b/debian/rules
index 58c117c..4086626 100755
--- a/debian/rules
+++ b/debian/rules
@@ -24,7 +24,6 @@ override_dh_auto_configure:
 		--with-fastjet-libpath=/usr/lib/$(DEB_HOST_MULTIARCH) \
 		--with-yaml_cpp-incpath=/usr/include \
 		--with-yaml_cpp-libpath=/usr/lib/$(DEB_HOST_MULTIARCH) \
-		--with-yoda-libpath=/usr/lib/$(DEB_HOST_MULTIARCH) \
 		--libdir=/usr/lib/$(DEB_HOST_MULTIARCH)
 
 override_dh_auto_install:

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/rivet.git