[fastjet] 03/11: run wrap-and-sort -ast

Mattia Rizzolo mattia at debian.org
Mon Jun 13 19:44:04 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 fee2d21351daef3aade484e86170e74f48de0175
Author: Mattia Rizzolo <mattia at debian.org>
Date:   Mon Jun 13 19:14:05 2016 +0000

    run wrap-and-sort -ast
---
 debian/control                         | 116 +++++++++++++++++++++++++--------
 debian/fastjet-examples.examples       |   8 +--
 debian/libfastjet-dev.install          |  42 ++++++------
 debian/libfastjet-fortran-dev.examples |   2 +-
 debian/libfastjet-fortran-dev.install  |   2 +-
 debian/libfastjetplugins-dev.install   |   2 +-
 debian/libfastjettools-dev.install     |   2 +-
 7 files changed, 117 insertions(+), 57 deletions(-)

diff --git a/debian/control b/debian/control
index 4a2b0ff..512b5eb 100644
--- a/debian/control
+++ b/debian/control
@@ -2,9 +2,17 @@ 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>
-Build-Depends: debhelper (>= 7.0.50~), autotools-dev, dh-autoreconf, libsiscone-spherical-dev, gfortran
-Build-Depends-Indep: doxygen-latex, graphviz
+Uploaders:
+ Lifeng Sun <lifongsun at gmail.com>,
+Build-Depends:
+ autotools-dev,
+ debhelper (>= 7.0.50~),
+ dh-autoreconf,
+ gfortran,
+ libsiscone-spherical-dev,
+Build-Depends-Indep:
+ doxygen-latex,
+ graphviz,
 Standards-Version: 3.9.4
 Homepage: http://fastjet.fr/
 Vcs-Git: git://anonscm.debian.org/debian-science/packages/fastjet.git
@@ -14,11 +22,20 @@ Package: libfastjet0v5
 Section: libs
 Architecture: any
 Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends}
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Suggests: libfastjet-dev, libfastjettools0, libfastjet-fortran0, libfastjetplugins0
-Replaces: libfastjet0
-Conflicts: libfastjet0
+Pre-Depends:
+ ${misc:Pre-Depends},
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends},
+Suggests:
+ libfastjet-dev,
+ libfastjet-fortran0,
+ libfastjetplugins0,
+ libfastjettools0,
+Replaces:
+ libfastjet0,
+Conflicts:
+ libfastjet0,
 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
@@ -35,8 +52,15 @@ Description: Fast C++ code for the kt and other jet algorithms
 Package: libfastjet-dev
 Section: libdevel
 Architecture: any
-Depends: libfastjet0v5 (= ${binary:Version}), ${misc:Depends}
-Suggests: fastjet-examples, libfastjettools-dev, libfastjet-fortran-dev, libfastjetplugins-dev, fastjet-doc
+Depends:
+ libfastjet0v5 (= ${binary:Version}),
+ ${misc:Depends},
+Suggests:
+ fastjet-doc,
+ fastjet-examples,
+ libfastjet-fortran-dev,
+ libfastjetplugins-dev,
+ libfastjettools-dev,
 Description: Development files of FastJet
  The FastJet package provides a fast implementation of several longitudinally
  invariant sequential recombination jet algorithms, in particular the
@@ -54,9 +78,14 @@ Package: libfastjettools0
 Section: libs
 Architecture: any
 Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends}
-Depends: libfastjet0v5 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
-Suggests: libfastjettools-dev
+Pre-Depends:
+ ${misc:Pre-Depends},
+Depends:
+ libfastjet0v5 (= ${binary:Version}),
+ ${misc:Depends},
+ ${shlibs: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
@@ -74,7 +103,10 @@ Description: Tools for FastJet
 Package: libfastjettools-dev
 Section: libdevel
 Architecture: any
-Depends: libfastjet-dev (= ${binary:Version}), libfastjettools0 (= ${binary:Version}), ${misc:Depends}
+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
@@ -92,9 +124,14 @@ Package: libfastjet-fortran0
 Section: libs
 Architecture: any
 Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends}
