[SCM] Rivet: Robust Independent Validation of Experiment and Theory branch, master, updated. upstream/1.8.0-4-g8a4c390

[Lifeng Sun]

The following commit has been merged in the master branch:
commit 90125348f08703405230e1cb6233a026c0247350
Author: Lifeng Sun <lifongsun at gmail.com>
Date:   Tue Jun 5 20:00:25 2012 +0800

    Simplify siscone.patch.

diff --git a/debian/patches/siscone.patch b/debian/patches/siscone.patch
index bc90d51..8f54f7d 100644
--- a/debian/patches/siscone.patch
+++ b/debian/patches/siscone.patch
@@ -1,31 +1,11 @@
---- a/bin/Makefile.am
-+++ b/bin/Makefile.am
-@@ -20,5 +20,5 @@
- noinst_PROGRAMS = rivet-nopy
- rivet_nopy_SOURCES = rivet-nopy.cc
- rivet_nopy_CPPFLAGS = -I$(top_srcdir)/include $(AM_CPPFLAGS)
--rivet_nopy_LDADD = $(top_builddir)/src/libRivet.la -lHepMC
-+rivet_nopy_LDADD = $(top_builddir)/src/libRivet.la -lHepMC -lsiscone_spherical -lsiscone
- rivet_nopy_LDFLAGS = -L$(HEPMCLIBPATH)
---- a/pyext/setup.py.in
-+++ b/pyext/setup.py.in
-@@ -26,7 +26,7 @@
-                 library_dirs=[libdir, libdir_yaml, '@HEPMCLIBPATH@'],
-                 extra_compile_args = cxxargs,
-                 extra_link_args = ldargs,
--                libraries=['HepMC', 'Rivet'])
-+                libraries=['HepMC', 'Rivet', 'siscone_spherical', 'siscone'])
- 
- ## Setup definition
- setup(name = 'Rivet',
---- a/test/Makefile.am
-+++ b/test/Makefile.am
-@@ -15,7 +15,7 @@
- 
- testApi_SOURCES = testApi.cc
- testApi_CPPFLAGS = -I$(top_srcdir)/include $(AM_CPPFLAGS)
--testApi_LDADD = ../src/libRivet.la $(HEPMCLDFLAGS) $(HEPMCLDLIBS)
-+testApi_LDADD = ../src/libRivet.la $(HEPMCLDFLAGS) $(HEPMCLDLIBS) -lsiscone_spherical -lsiscone
- 
- TESTS_ENVIRONMENT = \
-   RIVET_REF_PATH=$(top_builddir)/data/refdata \
+--- a/configure.ac
++++ b/configure.ac
+@@ -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
+-  FASTJETCONFIGLIBADD="$($FJCONFIG --plugins --shared --libs | sed 's/\-\-rpath/-rpath/g')"
++  FASTJETCONFIGLIBADD="$($FJCONFIG --plugins --shared --libs | sed 's/\-\-rpath/-rpath/g') -lsiscone_spherical -lsiscone"
+   #FASTJETLIBPATH="$($FJCONFIG --libs | sed 's/.*\-L\([^\ ]\+\).*/\1/')"
+ else
+   FASTJETCONFIGLIBADD="-L$FASTJETLIBPATH -l$FASTJETLIBNAME"

-- 
Rivet: Robust Independent Validation of Experiment and Theory