[rivet] 01/12: run wrap-and-sort -ast

Mattia Rizzolo mattia at debian.org
Mon Jun 13 18:46:56 UTC 2016


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

mattia pushed a commit to branch master
in repository rivet.

commit eef5cfa123c29f6b1e1b5d64a5e17872330ff2d1
Author: Mattia Rizzolo <mattia at debian.org>
Date:   Mon Jun 13 17:26:50 2016 +0000

    run wrap-and-sort -ast
---
 debian/control                    | 134 +++++++++++++++++++++++++++-----------
 debian/docs                       |   2 +-
 debian/librivet-dev.install       |   4 +-
 debian/rivet-plugins-data.install |   2 +-
 debian/rivet.install              |   2 +-
 debian/rivet.manpages             |   4 +-
 6 files changed, 102 insertions(+), 46 deletions(-)

diff --git a/debian/control b/debian/control
index 8238b96..ab6257d 100644
--- a/debian/control
+++ b/debian/control
@@ -2,9 +2,28 @@ Source: rivet
 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 (>= 8.0.0), autotools-dev, libhepmc-dev, libfastjet-dev (>= 3.0.6+dfsg-1.1~), libfastjetplugins-dev, libfastjettools-dev, libyaml-cpp-dev, dh-autoreconf, libgsl-dev, libtinyxml-dev, chrpath, libboost-dev, python-dev, dh-python, swig, gfortran
-Build-Depends-Indep: texlive-science, doxygen-latex
+Uploaders:
+ Lifeng Sun <lifongsun at gmail.com>,
+Build-Depends:
+ autotools-dev,
+ chrpath,
+ debhelper (>= 8.0.0),
+ dh-autoreconf,
+ dh-python,
+ gfortran,
+ libboost-dev,
+ libfastjet-dev (>= 3.0.6+dfsg-1.1~),
+ libfastjetplugins-dev,
+ libfastjettools-dev,
+ libgsl-dev,
+ libhepmc-dev,
+ libtinyxml-dev,
+ libyaml-cpp-dev,
+ python-dev,
+ swig,
+Build-Depends-Indep:
+ doxygen-latex,
+ texlive-science,
 Standards-Version: 3.9.3
 Homepage: http://rivet.hepforge.org/
 Vcs-Git: git://git.debian.org/git/debian-science/packages/rivet.git
@@ -12,11 +31,16 @@ Vcs-Browser: http://git.debian.org/?p=debian-science/packages/rivet.git
 
 Package: rivet
 Architecture: all
-Depends: python, python-rivet (>= ${source:Version}), ${misc:Depends}
-Recommends: rivet-plugins
-Suggests: rivet-user-manual
+Depends:
+ python,
+ python-rivet (>= ${source:Version}),
+ ${misc:Depends},
+Recommends:
+ rivet-plugins,
+Suggests:
+ rivet-user-manual,
 Description: Robust Independent Validation of Experiment and Theory
- Rivet is a toolkit for validation of Monte Carlo event generators. Using 
+ Rivet is a toolkit for validation of Monte Carlo event generators. Using
  a computationally efficient model for observable computations, Rivet
  provides a set of experimental analyses useful for generator sanity checks,
  as well as a convenient infrastructure for adding your own analysis.
@@ -26,10 +50,12 @@ Description: Robust Independent Validation of Experiment and Theory
 Package: rivet-user-manual
 Section: doc
 Architecture: all
-Depends: ${misc:Depends}
-Suggests: rivet
+Depends:
+ ${misc:Depends},
+Suggests:
+ rivet,
 Description: Rivet User Manual
- Rivet is a toolkit for validation of Monte Carlo event generators. Using 
+ Rivet is a toolkit for validation of Monte Carlo event generators. Using
  a computationally efficient model for observable computations, Rivet
  provides a set of experimental analyses useful for generator sanity checks,
  as well as a convenient infrastructure for adding your own analysis.
@@ -39,10 +65,12 @@ Description: Rivet User Manual
 Package: rivet-reference
 Section: doc
 Architecture: all
-Depends: ${misc:Depends}
-Suggests: rivet
+Depends:
+ ${misc:Depends},
+Suggests:
+ rivet,
 Description: Rivet code reference