-Depends: libfastjet0v5 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
-Suggests: libfastjet-fortran-dev
+Pre-Depends:
+ ${misc:Pre-Depends},
+Depends:
+ libfastjet0v5 (= ${binary:Version}),
+ ${misc:Depends},
+ ${shlibs: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
@@ -111,7 +148,10 @@ Description: Fortran bindings of FastJet
 Package: libfastjet-fortran-dev
 Section: libdevel
 Architecture: any
-Depends: gfortran, libfastjet-fortran0 (= ${binary:Version}), ${misc:Depends}
+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
@@ -129,9 +169,14 @@ Package: libfastjetplugins0
 Section: libs
 Architecture: any
 Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends}
-Depends: libfastjet0v5 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
-Suggests: libfastjetplugins-dev
+Pre-Depends:
+ ${misc:Pre-Depends},
+Depends:
+ libfastjet0v5 (= ${binary:Version}),
+ ${misc:Depends},
+ ${shlibs: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
@@ -149,8 +194,15 @@ Description: FastJet plugins
 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
+Depends:
+ libfastjet-dev (= ${binary:Version}),
+ libfastjetplugins0 (= ${binary:Version}),
+ libsiscone-dev,
+ libsiscone-spherical-dev,
+ ${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
@@ -162,13 +214,15 @@ Description: FastJet plugins - development files
  mechanism, and tools for calculating jet areas and performing background
  (pileup/UE) subtraction.
  .
- This package provides development files for plugins of FastJet. Note that 
+ 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}
+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
@@ -185,7 +239,11 @@ Description: 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}
+Depends:
+ libfastjet-dev (>= ${source:Version}),
+ libfastjetplugins-dev (>= ${source:Version}),
+ libfastjettools-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
@@ -202,7 +260,10 @@ Description: Example source files of FastJet
 Package: root-macro-fastjet
 Section: devel
 Architecture: all
