[gerris] 11/13: Use wrap-and-sort.

Anton Gladky gladk at moszumanska.debian.org
Thu Jul 31 22:49:44 UTC 2014


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

gladk pushed a commit to branch master
in repository gerris.

commit 295e03c92da2bf0d0eb1c6db92482aa6937c542c
Author: Anton Gladky <gladk at debian.org>
Date:   Thu Jul 31 23:13:30 2014 +0200

    Use wrap-and-sort.
---
 debian/control            | 168 +++++++++++++++++++++++++++++-----------------
 debian/gerris-mpi.install |   2 +-
 debian/gerris.install     |   2 +-
 3 files changed, 107 insertions(+), 65 deletions(-)

diff --git a/debian/control b/debian/control
index 17f67d5..065e665 100644
--- a/debian/control
+++ b/debian/control
@@ -2,11 +2,21 @@ Source: gerris
 Section: science
 Priority: optional
 Maintainer: Debian Science Maintainers <debian-science-maintainers at lists.alioth.debian.org>
-Uploaders: Drew Parsons <dparsons at debian.org>, Anton Gladky <gladk at debian.org>
-Build-Depends: debhelper (>= 9), autotools-dev,	libgts-dev (>= 0.7.6+darcs121130-1.2),  
-  dh-autoreconf,
-  libgts-bin (>= 0.7.6+darcs121130-1.2), libnetcdf-dev, libgsl0-dev, 
-  libglib2.0-dev, python,	gfortran, mpi-default-dev
+Uploaders:
+ Drew Parsons <dparsons at debian.org>,
+ Anton Gladky <gladk at debian.org>
+Build-Depends:
+ autotools-dev,
+ debhelper (>= 9),
+ dh-autoreconf,
+ gfortran,
+ libglib2.0-dev,
+ libgsl0-dev,
+ libgts-bin (>= 0.7.6+darcs121130-1.2),
+ libgts-dev (>= 0.7.6+darcs121130-1.2),
+ libnetcdf-dev,
+ mpi-default-dev,
+ python
 Standards-Version: 3.9.5
 Homepage: http://gfs.sourceforge.net/
 Vcs-Git: git://anonscm.debian.org/debian-science/packages/gerris.git
@@ -14,112 +24,125 @@ Vcs-Browser: http://anonscm.debian.org/gitweb/?p=debian-science/packages/gerris.
 
 Package: gerris
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libav-tools
-Conflicts: gerris-mpi
-Replaces: gerris-mpi
-Suggests: python
+Depends:
+ libav-tools,
+ ${misc:Depends},
+ ${shlibs:Depends}
+Conflicts:
+ gerris-mpi
+Replaces:
+ gerris-mpi
+Suggests:
+ python
 Description: Fluid Flow Solver
  Gerris is a system for the solution of the partial differential
  equations describing fluid flow.
  .
  A brief summary of its main (current) features:
  .
-   * Solves the time-dependent incompressible variable-density Euler, 
+   * Solves the time-dependent incompressible variable-density Euler,
      Stokes or Navier-Stokes equations
-   * Adaptive mesh refinement: the resolution is adapted dynamically to 
+   * Adaptive mesh refinement: the resolution is adapted dynamically to
      the features of the flow
    * Entirely automatic mesh generation in complex geometries
    * Second-order in space and time
    * Unlimited number of advected/diffused passive tracers
    * Flexible specification of additional source terms
    * Portable parallel support using the MPI library
-   * Volume of Fluid advection scheme for interfacial flows 
+   * Volume of Fluid advection scheme for interfacial flows
  .
  For multi-cpu MPI support, install gerris-mpi instead.
 
-Package: libgfs-dev
+Package: gerris-mpi
 Architecture: any
-Section: libdevel
-Depends: libgfs-1.3-2 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
-Conflicts: libgfs-mpi-dev
-Replaces: libgfs-mpi-dev
-Description: Fluid Flow Solver -- development libraries and headers
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends}
+Suggests:
+ python
+Conflicts:
+ gerris
+Replaces:
+ gerris
+Description: Fluid Flow Solver
  Gerris is a system for the solution of the partial differential
  equations describing fluid flow.
  .
- This package contains the headers and development libraries needed to
- build applications using libgfs.
-
-Package: libgfs-dbg
-Priority: extra
-Architecture: any
-Section: debug
-Depends: libgfs-1.3-2 (= ${binary:Version}) | libgfs-mpi-1.3-2 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
-Description: Fluid Flow Solver -- libraries with debugging symbols
- Gerris is a system for the solution of the partial differential
- equations describing fluid flow.
+ A brief summary of its main (current) features:
  .