- Rivet is a toolkit for validation of Monte Carlo event generators. Using 
+ Rivet is a toolkit for validation of Monte Carlo event generators. Using
  a computationally efficient model for observable computations, Rivet
  provides a set of experimental analyses useful for generator sanity checks,
  as well as a convenient infrastructure for adding your own analysis.
@@ -52,11 +80,16 @@ Description: Rivet code reference
 Package: rivet-plugins
 Architecture: any
 Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends}
-Depends: rivet-plugins-data (>= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}
-Suggests: rivet-plugins-doc
+Pre-Depends:
+ ${misc:Pre-Depends},
+Depends:
+ rivet-plugins-data (>= ${source:Version}),
+ ${misc:Depends},
+ ${shlibs:Depends},
+Suggests:
+ rivet-plugins-doc,
 Description: Analysis plugins of Rivet
- Rivet is a toolkit for validation of Monte Carlo event generators. Using 
+ Rivet is a toolkit for validation of Monte Carlo event generators. Using
  a computationally efficient model for observable computations, Rivet
  provides a set of experimental analyses useful for generator sanity checks,
  as well as a convenient infrastructure for adding your own analysis.
@@ -66,10 +99,15 @@ Description: Analysis plugins of Rivet
 
 Package: rivet-plugins-dev
 Architecture: all
-Depends: python, librivet-dev (>= ${source:Version}), rivet-plugins (>= ${source:Version}), ${misc:Depends}
-Suggests: rivet-plugins-doc
+Depends:
+ librivet-dev (>= ${source:Version}),
+ python,
+ rivet-plugins (>= ${source:Version}),
+ ${misc:Depends},
+Suggests:
+ rivet-plugins-doc,
 Description: Template generator of Rivet analysis plugin
- Rivet is a toolkit for validation of Monte Carlo event generators. Using 
+ Rivet is a toolkit for validation of Monte Carlo event generators. Using
  a computationally efficient model for observable computations, Rivet
  provides a set of experimental analyses useful for generator sanity checks,
  as well as a convenient infrastructure for adding your own analysis.
@@ -79,9 +117,10 @@ Description: Template generator of Rivet analysis plugin
 Package: rivet-plugins-doc
 Section: doc
 Architecture: all
-Depends: ${misc:Depends}
+Depends:
+ ${misc:Depends},
 Description: HTML documentation for Rivet analysis plugins
- Rivet is a toolkit for validation of Monte Carlo event generators. Using 
+ Rivet is a toolkit for validation of Monte Carlo event generators. Using
  a computationally efficient model for observable computations, Rivet
  provides a set of experimental analyses useful for generator sanity checks,
  as well as a convenient infrastructure for adding your own analysis.
@@ -91,10 +130,12 @@ Description: HTML documentation for Rivet analysis plugins
 Package: rivet-plugins-data
 Architecture: all
 Multi-Arch: foreign
-Pre-Depends: ${misc:Pre-Depends}
-Depends: ${misc:Depends}
+Pre-Depends:
+ ${misc:Pre-Depends},
+Depends:
+ ${misc:Depends},
 Description: Data files of Rivet analysis plugins
- Rivet is a toolkit for validation of Monte Carlo event generators. Using 
+ Rivet is a toolkit for validation of Monte Carlo event generators. Using
  a computationally efficient model for observable computations, Rivet
  provides a set of experimental analyses useful for generator sanity checks,
  as well as a convenient infrastructure for adding your own analysis.
@@ -105,12 +146,17 @@ Package: librivet11v5
 Section: libs
 Architecture: any
 Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends}
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Replaces: librivet11
-Conflicts: librevet11
+Pre-Depends:
+ ${misc:Pre-Depends},
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends},
+Replaces:
+ librivet11,
+Conflicts:
+ librevet11,
 Description: Run-time library of Rivet
- Rivet is a toolkit for validation of Monte Carlo event generators. Using 
+ Rivet is a toolkit for validation of Monte Carlo event generators. Using
  a computationally efficient model for observable computations, Rivet
  provides a set of experimental analyses useful for generator sanity checks,
  as well as a convenient infrastructure for adding your own analysis.
@@ -120,10 +166,14 @@ Description: Run-time library of Rivet
 Package: librivet-dev
 Section: libdevel
 Architecture: any