-Depends: root-system, libfastjet0v5 (>= ${source:Version}), ${misc:Depends}
+Depends:
+ libfastjet0v5 (>= ${source:Version}),
+ root-system,
+ ${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
@@ -215,4 +276,3 @@ Description: FastJet macro for CERN ROOT
  (pileup/UE) subtraction.
  .
  This package provides FastJet macro for CERN ROOT.
-
diff --git a/debian/fastjet-examples.examples b/debian/fastjet-examples.examples
index f2a5181..3e5814d 100644
--- a/debian/fastjet-examples.examples
+++ b/debian/fastjet-examples.examples
@@ -1,7 +1,7 @@
-example/README
-example/data/*.dat
+debian/Makefile
 example/*-*.cc
+example/*.hh
 example/CmdLine.cc
+example/README
+example/data/*.dat
 example/fastjet*.cc
-example/*.hh
-debian/Makefile
diff --git a/debian/libfastjet-dev.install b/debian/libfastjet-dev.install
index 16f780b..64db51a 100644
--- a/debian/libfastjet-dev.install
+++ b/debian/libfastjet-dev.install
@@ -1,33 +1,33 @@
 usr/bin/fastjet-config
-usr/include/fastjet/internal/
-usr/include/fastjet/JetDefinition.hh
-usr/include/fastjet/PseudoJetStructureBase.hh
-usr/include/fastjet/ClusterSequenceStructure.hh
-usr/include/fastjet/PseudoJet.hh
-usr/include/fastjet/ClusterSequence.hh
-usr/include/fastjet/Error.hh
-usr/include/fastjet/RangeDefinition.hh
-usr/include/fastjet/CircularRange.hh
-usr/include/fastjet/version.hh
-usr/include/fastjet/AreaDefinition.hh
 usr/include/fastjet/ActiveAreaSpec.hh
-usr/include/fastjet/GhostedAreaSpec.hh
-usr/include/fastjet/ClusterSequenceAreaBase.hh
-usr/include/fastjet/ClusterSequenceArea.hh
-usr/include/fastjet/ClusterSequenceWithArea.hh
+usr/include/fastjet/AreaDefinition.hh
+usr/include/fastjet/CircularRange.hh
+usr/include/fastjet/ClusterSequence.hh
+usr/include/fastjet/ClusterSequence1GhostPassiveArea.hh
 usr/include/fastjet/ClusterSequenceActiveArea.hh
 usr/include/fastjet/ClusterSequenceActiveAreaExplicitGhosts.hh
-usr/include/fastjet/ClusterSequence1GhostPassiveArea.hh
+usr/include/fastjet/ClusterSequenceArea.hh
+usr/include/fastjet/ClusterSequenceAreaBase.hh
 usr/include/fastjet/ClusterSequencePassiveArea.hh
+usr/include/fastjet/ClusterSequenceStructure.hh
 usr/include/fastjet/ClusterSequenceVoronoiArea.hh
-usr/include/fastjet/NNH.hh
-usr/include/fastjet/SharedPtr.hh
+usr/include/fastjet/ClusterSequenceWithArea.hh
+usr/include/fastjet/CompositeJetStructure.hh
+usr/include/fastjet/Error.hh
 usr/include/fastjet/FunctionOfPseudoJet.hh
+usr/include/fastjet/GhostedAreaSpec.hh
+usr/include/fastjet/JetDefinition.hh
+usr/include/fastjet/LimitedWarning.hh
+usr/include/fastjet/NNH.hh
+usr/include/fastjet/PseudoJet.hh
+usr/include/fastjet/PseudoJetStructureBase.hh
+usr/include/fastjet/RangeDefinition.hh
 usr/include/fastjet/Selector.hh
-usr/include/fastjet/CompositeJetStructure.hh
+usr/include/fastjet/SharedPtr.hh
 usr/include/fastjet/WrappedStructure.hh
-usr/include/fastjet/LimitedWarning.hh
 usr/include/fastjet/config.h
 usr/include/fastjet/config_auto.h
-usr/lib/*/libfastjet.so
+usr/include/fastjet/internal/
+usr/include/fastjet/version.hh
 usr/lib/*/libfastjet.a
+usr/lib/*/libfastjet.so
diff --git a/debian/libfastjet-fortran-dev.examples b/debian/libfastjet-fortran-dev.examples
index d7a2979..d92eb41 100644
--- a/debian/libfastjet-fortran-dev.examples
+++ b/debian/libfastjet-fortran-dev.examples
@@ -1,2 +1,2 @@
-fortran_wrapper/fastjet_fortran_example.f
 fortran_wrapper/Makefile.alt
+fortran_wrapper/fastjet_fortran_example.f
diff --git a/debian/libfastjet-fortran-dev.install b/debian/libfastjet-fortran-dev.install
index fdf35e1..1feccd2 100644
--- a/debian/libfastjet-fortran-dev.install
+++ b/debian/libfastjet-fortran-dev.install
@@ -1,2 +1,2 @@
-usr/lib/*/libfastjet-fortran.so
 usr/lib/*/libfastjet-fortran.a
+usr/lib/*/libfastjet-fortran.so
diff --git a/debian/libfastjetplugins-dev.install b/debian/libfastjetplugins-dev.install
index 2935a9a..e925d37 100644
--- a/debian/libfastjetplugins-dev.install
+++ b/debian/libfastjetplugins-dev.install
@@ -1,3 +1,3 @@
 usr/include/fastjet/*Plugin.hh
-usr/lib/*/libfastjetplugins.so
 usr/lib/*/libfastjetplugins.a
+usr/lib/*/libfastjetplugins.so
diff --git a/debian/libfastjettools-dev.install b/debian/libfastjettools-dev.install
index da27512..a50a3df 100644
--- a/debian/libfastjettools-dev.install
+++ b/debian/libfastjettools-dev.install
@@ -1,3 +1,3 @@
 usr/include/fastjet/tools/
-usr/lib/*/libfastjettools.so
 usr/lib/*/libfastjettools.a
+usr/lib/*/libfastjettools.so

-- 
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