- This package contains the debugging symbols for libgfs.
+   * Solves the time-dependent incompressible variable-density Euler,
+     Stokes or Navier-Stokes equations
+   * Adaptive mesh refinement: the resolution is adapted dynamically to
+     the features of the flow
+   * Entirely automatic mesh generation in complex geometries
+   * Second-order in space and time
+   * Unlimited number of advected/diffused passive tracers
+   * Flexible specification of additional source terms
+   * Portable parallel support using the MPI library
+   * Volume of Fluid advection scheme for interfacial flows
+ .
+ This package has MPI support built in.
 
 Package: libgfs-1.3-2
 Architecture: any
 Section: devel
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Conflicts: libgfs-mpi-1.3-2, libgfs-1.3-1 (>=20090512-dfsg.1-1)
-Replaces: libgfs-mpi-1.3-2, libgfs-1.3-1 (>=20090512-dfsg.1-1)
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends}
+Conflicts:
+ libgfs-1.3-1 (>=20090512-dfsg.1-1),
+ libgfs-mpi-1.3-2
+Replaces:
+ libgfs-1.3-1 (>=20090512-dfsg.1-1),
+ libgfs-mpi-1.3-2
 Description: Fluid Flow Solver -- shared libraries
  Gerris is a system for the solution of the partial differential
  equations describing fluid flow.
  .
  This package contains the shared libraries for libgfs.
 
-Package: gerris-mpi
+Package: libgfs-dbg
+Priority: extra
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Suggests: python
-Conflicts: gerris
-Replaces: gerris
-Description: Fluid Flow Solver
+Section: debug
+Depends:
+ libgfs-1.3-2 (= ${binary:Version}) | libgfs-mpi-1.3-2 (= ${binary:Version}),
+ ${misc:Depends},
+ ${shlibs:Depends}
+Description: Fluid Flow Solver -- libraries with debugging symbols
  Gerris is a system for the solution of the partial differential
  equations describing fluid flow.
  .
- A brief summary of its main (current) features:
- .
-   * Solves the time-dependent incompressible variable-density Euler, 
-     Stokes or Navier-Stokes equations
-   * Adaptive mesh refinement: the resolution is adapted dynamically to 
-     the features of the flow
-   * Entirely automatic mesh generation in complex geometries
-   * Second-order in space and time
-   * Unlimited number of advected/diffused passive tracers
-   * Flexible specification of additional source terms
-   * Portable parallel support using the MPI library
-   * Volume of Fluid advection scheme for interfacial flows 
- .
- This package has MPI support built in.
+ This package contains the debugging symbols for libgfs.
 
-Package: libgfs-mpi-dev
+Package: libgfs-dev
 Architecture: any
 Section: libdevel
-Depends: libgfs-mpi-1.3-2 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
-Conflicts: libgfs-dev
-Replaces: libgfs-dev
+Depends:
+ libgfs-1.3-2 (= ${binary:Version}),
+ ${misc:Depends},
+ ${shlibs:Depends}
+Conflicts:
+ libgfs-mpi-dev
+Replaces:
+ libgfs-mpi-dev
 Description: Fluid Flow Solver -- development libraries and headers
  Gerris is a system for the solution of the partial differential
  equations describing fluid flow.
  .
  This package contains the headers and development libraries needed to
  build applications using libgfs.
- .
- This package has MPI support built in.
-
 
 Package: libgfs-mpi-1.3-2
 Architecture: any
 Section: devel
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Conflicts: libgfs-1.3-2
-Replaces: libgfs-1.3-2
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends}
+Conflicts:
+ libgfs-1.3-2
+Replaces:
+ libgfs-1.3-2
 Description: Fluid Flow Solver -- shared libraries
  Gerris is a system for the solution of the partial differential
  equations describing fluid flow.
@@ -128,3 +151,22 @@ Description: Fluid Flow Solver -- shared libraries
  .
  This package has MPI support built in.
 
+Package: libgfs-mpi-dev
+Architecture: any
+Section: libdevel
+Depends:
+ libgfs-mpi-1.3-2 (= ${binary:Version}),
+ ${misc:Depends},
+ ${shlibs:Depends}
+Conflicts:
+ libgfs-dev
+Replaces:
+ libgfs-dev
+Description: Fluid Flow Solver -- development libraries and headers
+ Gerris is a system for the solution of the partial differential
+ equations describing fluid flow.
+ .
+ This package contains the headers and development libraries needed to
+ build applications using libgfs.
+ .
+ This package has MPI support built in.
diff --git a/debian/gerris-mpi.install b/debian/gerris-mpi.install
index a33306d..f46af85 100644
--- a/debian/gerris-mpi.install
+++ b/debian/gerris-mpi.install
@@ -1,3 +1,3 @@
 usr/bin
-usr/share
 usr/lib/*/gerris/libstokes*
+usr/share
diff --git a/debian/gerris.install b/debian/gerris.install
index 29ff842..6645160 100644
--- a/debian/gerris.install
+++ b/debian/gerris.install
@@ -1,3 +1,3 @@
 debian/tmp/usr/bin
-usr/share
 usr/lib/*/gerris/libstokes*
+usr/share

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



More information about the debian-science-commits mailing list