[fastjet] 01/02: Imported Debian patch 3.0.6+dfsg-1
Mattia Rizzolo
mattia at debian.org
Mon Jun 13 19:06:24 UTC 2016
This is an automated email from the git hooks/post-receive script.
mattia pushed a commit to branch master
in repository fastjet.
commit 884086d468c69bb8b1cd05ded3fa931a886ad686
Merge: a0b8415 a723fd3
Author: Lifeng Sun <lifongsun at gmail.com>
Date: Sun Dec 15 18:42:11 2013 +0800
Imported Debian patch 3.0.6+dfsg-1
ChangeLog | 296 +-
Doxyfile | 2 +-
Makefile.in | 7 +-
NEWS | 25 +
aclocal.m4 | 16 +-
config.h.in | 3 -
configure | 14680 ++++++++++---------
configure.ac | 15 +-
debian/changelog | 10 +
debian/control | 7 +-
.../patches/libfastjetplugins-links-gfortran.patch | 11 +
debian/patches/purge-plugins.patch | 6 +-
debian/patches/series | 1 +
doc/Makefile.in | 5 +-
doc/fastjet-doc.tex | 9 +-
doc/figs/Makefile.in | 5 +-
example/11-filter.cc | 4 +-
example/Makefile.in | 5 +-
example/data/Makefile.am | 1 +
example/data/Makefile.in | 6 +-
example/data/boosted_top_event.dat | 184 +
example/fastjet_timing_plugins.cc | 22 +-
example/root/Makefile.in | 5 +-
fortran_wrapper/Makefile.in | 5 +-
include/Makefile.in | 5 +-
include/fastjet/ClusterSequence.hh | 6 +-
include/fastjet/ClusterSequenceStructure.hh | 6 +-
include/fastjet/CompositeJetStructure.hh | 4 +-
include/fastjet/Makefile.in | 5 +-
include/fastjet/NNH.hh | 8 +-
include/fastjet/PseudoJet.hh | 17 +-
include/fastjet/PseudoJetStructureBase.hh | 14 +-
include/fastjet/Selector.hh | 16 +-
include/fastjet/SharedPtr.hh | 14 +-
include/fastjet/config_win.h | 4 +-
include/fastjet/internal/ClusterSequence_N2.icc | 6 +-
include/fastjet/internal/IsBase.hh | 4 +-
include/fastjet/internal/Makefile.in | 5 +-
include/fastjet/internal/SearchTree.hh | 19 +-
ltmain.sh | 3984 ++---
m4/CGAL.m4 | 6 +-
m4/libtool.m4 | 2003 +--
m4/ltoptions.m4 | 13 +-
m4/ltversion.m4 | 12 +-
m4/lt~obsolete.m4 | 12 +-
plugins/CMSIterativeCone/Makefile.in | 5 +-
plugins/CMSIterativeCone/fastjet/Makefile.in | 5 +-
plugins/D0RunICone/Makefile.in | 5 +-
plugins/D0RunICone/fastjet/Makefile.in | 5 +-
plugins/D0RunIICone/ConeSplitMerge.hpp | 2 +-
plugins/D0RunIICone/Makefile.in | 5 +-
plugins/D0RunIICone/fastjet/Makefile.in | 5 +-
plugins/EECambridge/Makefile.in | 5 +-
plugins/EECambridge/fastjet/Makefile.in | 5 +-
plugins/GridJet/Makefile.in | 5 +-
plugins/GridJet/fastjet/GridJetPlugin.hh | 9 +
plugins/GridJet/fastjet/Makefile.in | 5 +-
plugins/Jade/Makefile.in | 5 +-
plugins/Jade/fastjet/Makefile.in | 5 +-
plugins/Makefile.in | 5 +-
plugins/NestedDefs/Makefile.in | 5 +-
plugins/NestedDefs/fastjet/Makefile.in | 5 +-
plugins/PxCone/Makefile.in | 5 +-
plugins/PxCone/fastjet/Makefile.in | 5 +-
plugins/SISCone/Makefile.in | 5 +-
plugins/SISCone/fastjet/Makefile.in | 5 +-
plugins/SISCone/siscone/AUTHORS | 3 +-
plugins/SISCone/siscone/ChangeLog | 48 +
plugins/SISCone/siscone/Doxyfile | 2 +-
plugins/SISCone/siscone/Makefile.in | 7 +-
plugins/SISCone/siscone/NEWS | 8 +-
plugins/SISCone/siscone/aclocal.m4 | 2056 +--
plugins/SISCone/siscone/configure | 9975 +++++++------
plugins/SISCone/siscone/configure.ac | 6 +-
plugins/SISCone/siscone/examples/Makefile.in | 5 +-
.../SISCone/siscone/examples/events/Makefile.in | 5 +-
plugins/SISCone/siscone/ltmain.sh | 3984 ++---
plugins/SISCone/siscone/siscone/Makefile.am | 2 +-
plugins/SISCone/siscone/siscone/Makefile.in | 57 +-
plugins/SISCone/siscone/siscone/siscone.cpp | 6 +-
.../SISCone/siscone/siscone/spherical/Makefile.am | 2 +-
.../SISCone/siscone/siscone/spherical/Makefile.in | 54 +-
.../SISCone/siscone/siscone/spherical/siscone.cpp | 6 +-
plugins/TrackJet/Makefile.in | 5 +-
plugins/TrackJet/fastjet/Makefile.in | 5 +-
src/ClosestPair2D.cc | 4 +-
src/ClusterSequence.cc | 8 +-
src/ClusterSequenceStructure.cc | 8 +-
src/ClusterSequence_Delaunay.cc | 3 +-
src/ClusterSequence_TiledN2.cc | 7 +-
src/CompositeJetStructure.cc | 10 +-
src/Makefile.in | 5 +-
src/PseudoJet.cc | 15 +-
src/PseudoJetStructureBase.cc | 8 +-
src/Selector.cc | 9 +-
tools/JHTopTagger.cc | 4 +-
tools/Makefile.in | 5 +-
tools/MassDropTagger.cc | 4 +-
tools/fastjet/Makefile.in | 5 +-
tools/fastjet/tools/Makefile.in | 5 +-
100 files changed, 18611 insertions(+), 19324 deletions(-)
diff --cc debian/changelog
index 91d1e7a,0000000..1de8b6f
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,31 -1,0 +1,41 @@@
++fastjet (3.0.6+dfsg-1) unstable; urgency=medium
++
++ * New upstream release.
++ * Bump Standards-Version to 3.9.4.
++ * Remove obsolte DM-Upload-Allowed field.
++ * Canonical VCS-* fields.
++ * libfastjetplugins links against gfortran. (Closes: #728156)
++
++ -- Lifeng Sun <lifongsun at gmail.com> Sun, 15 Dec 2013 18:42:11 +0800
++
+fastjet (3.0.3+dfsg-1) unstable; urgency=low
+
+ * Upload to sid.
+
+ -- Lifeng Sun <lifongsun at gmail.com> Mon, 06 May 2013 12:08:50 +0800
+
+fastjet (3.0.3+dfsg-1~exp1) experimental; urgency=low
+
+ * New upstream release.
+ * Remove patch missed-this-pointer.patch: applied by upstream.
+ * debian/control: move doxygen-latex and graphviz from Build-Depends to
+ Build-Depends-Indep.
+ * libfastjetplugins: links against siscone libraries.
+ * Update dependencies of binary packages.
+ * debian/get-orig-source: support uscan --destdir option. (Closes: #676983)
+ * debian/rules: change to tiny-style.
+
+ -- Lifeng Sun <lifongsun at gmail.com> Tue, 03 Jul 2012 07:37:02 +0800
+
+fastjet (3.0.2+dfsg-2) unstable; urgency=low
+
+ * Fix dependencies of libfastjet-fortran-dev.
+ * Disable rpath flag in fastjet-config by default.
+
+ -- Lifeng Sun <lifongsun at gmail.com> Mon, 04 Jun 2012 08:33:14 +0800
+
+fastjet (3.0.2+dfsg-1) unstable; urgency=low
+
+ * Initial release (Closes: #636979)
+
+ -- Lifeng Sun <lifongsun at gmail.com> Wed, 23 May 2012 19:11:32 +0800
diff --cc debian/control
index 6dc9a73,0000000..fca672c
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,217 -1,0 +1,216 @@@
+Source: fastjet
+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 (>= 7.0.50~), autotools-dev, dh-autoreconf, libsiscone-spherical-dev, gfortran
+Build-Depends-Indep: doxygen-latex, graphviz
- Standards-Version: 3.9.3
++Standards-Version: 3.9.4
+Homepage: http://fastjet.fr/
- Vcs-Git: git://git.debian.org/git/debian-science/packages/fastjet.git
- Vcs-Browser: http://git.debian.org/?p=debian-science/packages/fastjet.git
++Vcs-Git: git://anonscm.debian.org/debian-science/packages/fastjet.git
++Vcs-Browser: http://anonscm.debian.org/gitweb/?p=debian-science/packages/fastjet.git
+
+Package: libfastjet0
+Section: libs
+Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Suggests: libfastjet-dev, libfastjettools0, libfastjet-fortran0, libfastjetplugins0
+Description: Fast C++ code for the kt and other jet algorithms
+ The FastJet package provides a fast implementation of several longitudinally
+ invariant sequential recombination jet algorithms, in particular the
+ longitudinally invariant kt jet algorithm, the inclusive longitudinally
+ invariant version of the Cambridge/Aachen jet-algorithm, and the inclusive
+ anti-kt algorithm.
+ .
+ FastJet also provides a uniform interface to external jet finders via a plugin
+ mechanism, and tools for calculating jet areas and performing background
+ (pileup/UE) subtraction.
+ .
+ This package provides run-time library of FastJet.
+
+Package: libfastjet-dev
+Section: libdevel
+Architecture: any
+Depends: libfastjet0 (= ${binary:Version}), ${misc:Depends}
+Suggests: fastjet-examples, libfastjettools-dev, libfastjet-fortran-dev, libfastjetplugins-dev, fastjet-doc
+Description: Development files of FastJet
+ The FastJet package provides a fast implementation of several longitudinally
+ invariant sequential recombination jet algorithms, in particular the
+ longitudinally invariant kt jet algorithm, the inclusive longitudinally
+ invariant version of the Cambridge/Aachen jet-algorithm, and the inclusive
+ anti-kt algorithm.
+ .
+ FastJet also provides a uniform interface to external jet finders via a plugin
+ mechanism, and tools for calculating jet areas and performing background
+ (pileup/UE) subtraction.
+ .
+ This package provides development files of FastJet.
+
+Package: libfastjettools0
+Section: libs
+Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
+Depends: libfastjet0 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Suggests: libfastjettools-dev
+Description: Tools for FastJet
+ The FastJet package provides a fast implementation of several longitudinally
+ invariant sequential recombination jet algorithms, in particular the
+ longitudinally invariant kt jet algorithm, the inclusive longitudinally
+ invariant version of the Cambridge/Aachen jet-algorithm, and the inclusive
+ anti-kt algorithm.
+ .
+ FastJet also provides a uniform interface to external jet finders via a plugin
+ mechanism, and tools for calculating jet areas and performing background
+ (pileup/UE) subtraction.
+ .
+ This package provides various tools related to jet areas and subtraction. They
+ can be used with any infrared safe jet algorithm, both native and plugin.
+
+Package: libfastjettools-dev
+Section: libdevel
+Architecture: any
+Depends: libfastjet-dev (= ${binary:Version}), libfastjettools0 (= ${binary:Version}), ${misc:Depends}
+Description: Tools for FastJet - development files
+ The FastJet package provides a fast implementation of several longitudinally
+ invariant sequential recombination jet algorithms, in particular the
+ longitudinally invariant kt jet algorithm, the inclusive longitudinally
+ invariant version of the Cambridge/Aachen jet-algorithm, and the inclusive
+ anti-kt algorithm.
+ .
+ FastJet also provides a uniform interface to external jet finders via a plugin
+ mechanism, and tools for calculating jet areas and performing background
+ (pileup/UE) subtraction.
+ .
+ This package provides development files of FastJet Tools.
+
+Package: libfastjet-fortran0
+Section: libs
+Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
+Depends: libfastjet0 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Suggests: libfastjet-fortran-dev
+Description: Fortran bindings of FastJet
+ The FastJet package provides a fast implementation of several longitudinally
+ invariant sequential recombination jet algorithms, in particular the
+ longitudinally invariant kt jet algorithm, the inclusive longitudinally
+ invariant version of the Cambridge/Aachen jet-algorithm, and the inclusive
+ anti-kt algorithm.
+ .
+ FastJet also provides a uniform interface to external jet finders via a plugin
+ mechanism, and tools for calculating jet areas and performing background
+ (pileup/UE) subtraction.
+ .
+ This package provides Fortran bindings of FastJet.
+
+Package: libfastjet-fortran-dev
+Section: libdevel
+Architecture: any
+Depends: gfortran, libfastjet-fortran0 (= ${binary:Version}), ${misc:Depends}
+Description: Fortran bindings of FastJet - development files
+ The FastJet package provides a fast implementation of several longitudinally
+ invariant sequential recombination jet algorithms, in particular the
+ longitudinally invariant kt jet algorithm, the inclusive longitudinally
+ invariant version of the Cambridge/Aachen jet-algorithm, and the inclusive
+ anti-kt algorithm.
+ .
+ FastJet also provides a uniform interface to external jet finders via a plugin
+ mechanism, and tools for calculating jet areas and performing background
+ (pileup/UE) subtraction.
+ .
+ This package provides development files for Fortran bindings of FastJet.
+
+Package: libfastjetplugins0
+Section: libs
+Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
+Depends: libfastjet0 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Suggests: libfastjetplugins-dev
+Description: FastJet plugins
+ The FastJet package provides a fast implementation of several longitudinally
+ invariant sequential recombination jet algorithms, in particular the
+ longitudinally invariant kt jet algorithm, the inclusive longitudinally
+ invariant version of the Cambridge/Aachen jet-algorithm, and the inclusive
+ anti-kt algorithm.
+ .
+ FastJet also provides a uniform interface to external jet finders via a plugin
+ mechanism, and tools for calculating jet areas and performing background
+ (pileup/UE) subtraction.
+ .
+ This package provides plugins of FastJet. Note that ATLASCone and CDFCones
+ plugins are removed due to license issue.
+
+Package: libfastjetplugins-dev
+Section: libdevel
+Architecture: any
+Depends: libfastjet-dev (= ${binary:Version}), libsiscone-spherical-dev, libsiscone-dev, libfastjetplugins0 (= ${binary:Version}), ${misc:Depends}
+Suggests: fastjet-doc, libfastjettools-dev
+Description: FastJet plugins - development files
+ The FastJet package provides a fast implementation of several longitudinally
+ invariant sequential recombination jet algorithms, in particular the
+ longitudinally invariant kt jet algorithm, the inclusive longitudinally
+ invariant version of the Cambridge/Aachen jet-algorithm, and the inclusive
+ anti-kt algorithm.
+ .
+ FastJet also provides a uniform interface to external jet finders via a plugin
+ mechanism, and tools for calculating jet areas and performing background
+ (pileup/UE) subtraction.
+ .
+ This package provides development files for plugins of FastJet. Note that
+ ATLASCone and CDFCones plugins are removed due to license issue.
+
+Package: fastjet-doc
+Section: doc
+Architecture: all
+Depends: libjs-jquery, ${misc:Depends}
+Description: Documentation of FastJet
+ The FastJet package provides a fast implementation of several longitudinally
+ invariant sequential recombination jet algorithms, in particular the
+ longitudinally invariant kt jet algorithm, the inclusive longitudinally
+ invariant version of the Cambridge/Aachen jet-algorithm, and the inclusive
+ anti-kt algorithm.
+ .
+ FastJet also provides a uniform interface to external jet finders via a plugin
+ mechanism, and tools for calculating jet areas and performing background
+ (pileup/UE) subtraction.
+ .
+ This package provides documentation of FastJet.
+
+Package: fastjet-examples
+Section: devel
+Architecture: all
+Depends: libfastjetplugins-dev (>= ${source:Version}), libfastjettools-dev (>= ${source:Version}), libfastjet-dev (>= ${source:Version}), ${misc:Depends}
+Description: Example source files of FastJet
+ The FastJet package provides a fast implementation of several longitudinally
+ invariant sequential recombination jet algorithms, in particular the
+ longitudinally invariant kt jet algorithm, the inclusive longitudinally
+ invariant version of the Cambridge/Aachen jet-algorithm, and the inclusive
+ anti-kt algorithm.
+ .
+ FastJet also provides a uniform interface to external jet finders via a plugin
+ mechanism, and tools for calculating jet areas and performing background
+ (pileup/UE) subtraction.
+ .
+ This package provides example source files of FastJet.
+
+Package: root-macro-fastjet
+Section: devel
+Architecture: all
+Depends: root-system, libfastjet0 (>= ${source:Version}), ${misc:Depends}
+Description: FastJet macro for CERN ROOT
+ The FastJet package provides a fast implementation of several longitudinally
+ invariant sequential recombination jet algorithms, in particular the
+ longitudinally invariant kt jet algorithm, the inclusive longitudinally
+ invariant version of the Cambridge/Aachen jet-algorithm, and the inclusive
+ anti-kt algorithm.
+ .
+ FastJet also provides a uniform interface to external jet finders via a plugin
+ mechanism, and tools for calculating jet areas and performing background
+ (pileup/UE) subtraction.
+ .
+ This package provides FastJet macro for CERN ROOT.
+
diff --cc debian/patches/libfastjetplugins-links-gfortran.patch
index 0000000,0000000..2037f6b
new file mode 100644
--- /dev/null
+++ b/debian/patches/libfastjetplugins-links-gfortran.patch
@@@ -1,0 -1,0 +1,11 @@@
++--- a/plugins/Makefile.am
+++++ b/plugins/Makefile.am
++@@ -38,7 +38,7 @@
++ lib_LTLIBRARIES = libfastjetplugins.la
++ libfastjetplugins_la_SOURCES=
++ nodist_EXTRA_libfastjetplugins_la_SOURCES = dummy.cc
++-libfastjetplugins_la_LIBADD = -lsiscone_spherical -lsiscone
+++libfastjetplugins_la_LIBADD = -lsiscone_spherical -lsiscone -lgfortran
++ if BUILD_PLUGIN_SISCONE
++ libfastjetplugins_la_LIBADD += SISCone/libSISConePlugin.la
++ endif
diff --cc debian/patches/purge-plugins.patch
index e77432b,0000000..fb9e0f8
mode 100644,000000..100644
--- a/debian/patches/purge-plugins.patch
+++ b/debian/patches/purge-plugins.patch
@@@ -1,136 -1,0 +1,136 @@@
+--- a/plugins/Makefile.am
++++ b/plugins/Makefile.am
+@@ -3,9 +3,6 @@
+ if BUILD_PLUGIN_SISCONE
+ SUBDIRS += SISCone
+ endif
+-if BUILD_PLUGIN_CDFCONES
+-SUBDIRS += CDFCones
+-endif
+ if BUILD_PLUGIN_PXCONE
+ SUBDIRS += PxCone
+ endif
+@@ -18,9 +15,6 @@
+ if BUILD_PLUGIN_TRACKJET
+ SUBDIRS += TrackJet
+ endif
+-if BUILD_PLUGIN_ATLASCONE
+-SUBDIRS += ATLASCone
+-endif
+ if BUILD_PLUGIN_EECAMBRIDGE
+ SUBDIRS += EECambridge
+ endif
+@@ -48,9 +42,6 @@
+ if BUILD_PLUGIN_SISCONE
+ libfastjetplugins_la_LIBADD += SISCone/libSISConePlugin.la
+ endif
+-if BUILD_PLUGIN_CDFCONES
+-libfastjetplugins_la_LIBADD += CDFCones/libCDFConesPlugin.la
+-endif
+ if BUILD_PLUGIN_PXCONE
+ libfastjetplugins_la_LIBADD += PxCone/libPxConePlugin.la
+ endif
+@@ -63,9 +54,6 @@
+ if BUILD_PLUGIN_TRACKJET
+ libfastjetplugins_la_LIBADD += TrackJet/libTrackJetPlugin.la
+ endif
+-if BUILD_PLUGIN_ATLASCONE
+-libfastjetplugins_la_LIBADD += ATLASCone/libATLASConePlugin.la
+-endif
+ if BUILD_PLUGIN_EECAMBRIDGE
+ libfastjetplugins_la_LIBADD += EECambridge/libEECambridgePlugin.la
+ endif
+@@ -84,6 +72,6 @@
+ # end monolithic plugin section -- do not modify this line
+ endif
+
+-DIST_SUBDIRS = GridJet D0RunICone CMSIterativeCone Jade EECambridge ATLASCone TrackJet SISCone CDFCones PxCone D0RunIICone NestedDefs
++DIST_SUBDIRS = GridJet D0RunICone CMSIterativeCone Jade EECambridge TrackJet SISCone PxCone D0RunIICone NestedDefs
+
+ EXTRA_DIST = makefile.static
+--- a/plugins/SISCone/Makefile.am
++++ b/plugins/SISCone/Makefile.am
+@@ -1,4 +1,4 @@
+-SUBDIRS = siscone fastjet .
++SUBDIRS = fastjet .
+
+ if MONOLITHIC_PLUGINS
+ noinst_LTLIBRARIES = libSISConePlugin.la
+--- a/configure.ac
++++ b/configure.ac
- @@ -252,9 +252,7 @@
++@@ -261,9 +261,7 @@
+ fi
+
+ dnl SISCone
+-ACX_CHECK_PLUGIN(SISCone, siscone, SISCONE, yes,
+- [CONFIG_LIBS_PLUGINS=${CONFIG_LIBS_PLUGINS}" -lsiscone_spherical -lsiscone"
+- CONFIG_LIBS_PLUGINS_STATIC=${CONFIG_LIBS_PLUGINS_STATIC}" \${installationdir}/lib/libsiscone.a \${installationdir}/lib/libsiscone_spherical.a"])
++ACX_CHECK_PLUGIN(SISCone, siscone, SISCONE, yes)
+ AC_CONFIG_SUBDIRS(plugins/SISCone/siscone)
+ dnl alternatively, to build SISCone directly from the FastJet build
+ dnl system, comment out the previoous lines and uncomment the ones
- @@ -263,10 +261,6 @@
++@@ -272,10 +270,6 @@
+ dnl AM_CONFIG_HEADER(config.siscone.in.h:plugins/SISCone/siscone/siscone/config.h.in)
+ dnl AC_CONFIG_FILES(plugins/SISCone/siscone/Makefile plugins/SISCone/siscone/siscone/Makefile plugins/SISCone/siscone/siscone/spherical/Makefile plugins/SISCone/siscone/examples/Makefile plugins/SISCone/siscone/examples/events/Makefile)
+
+-dnl CDFCones
+-ACX_CHECK_PLUGIN(CDFCones, cdfcones, CDFCONES, yes)
+-AC_CONFIG_FILES(plugins/CDFCones/CDFcode/Makefile)
+-
+ dnl PxCone
+ ACX_CHECK_PLUGIN(PxCone, pxcone, PXCONE, no)
+
- @@ -279,9 +273,6 @@
++@@ -288,9 +282,6 @@
+ dnl TrackJet
+ ACX_CHECK_PLUGIN(TrackJet, trackjet, TRACKJET, no)
+
+-dnl ATLASCone
+-ACX_CHECK_PLUGIN(ATLASCone, atlascone, ATLASCONE, no)
+-
+ dnl CMSIterativeCone
+ ACX_CHECK_PLUGIN(CMSIterativeCone, cmsiterativecone, CMSITERATIVECONE, no)
+
+--- a/example/Makefile.am
++++ b/example/Makefile.am
+@@ -43,7 +43,7 @@
+ 03_plugin_CXXFLAGS = $(AM_CXXFLAGS) $(CGAL_CPPFLAGS) -I$(srcdir)/../include
+ 03_plugin_LDADD = ../src/libfastjet.la $(CGAL_LIBS)
+ 03_plugin_CXXFLAGS += -I$(srcdir)/../plugins/SISCone -I$(srcdir)/../plugins/SISCone/siscone
+-03_plugin_LDADD += ../plugins/SISCone/libSISConePlugin.la ../plugins/SISCone/siscone/siscone/libsiscone.la ../plugins/SISCone/siscone/siscone/spherical/libsiscone_spherical.la
++03_plugin_LDADD += ../plugins/SISCone/libSISConePlugin.la -lsiscone_spherical -lsiscone
+ else
+ EXTRA_DIST += 03-plugin.cc
+ endif
+@@ -125,7 +125,7 @@
+ fastjet_areas_LDADD = ../src/libfastjet.la $(CGAL_LIBS)
+ if BUILD_PLUGIN_SISCONE
+ fastjet_areas_CXXFLAGS += -I$(srcdir)/../plugins/SISCone -I$(srcdir)/../plugins/SISCone/siscone
+-fastjet_areas_LDADD += ../plugins/SISCone/libSISConePlugin.la ../plugins/SISCone/siscone/siscone/libsiscone.la ../plugins/SISCone/siscone/siscone/spherical/libsiscone_spherical.la
++fastjet_areas_LDADD += ../plugins/SISCone/libSISConePlugin.la -lsiscone_spherical -lsiscone
+ endif
+
+ fastjet_timing_plugins_SOURCES = fastjet_timing_plugins.cc CmdLine.cc
+@@ -135,11 +135,7 @@
+ fastjet_timing_plugins_LDADD += ../tools/libfastjettools.la
+ if BUILD_PLUGIN_SISCONE
+ fastjet_timing_plugins_CXXFLAGS += -I$(srcdir)/../plugins/SISCone -I$(srcdir)/../plugins/SISCone/siscone
+-fastjet_timing_plugins_LDADD += ../plugins/SISCone/libSISConePlugin.la ../plugins/SISCone/siscone/siscone/libsiscone.la ../plugins/SISCone/siscone/siscone/spherical/libsiscone_spherical.la
+-endif
+-if BUILD_PLUGIN_CDFCONES
+-fastjet_timing_plugins_CXXFLAGS += -I$(srcdir)/../plugins/CDFCones
+-fastjet_timing_plugins_LDADD += ../plugins/CDFCones/libCDFConesPlugin.la ../plugins/CDFCones/CDFcode/libCDFcode.la
++fastjet_timing_plugins_LDADD += ../plugins/SISCone/libSISConePlugin.la -lsiscone_spherical -lsiscone
+ endif
+ if BUILD_PLUGIN_PXCONE
+ fastjet_timing_plugins_CXXFLAGS += -I$(srcdir)/../plugins/PxCone
+@@ -153,10 +149,6 @@
+ fastjet_timing_plugins_CXXFLAGS += -I$(srcdir)/../plugins/TrackJet
+ fastjet_timing_plugins_LDADD += ../plugins/TrackJet/libTrackJetPlugin.la
+ endif
+-if BUILD_PLUGIN_ATLASCONE
+-fastjet_timing_plugins_CXXFLAGS += -I$(srcdir)/../plugins/ATLASCone
+-fastjet_timing_plugins_LDADD += ../plugins/ATLASCone/libATLASConePlugin.la
+-endif
+ if BUILD_PLUGIN_EECAMBRIDGE
+ fastjet_timing_plugins_CXXFLAGS += -I$(srcdir)/../plugins/EECambridge
+ fastjet_timing_plugins_LDADD += ../plugins/EECambridge/libEECambridgePlugin.la
diff --cc debian/patches/series
index 49ca724,0000000..5f7971f
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,4 -1,0 +1,5 @@@
+purge-plugins.patch
+fortran-wrap.patch
+disable-rpath-by-default.patch
+libfastjetplugins-links-siscone.patch
++libfastjetplugins-links-gfortran.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/fastjet.git
More information about the debian-science-commits
mailing list