Hello community, here is the log from the commit of package ThePEG for openSUSE:Factory checked in at 2017-11-03 16:27:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ThePEG (Old) and /work/SRC/openSUSE:Factory/.ThePEG.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ThePEG" Fri Nov 3 16:27:21 2017 rev:11 rq:538337 version:2.1.2 Changes: -------- --- /work/SRC/openSUSE:Factory/ThePEG/ThePEG.changes 2017-09-27 16:55:25.278491667 +0200 +++ /work/SRC/openSUSE:Factory/.ThePEG.new/ThePEG.changes 2017-11-03 16:28:43.175760788 +0100 @@ -1,0 +2,9 @@ +Thu Nov 2 10:00:24 UTC 2017 - [email protected] + +- Update to version 2.1.2: + * Allow LHAPDF6 interface to return photon pdf. + * Sign fix in GeneralVVSVertex + * Fix multiple weight reading from LHE files + * Preparations for Rivet 3 + +------------------------------------------------------------------- Old: ---- ThePEG-2.1.1.tar.bz2 New: ---- ThePEG-2.1.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ThePEG.spec ++++++ --- /var/tmp/diff_new_pack.BtQEPl/_old 2017-11-03 16:28:44.399716241 +0100 +++ /var/tmp/diff_new_pack.BtQEPl/_new 2017-11-03 16:28:44.403716094 +0100 @@ -23,7 +23,7 @@ # Name: ThePEG -Version: 2.1.1 +Version: 2.1.2 Release: 0 Summary: Toolkit providing a common platform for event generators in C++ License: GPL-2.0 ++++++ ThePEG-2.1.1.tar.bz2 -> ThePEG-2.1.2.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ThePEG-2.1.1/Analysis/Makefile.am new/ThePEG-2.1.2/Analysis/Makefile.am --- old/ThePEG-2.1.1/Analysis/Makefile.am 2017-05-19 17:35:37.000000000 +0200 +++ new/ThePEG-2.1.2/Analysis/Makefile.am 2017-11-01 11:56:49.000000000 +0100 @@ -18,7 +18,7 @@ RivetAnalysis_la_CPPFLAGS = $(AM_CPPFLAGS) $(RIVETINCLUDE) $(HEPMCINCLUDE) RivetAnalysis_la_LIBADD = $(HEPMCLIBS) $(RIVETLIBS) RivetAnalysis_la_SOURCES = RivetAnalysis.cc NLORivetAnalysis.cc $(INCLUDEFILES) - RivetAnalysis_la_LDFLAGS = $(AM_LDFLAGS) -module $(LIBTOOLVERSIONINFO) + RivetAnalysis_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 25:1:0 else DOCFILES = $(AIDAWRAPPERS) $(LWHHEADERS) endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ThePEG-2.1.1/Analysis/Makefile.in new/ThePEG-2.1.2/Analysis/Makefile.in --- old/ThePEG-2.1.1/Analysis/Makefile.in 2017-07-14 11:31:28.000000000 +0200 +++ new/ThePEG-2.1.2/Analysis/Makefile.in 2017-11-01 11:57:08.000000000 +0100 @@ -496,7 +496,7 @@ @HAVE_RIVET_TRUE@RivetAnalysis_la_CPPFLAGS = $(AM_CPPFLAGS) $(RIVETINCLUDE) $(HEPMCINCLUDE) @HAVE_RIVET_TRUE@RivetAnalysis_la_LIBADD = $(HEPMCLIBS) $(RIVETLIBS) @HAVE_RIVET_TRUE@RivetAnalysis_la_SOURCES = RivetAnalysis.cc NLORivetAnalysis.cc $(INCLUDEFILES) -@HAVE_RIVET_TRUE@RivetAnalysis_la_LDFLAGS = $(AM_LDFLAGS) -module $(LIBTOOLVERSIONINFO) +@HAVE_RIVET_TRUE@RivetAnalysis_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 25:1:0 INCLUDEFILES = $(DOCFILES) LWHINCLUDE = -I$(top_builddir)/include/ThePEG/Analysis/LWH LWHFactory_la_SOURCES = $(mySOURCES) $(INCLUDEFILES) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ThePEG-2.1.1/Analysis/NLORivetAnalysis.cc new/ThePEG-2.1.2/Analysis/NLORivetAnalysis.cc --- old/ThePEG-2.1.1/Analysis/NLORivetAnalysis.cc 2016-01-26 14:36:16.000000000 +0100 +++ new/ThePEG-2.1.2/Analysis/NLORivetAnalysis.cc 2017-11-01 11:56:49.000000000 +0100 @@ -247,7 +247,12 @@ AnalysisHandler::dofinish(); if( _nevent > 0 && _rivet ) { CurrentGenerator::Redirect stdout(cout); +#if ThePEG_RIVET_VERSION > 2 + _rivet->setCrossSection(generator()->integratedXSec()/picobarn, + generator()->integratedXSecErr()/picobarn); +#else _rivet->setCrossSection(generator()->integratedXSec()/picobarn); +#endif _rivet->finalize(); string fname = filename; @@ -263,7 +268,7 @@ _rivet->writeData(fname); } delete _rivet; - _rivet = 0; + _rivet = nullptr; } void NLORivetAnalysis::doinit() { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ThePEG-2.1.1/Analysis/RivetAnalysis.cc new/ThePEG-2.1.2/Analysis/RivetAnalysis.cc --- old/ThePEG-2.1.1/Analysis/RivetAnalysis.cc 2016-01-26 14:36:16.000000000 +0100 +++ new/ThePEG-2.1.2/Analysis/RivetAnalysis.cc 2017-11-01 11:56:49.000000000 +0100 @@ -130,7 +130,12 @@ AnalysisHandler::dofinish(); if( _nevent > 0 && _rivet ) { CurrentGenerator::Redirect stdout(cout); +#if ThePEG_RIVET_VERSION > 2 + _rivet->setCrossSection(generator()->integratedXSec()/picobarn, + generator()->integratedXSecErr()/picobarn); +#else _rivet->setCrossSection(generator()->integratedXSec()/picobarn); +#endif _rivet->finalize(); string fname = filename; @@ -146,7 +151,7 @@ _rivet->writeData(fname); } delete _rivet; - _rivet = 0; + _rivet = nullptr; } void RivetAnalysis::doinit() { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ThePEG-2.1.1/Config/config.h.in new/ThePEG-2.1.2/Config/config.h.in --- old/ThePEG-2.1.1/Config/config.h.in 2017-07-14 11:32:13.000000000 +0200 +++ new/ThePEG-2.1.2/Config/config.h.in 2017-11-01 11:57:39.000000000 +0100 @@ -148,7 +148,7 @@ /* define if log1p is available */ #undef ThePEG_HAS_LOG1P -/* Rivet histogram variant (1=AIDA or 2=YODA) */ +/* Rivet major version (1,2,3) */ #undef ThePEG_RIVET_VERSION /* Version number of package */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ThePEG-2.1.1/Helicity/Vertex/Scalar/GeneralVVSVertex.cc new/ThePEG-2.1.2/Helicity/Vertex/Scalar/GeneralVVSVertex.cc --- old/ThePEG-2.1.1/Helicity/Vertex/Scalar/GeneralVVSVertex.cc 2017-07-14 10:45:33.000000000 +0200 +++ new/ThePEG-2.1.2/Helicity/Vertex/Scalar/GeneralVVSVertex.cc 2017-09-05 12:22:26.000000000 +0200 @@ -77,7 +77,7 @@ complex<Energy2> p1Ep2 = eps.dot(pvec1); Complex output = UnitRemoval::InvE2 * (_a00*e1e2*p1p2 + _aEp*p1Ep2 + _a11*e1p1*e2p1 + _a12*e1p1*e2p2 + _a21*e1p2*e2p1+ _a22*e1p2*e2p2); - output *= -norm()*prop; + output *= norm()*prop; return ScalarWaveFunction(pout,out,output); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ThePEG-2.1.1/LesHouches/LesHouchesFileReader.cc new/ThePEG-2.1.2/LesHouches/LesHouchesFileReader.cc --- old/ThePEG-2.1.1/LesHouches/LesHouchesFileReader.cc 2017-07-14 10:45:33.000000000 +0200 +++ new/ThePEG-2.1.2/LesHouches/LesHouchesFileReader.cc 2017-09-05 12:22:26.000000000 +0200 @@ -488,7 +488,6 @@ map<string,string> attributes = StringUtils::xmlAttributes("LesHouchesEvents", cfile.getline()); LHFVersion = attributes["version"]; - //cout << LHFVersion << endl; if ( LHFVersion.empty() ) return; bool readingHeader = false; @@ -566,13 +565,14 @@ /* now get the relevant information * e.g. scales or PDF sets used */ - string startDEL = ">"; //starting delimiter + string startDEL = "'>"; //starting delimiter string stopDEL = "</weight>"; //end delimiter - unsigned firstLim = hs.find(startDEL); //find start of delimiter + int firstLim = hs.find(startDEL); //find start of delimiter + if(firstLim == -1) { startDEL = ">"; firstLim = hs.find(startDEL); } // unsigned lastLim = hs.find(stopDEL); //find end of delimitr string scinfo = hs.substr(firstLim); //define the information for the scale erase_substr(scinfo,stopDEL); - erase_substr(scinfo,startDEL); + erase_substr(scinfo,startDEL); scinfo = StringUtils::stripws(scinfo); /* fill in the map * indicating the information to be appended to each scale @@ -657,7 +657,6 @@ hepeup.XPDWUP.first = hepeup.XPDWUP.second = 0.0; optionalWeights.clear(); optionalWeightsTemp.clear(); - // Keep reading lines until we hit the next event or the end of // the event block. Save any inbetween lines. Exit if we didn't // find an event. @@ -805,11 +804,20 @@ //determine start of MG5 clustering scale information if(cfile.find("<clustering")) { readingMG5ClusInfo = true;} } + string str_quote = "'"; + string str_doublequote = "\""; // loop over the optional weights and add the extra information as found in the init for (map<string,double>::const_iterator it=optionalWeightsTemp.begin(); it!=optionalWeightsTemp.end(); ++it){ + //to avoid issues with inconsistencies of defining the weight ids, remove "" and '' + string id_1 = it->first; + erase_substr(id_1, str_quote); + erase_substr(id_1, str_doublequote); for (map<string,string>::const_iterator it2=scalemap.begin(); it2!=scalemap.end(); ++it2){ //find the scale id in the scale information and add this information - if(it->first==it2->first) { + string id_2 = it2->first; + erase_substr(id_2, str_quote); + erase_substr(id_2, str_doublequote); + if(id_1==id_2) { string info = it2->second; string str_newline = "\n"; erase_substr(info, str_newline); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ThePEG-2.1.1/LesHouches/Makefile.am new/ThePEG-2.1.2/LesHouches/Makefile.am --- old/ThePEG-2.1.1/LesHouches/Makefile.am 2017-07-14 11:25:57.000000000 +0200 +++ new/ThePEG-2.1.2/LesHouches/Makefile.am 2017-11-01 11:56:49.000000000 +0100 @@ -20,7 +20,7 @@ # Version info should be updated if any interface or persistent I/O # function is changed -LesHouches_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 25:1:0 +LesHouches_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 25:2:0 LesHouches_la_SOURCES = $(mySOURCES) $(INCLUDEFILES) include $(top_srcdir)/Config/Makefile.aminclude diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ThePEG-2.1.1/LesHouches/Makefile.in new/ThePEG-2.1.2/LesHouches/Makefile.in --- old/ThePEG-2.1.1/LesHouches/Makefile.in 2017-07-14 11:31:34.000000000 +0200 +++ new/ThePEG-2.1.2/LesHouches/Makefile.in 2017-11-01 11:57:09.000000000 +0100 @@ -427,7 +427,7 @@ # Version info should be updated if any interface or persistent I/O # function is changed -LesHouches_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 25:1:0 +LesHouches_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 25:2:0 LesHouches_la_SOURCES = $(mySOURCES) $(INCLUDEFILES) all: all-am diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ThePEG-2.1.1/Makefile.am new/ThePEG-2.1.2/Makefile.am --- old/ThePEG-2.1.1/Makefile.am 2016-10-24 12:22:09.000000000 +0200 +++ new/ThePEG-2.1.2/Makefile.am 2017-11-01 12:00:10.000000000 +0100 @@ -11,7 +11,7 @@ EXTRA_DIST = GUIDELINES -## DISTCHECK_CONFIGURE_FLAGS = --enable-unitchecks --without-lhapdf --with-gsl=$(GSLPATH) +DISTCHECK_CONFIGURE_FLAGS = --without-lhapdf --with-gsl=$(GSLPATH) ACLOCAL_AMFLAGS = -I m4 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ThePEG-2.1.1/Makefile.in new/ThePEG-2.1.2/Makefile.in --- old/ThePEG-2.1.1/Makefile.in 2017-07-14 11:31:34.000000000 +0200 +++ new/ThePEG-2.1.2/Makefile.in 2017-11-01 12:00:15.000000000 +0100 @@ -383,6 +383,7 @@ DIST_SUBDIRS = $(MAINDIRS) java SUBDIRS = $(MAINDIRS) $(JAVADIR) EXTRA_DIST = GUIDELINES +DISTCHECK_CONFIGURE_FLAGS = --without-lhapdf --with-gsl=$(GSLPATH) ACLOCAL_AMFLAGS = -I m4 DISTCLEANFILES = config.thepeg all: all-recursive diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ThePEG-2.1.1/NEWS new/ThePEG-2.1.2/NEWS --- old/ThePEG-2.1.1/NEWS 2017-07-14 12:06:30.000000000 +0200 +++ new/ThePEG-2.1.2/NEWS 2017-11-01 11:56:49.000000000 +0100 @@ -10,6 +10,18 @@ +* ThePEG-2.1.2 release: 2017-11-01 + +** Allow LHAPDF6 interface to return photon pdf. + +** Sign fix in GeneralVVSVertex + +** Fix multiple weight reading from LHE files + +** Preparations for Rivet 3 + + + * ThePEG-2.1.1 release: 2017-07-14 ** Added missing evaluate() option to GeneralVVSVertex diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ThePEG-2.1.1/PDF/LHAPDF6.cc new/ThePEG-2.1.2/PDF/LHAPDF6.cc --- old/ThePEG-2.1.1/PDF/LHAPDF6.cc 2017-05-03 16:27:14.000000000 +0200 +++ new/ThePEG-2.1.2/PDF/LHAPDF6.cc 2017-11-01 11:56:49.000000000 +0100 @@ -226,7 +226,7 @@ case g: return thePDF->xfxQ2(g,x,Q2); case ParticleID::gamma: - return 0.; + return thePDF->xfxQ2(ParticleID::gamma,x,Q2); } return 0.0; } @@ -383,7 +383,7 @@ case g: return thePDF->xfxQ2(g,x,Q2); case ParticleID::gamma: - return 0.; + return thePDF->xfxQ2(ParticleID::gamma,x,Q2); } return 0.0; } @@ -415,7 +415,7 @@ static Deleted<LHAPDF> interfacePType ("PType", - "The LHAPDFv6 interface currently does not support pi or gamma."); + "The LHAPDFv6 interface currently does not support pi."); static Parameter<LHAPDF,string> interfacePDFName ("PDFName", @@ -443,11 +443,11 @@ static Deleted<LHAPDF> interfaceEnablePartonicGamma ("EnablePartonicGamma", - "The LHAPDFv6 interface currently does not support pi or gamma."); + "Not required in LHAPDFv6."); static Deleted<LHAPDF> interfacePhotonOption ("PhotonOption", - "The LHAPDFv6 interface currently does not support pi or gamma."); + "Not required in LHAPDFv6."); static Deleted<LHAPDF> interfaceMaxNSet ("MaxNSet", diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ThePEG-2.1.1/PDF/Makefile.am new/ThePEG-2.1.2/PDF/Makefile.am --- old/ThePEG-2.1.1/PDF/Makefile.am 2015-12-02 12:53:54.000000000 +0100 +++ new/ThePEG-2.1.2/PDF/Makefile.am 2017-11-01 11:56:49.000000000 +0100 @@ -26,7 +26,7 @@ pkglib_LTLIBRARIES += ThePEGLHAPDF.la LHAPDF_SOURCES = LHAPDF6.cc LHAPDF6.h -ThePEGLHAPDF_la_LDFLAGS = $(AM_LDFLAGS) -module $(LHAPDF_LDFLAGS) $(LIBTOOLVERSIONINFO) +ThePEGLHAPDF_la_LDFLAGS = $(AM_LDFLAGS) $(LHAPDF_LDFLAGS) -module -version-info 25:1:0 ThePEGLHAPDF_la_LIBADD = $(LHAPDF_LIBS) ThePEGLHAPDF_la_SOURCES = $(LHAPDF_SOURCES) ThePEGLHAPDF_la_CPPFLAGS = $(AM_CPPFLAGS) $(LHAPDF_CPPFLAGS) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ThePEG-2.1.1/PDF/Makefile.in new/ThePEG-2.1.2/PDF/Makefile.in --- old/ThePEG-2.1.1/PDF/Makefile.in 2017-07-14 11:31:35.000000000 +0200 +++ new/ThePEG-2.1.2/PDF/Makefile.in 2017-11-01 11:57:10.000000000 +0100 @@ -490,7 +490,7 @@ GRVBase.la GRV94L.la GRV94M.la WeizsackerWilliamsPDF.la \ BudnevPDF.la $(am__append_1) @USELHAPDF_TRUE@LHAPDF_SOURCES = LHAPDF6.cc LHAPDF6.h -@USELHAPDF_TRUE@ThePEGLHAPDF_la_LDFLAGS = $(AM_LDFLAGS) -module $(LHAPDF_LDFLAGS) $(LIBTOOLVERSIONINFO) +@USELHAPDF_TRUE@ThePEGLHAPDF_la_LDFLAGS = $(AM_LDFLAGS) $(LHAPDF_LDFLAGS) -module -version-info 25:1:0 @USELHAPDF_TRUE@ThePEGLHAPDF_la_LIBADD = $(LHAPDF_LIBS) @USELHAPDF_TRUE@ThePEGLHAPDF_la_SOURCES = $(LHAPDF_SOURCES) @USELHAPDF_TRUE@ThePEGLHAPDF_la_CPPFLAGS = $(AM_CPPFLAGS) $(LHAPDF_CPPFLAGS) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ThePEG-2.1.1/configure new/ThePEG-2.1.2/configure --- old/ThePEG-2.1.1/configure 2017-07-14 11:31:27.000000000 +0200 +++ new/ThePEG-2.1.2/configure 2017-11-01 11:57:08.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for ThePEG 2.1.1. +# Generated by GNU Autoconf 2.69 for ThePEG 2.1.2. # # Report bugs to <http://www.thep.lu.se/ThePEG/>. # @@ -590,8 +590,8 @@ # Identity of this package. PACKAGE_NAME='ThePEG' PACKAGE_TARNAME='ThePEG' -PACKAGE_VERSION='2.1.1' -PACKAGE_STRING='ThePEG 2.1.1' +PACKAGE_VERSION='2.1.2' +PACKAGE_STRING='ThePEG 2.1.2' PACKAGE_BUGREPORT='http://www.thep.lu.se/ThePEG/' PACKAGE_URL='' @@ -1396,7 +1396,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures ThePEG 2.1.1 to adapt to many kinds of systems. +\`configure' configures ThePEG 2.1.2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1466,7 +1466,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of ThePEG 2.1.1:";; + short | recursive ) echo "Configuration of ThePEG 2.1.2:";; esac cat <<\_ACEOF @@ -1608,7 +1608,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -ThePEG configure 2.1.1 +ThePEG configure 2.1.2 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2220,7 +2220,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by ThePEG $as_me 2.1.1, which was +It was created by ThePEG $as_me 2.1.2, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3181,7 +3181,7 @@ # Define the identity of the package. PACKAGE='ThePEG' - VERSION='2.1.1' + VERSION='2.1.2' cat >>confdefs.h <<_ACEOF @@ -17814,9 +17814,11 @@ rivetversion=1 if test "x$with_rivet" = "xsystem"; then - echo $( rivet-config --version ) | grep -q '^1\.' || rivetversion=2 + echo $( rivet-config --version ) | grep -q '^2\.' && rivetversion=2 + echo $( rivet-config --version ) | grep -q '^3\.' && rivetversion=3 elif test "x$with_rivet" != "xno"; then - echo $( "$with_rivet/bin/rivet-config" --version ) | grep -q '^1\.' || rivetversion=2 + echo $( "$with_rivet/bin/rivet-config" --version ) | grep -q '^2\.' && rivetversion=2 + echo $( "$with_rivet/bin/rivet-config" --version ) | grep -q '^3\.' && rivetversion=3 fi @@ -20159,7 +20161,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by ThePEG $as_me 2.1.1, which was +This file was extended by ThePEG $as_me 2.1.2, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -20225,7 +20227,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -ThePEG config.status 2.1.1 +ThePEG config.status 2.1.2 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ThePEG-2.1.1/configure.ac new/ThePEG-2.1.2/configure.ac --- old/ThePEG-2.1.1/configure.ac 2017-07-14 11:31:16.000000000 +0200 +++ new/ThePEG-2.1.2/configure.ac 2017-11-01 11:56:49.000000000 +0100 @@ -1,7 +1,7 @@ dnl Process this file with autoconf to produce a configure script. AC_PREREQ([2.59]) -AC_INIT([ThePEG],[2.1.1],[http://www.thep.lu.se/ThePEG/],[ThePEG]) +AC_INIT([ThePEG],[2.1.2],[http://www.thep.lu.se/ThePEG/],[ThePEG]) AC_CONFIG_AUX_DIR([Config]) AC_CONFIG_MACRO_DIR([m4]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ThePEG-2.1.1/lib/Makefile.am new/ThePEG-2.1.2/lib/Makefile.am --- old/ThePEG-2.1.1/lib/Makefile.am 2017-07-14 11:28:22.000000000 +0200 +++ new/ThePEG-2.1.2/lib/Makefile.am 2017-11-01 11:56:49.000000000 +0100 @@ -16,7 +16,7 @@ # Version info should be updated if any interface or persistent I/O # function is changed -libThePEG_la_LDFLAGS = $(AM_LDFLAGS) -version-info 26:0:1 -export-dynamic +libThePEG_la_LDFLAGS = $(AM_LDFLAGS) -version-info 26:1:1 -export-dynamic libThePEG_la_SOURCES = libThePEG_la_LIBADD = \ $(top_builddir)/Utilities/libThePEGUtilities.la \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ThePEG-2.1.1/lib/Makefile.in new/ThePEG-2.1.2/lib/Makefile.in --- old/ThePEG-2.1.1/lib/Makefile.in 2017-07-14 11:31:35.000000000 +0200 +++ new/ThePEG-2.1.2/lib/Makefile.in 2017-11-01 11:57:10.000000000 +0100 @@ -383,7 +383,7 @@ # Version info should be updated if any interface or persistent I/O # function is changed -libThePEG_la_LDFLAGS = $(AM_LDFLAGS) -version-info 26:0:1 -export-dynamic +libThePEG_la_LDFLAGS = $(AM_LDFLAGS) -version-info 26:1:1 -export-dynamic libThePEG_la_SOURCES = libThePEG_la_LIBADD = \ $(top_builddir)/Utilities/libThePEGUtilities.la \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ThePEG-2.1.1/m4/rivet.m4 new/ThePEG-2.1.2/m4/rivet.m4 --- old/ThePEG-2.1.1/m4/rivet.m4 2013-10-16 10:50:05.000000000 +0200 +++ new/ThePEG-2.1.2/m4/rivet.m4 2017-11-01 11:56:49.000000000 +0100 @@ -65,12 +65,14 @@ rivetversion=1 if test "x$with_rivet" = "xsystem"; then - echo $( rivet-config --version ) | grep -q '^1\.' || rivetversion=2 + echo $( rivet-config --version ) | grep -q '^2\.' && rivetversion=2 + echo $( rivet-config --version ) | grep -q '^3\.' && rivetversion=3 elif test "x$with_rivet" != "xno"; then - echo $( "$with_rivet/bin/rivet-config" --version ) | grep -q '^1\.' || rivetversion=2 + echo $( "$with_rivet/bin/rivet-config" --version ) | grep -q '^2\.' && rivetversion=2 + echo $( "$with_rivet/bin/rivet-config" --version ) | grep -q '^3\.' && rivetversion=3 fi -AC_DEFINE_UNQUOTED([ThePEG_RIVET_VERSION], [$rivetversion], [Rivet histogram variant (1=AIDA or 2=YODA)]) +AC_DEFINE_UNQUOTED([ThePEG_RIVET_VERSION], [$rivetversion], [Rivet major version (1,2,3)]) AM_CONDITIONAL(HAVE_RIVET,[test "x$with_rivet" != "xno"]) AC_SUBST(RIVETINCLUDE)