-Depends: libboost-dev, librivet11v5 (= ${binary:Version}), ${misc:Depends}
-Suggests: rivet-reference
+Depends:
+ libboost-dev,
+ librivet11v5 (= ${binary:Version}),
+ ${misc:Depends},
+Suggests:
+ rivet-reference,
 Description: Development files of Rivet
- Rivet is a toolkit for validation of Monte Carlo event generators. Using 
+ Rivet is a toolkit for validation of Monte Carlo event generators. Using
  a computationally efficient model for observable computations, Rivet
  provides a set of experimental analyses useful for generator sanity checks,
  as well as a convenient infrastructure for adding your own analysis.
@@ -132,9 +182,12 @@ Description: Development files of Rivet
 
 Package: rivet-root-converter
 Architecture: all
-Depends: python, libroot-bindings-python5.34, ${misc:Depends}
+Depends:
+ libroot-bindings-python5.34,
+ python,
+ ${misc:Depends},
 Description: Rivet and ROOT file format converter
- Rivet is a toolkit for validation of Monte Carlo event generators. Using 
+ Rivet is a toolkit for validation of Monte Carlo event generators. Using
  a computationally efficient model for observable computations, Rivet
  provides a set of experimental analyses useful for generator sanity checks,
  as well as a convenient infrastructure for adding your own analysis.
@@ -144,14 +197,17 @@ Description: Rivet and ROOT file format converter
 Package: python-rivet
 Section: python
 Multi-Arch: foreign
-Pre-Depends: ${misc:Pre-Depends}
+Pre-Depends:
+ ${misc:Pre-Depends},
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}
+Depends:
+ ${misc:Depends},
+ ${python:Depends},
+ ${shlibs:Depends},
 Description: Python bindings of Rivet
- Rivet is a toolkit for validation of Monte Carlo event generators. Using 
+ Rivet is a toolkit for validation of Monte Carlo event generators. Using
  a computationally efficient model for observable computations, Rivet
  provides a set of experimental analyses useful for generator sanity checks,
  as well as a convenient infrastructure for adding your own analysis.
  .
  This package provides Python bindings of Rivet.
-
diff --git a/debian/docs b/debian/docs
index d3fd28c..8b6bfdc 100644
--- a/debian/docs
+++ b/debian/docs
@@ -1,3 +1,3 @@
+GUIDELINES
 NEWS
 README
-GUIDELINES
diff --git a/debian/librivet-dev.install b/debian/librivet-dev.install
index bb0b26c..e65ea1d 100644
--- a/debian/librivet-dev.install
+++ b/debian/librivet-dev.install
@@ -1,3 +1,3 @@
-usr/lib/*/libRivet.so
-usr/include/
 usr/bin/rivet-config
+usr/include/
+usr/lib/*/libRivet.so
diff --git a/debian/rivet-plugins-data.install b/debian/rivet-plugins-data.install
index 52316c5..02dfbd1 100644
--- a/debian/rivet-plugins-data.install
+++ b/debian/rivet-plugins-data.install
@@ -1,3 +1,3 @@
-usr/share/Rivet/*.plot
 usr/share/Rivet/*.aida
 usr/share/Rivet/*.info
+usr/share/Rivet/*.plot
diff --git a/debian/rivet.install b/debian/rivet.install
index 4225577..71a28f7 100644
--- a/debian/rivet.install
+++ b/debian/rivet.install
@@ -1,6 +1,6 @@
 usr/bin/aida2flat
-usr/bin/flat2aida
 usr/bin/compare-histos
+usr/bin/flat2aida
 usr/bin/make-plots
 usr/bin/rivet
 usr/bin/rivet-chopbins
diff --git a/debian/rivet.manpages b/debian/rivet.manpages
index e8219b4..71ff025 100644
--- a/debian/rivet.manpages
+++ b/debian/rivet.manpages
@@ -1,10 +1,10 @@
 debian/aida2flat.1
-debian/flat2aida.1
 debian/compare-histos.1
+debian/flat2aida.1
 debian/make-plots.1
-debian/rivet.1
 debian/rivet-chopbins.1
 debian/rivet-mergeruns.1
 debian/rivet-mkhtml.1
 debian/rivet-rescale.1
 debian/rivet-rmgaps.1
+debian/rivet.1

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



More information about the debian-science-commits mailing list