[SCM] mpich.git branch, master, updated. debian/1.4.1-4-28-g077eb9b
Anton Gladky
gladky.anton at gmail.com
Tue Jun 18 20:02:18 UTC 2013
The following commit has been merged in the master branch:
commit f1214f799a7a60061d10f97a78dd37e6f239d853
Author: Anton Gladky <gladky.anton at gmail.com>
Date: Tue Jun 18 21:56:33 2013 +0200
Use wrap-and-sort.
diff --git a/debian/control b/debian/control
index b11597f..14a4808 100644
--- a/debian/control
+++ b/debian/control
@@ -2,64 +2,65 @@ Source: mpich
Section: devel
Priority: extra
Maintainer: Debian Science Maintainers <debian-science-maintainers at lists.alioth.debian.org>
-Uploaders: Torquil Macdonald Sørensen <torquil at gmail.com>, "Adam C. Powell, IV" <hazelsct at debian.org>
-Build-Depends: debhelper (>= 9), gfortran, txt2man, libxt-dev, x11proto-core-dev, default-jdk, quilt, procps, libhwloc-dev, hwloc-nox, libcr-dev [amd64 armel i386 powerpc], automake, valgrind [i386 amd64 powerpc armel armhf], dh-autoreconf
+Uploaders:
+ Torquil Macdonald Sørensen <torquil at gmail.com>,
+ "Adam C. Powell, IV" <hazelsct at debian.org>
+Build-Depends:
+ automake,
+ debhelper (>= 9),
+ default-jdk,
+ dh-autoreconf,
+ gfortran,
+ hwloc-nox,
+ libcr-dev [amd64 armel i386 powerpc],
+ libhwloc-dev,
+ libxt-dev,
+ procps,
+ quilt,
+ txt2man,
+ valgrind [i386 amd64 powerpc armel armhf],
+ x11proto-core-dev
Standards-Version: 3.9.2
Homepage: http://www.mpich.org/
Vcs-Browser: http://git.debian.org/?p=debian-science/packages/mpich.git;a=summary
Vcs-Git: git://git.debian.org/debian-science/packages/mpich.git
-Package: mpich2
-Architecture: any
-Depends: mpich (= ${binary:Version}), ${misc:Depends}
-Description: Transitional dummy package
- This is a dummy package for the transition from mpich2 to mpich. It can
- safely be removed if nothing else depends on it.
-
-Package: mpich
+Package: libmpich-dev
Architecture: any
-Depends: libmpich10 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}, hwloc-nox | hwloc
-Conflicts: mpich2 (<< 3.0.3-1)
-Recommends: libmpich-dev (= ${binary:Version})
-Suggests: mpich-doc (= ${source:Version}), blcr-util
-Description: Implementation of the MPI Message Passing Interface standard
- MPICH is a high-performance and widely portable implementation of the
- Message Passing Interface (MPI) standard (both MPI-1 and MPI-2). It
- efficiently supports different computation and communication platforms
- including commodity clusters, SMPs, massively parallel systems, and
- high-speed networks.
- .
- This package includes the program binaries necessary to run MPICH programs.
-
-Package: mpich2-doc
-Architecture: all
-Section: doc
-Depends: mpich-doc (= ${binary:Version}), ${misc:Depends}
-Description: Transitional dummy package for MPICH documentation
- This is a dummy package for the transition from mpich2-doc to mpich-doc. It can
- safely be removed if nothing else depends on it.
-
-Package: mpich-doc
-Architecture: all
-Section: doc
-Depends: ${misc:Depends}
-Conflicts: lam-mpidoc, lam4-dev, mpi-doc, openmpi-mpidoc, openmpi-doc, mpich2-doc (<< 3.0.3-1)
-Description: Documentation for MPICH
+Section: libdevel
+Depends:
+ libcr-dev [amd64 armel i386 powerpc],
+ libmpich10 (= ${binary:Version}),
+ ${misc:Depends},
+ ${shlibs:Depends}
+Conflicts:
+ libmpich2-dev (<< 3.0.3-1)
+Recommends:
+ mpich (= ${binary:Version})
+Description: Development files for MPICH
MPICH is a high-performance and widely portable implementation of the
Message Passing Interface (MPI) standard (both MPI-1 and MPI-2). It
efficiently supports different computation and communication platforms
including commodity clusters, SMPs, massively parallel systems, and
high-speed networks.
.
- This package includes the MPICH documentation.
+ This package includes the MPICH headers and static libraries, as well
+ as the compiler wrappers needed to build MPICH programs.
Package: libmpich10
Architecture: any
Section: libs
-Depends: ${shlibs:Depends}, ${misc:Depends}
-# Required due to file conflict on /usr/lib/libopa.so.1.0.0
-Conflicts: libmpich2-2, libmpich2-3, libmpich2-6
-Replaces: libmpich2-2, libmpich2-3, libmpich2-6
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends}
+Conflicts:
+ libmpich2-2,
+ libmpich2-3,
+ libmpich2-6
+Replaces:
+ libmpich2-2,
+ libmpich2-3,
+ libmpich2-6
Description: Shared libraries for MPICH
MPICH is a high-performance and widely portable implementation of the
Message Passing Interface (MPI) standard (both MPI-1 and MPI-2). It
@@ -72,23 +73,72 @@ Description: Shared libraries for MPICH
Package: libmpich2-dev
Architecture: any
Section: libdevel
-Depends: libmpich-dev (= ${binary:Version}), ${misc:Depends}
+Depends:
+ libmpich-dev (= ${binary:Version}),
+ ${misc:Depends}
Description: Transitional dummy package for MPICH development files
This is a dummy package for the transition from libmpich2-dev to libmpich-dev. It can
safely be removed if nothing else depends on it.
-Package: libmpich-dev
+Package: mpich
Architecture: any
-Section: libdevel
-Depends: libmpich10 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}, libcr-dev [amd64 armel i386 powerpc]
-Conflicts: libmpich2-dev (<< 3.0.3-1)
-Recommends: mpich (= ${binary:Version})
-Description: Development files for MPICH
+Depends:
+ hwloc-nox | hwloc,
+ libmpich10 (= ${binary:Version}),
+ ${misc:Depends},
+ ${shlibs:Depends}
+Conflicts:
+ mpich2 (<< 3.0.3-1)
+Recommends:
+ libmpich-dev (= ${binary:Version})
+Suggests:
+ blcr-util,
+ mpich-doc (= ${source:Version})
+Description: Implementation of the MPI Message Passing Interface standard
MPICH is a high-performance and widely portable implementation of the
Message Passing Interface (MPI) standard (both MPI-1 and MPI-2). It
efficiently supports different computation and communication platforms
including commodity clusters, SMPs, massively parallel systems, and
high-speed networks.
.
- This package includes the MPICH headers and static libraries, as well
- as the compiler wrappers needed to build MPICH programs.
+ This package includes the program binaries necessary to run MPICH programs.
+
+Package: mpich-doc
+Architecture: all
+Section: doc
+Depends:
+ ${misc:Depends}
+Conflicts:
+ lam-mpidoc,
+ lam4-dev,
+ mpi-doc,
+ mpich2-doc (<< 3.0.3-1),
+ openmpi-doc,
+ openmpi-mpidoc
+Description: Documentation for MPICH
+ MPICH is a high-performance and widely portable implementation of the
+ Message Passing Interface (MPI) standard (both MPI-1 and MPI-2). It
+ efficiently supports different computation and communication platforms
+ including commodity clusters, SMPs, massively parallel systems, and
+ high-speed networks.
+ .
+ This package includes the MPICH documentation.
+
+Package: mpich2
+Architecture: any
+Depends:
+ mpich (= ${binary:Version}),
+ ${misc:Depends}
+Description: Transitional dummy package
+ This is a dummy package for the transition from mpich2 to mpich. It can
+ safely be removed if nothing else depends on it.
+
+Package: mpich2-doc
+Architecture: all
+Section: doc
+Depends:
+ mpich-doc (= ${binary:Version}),
+ ${misc:Depends}
+Description: Transitional dummy package for MPICH documentation
+ This is a dummy package for the transition from mpich2-doc to mpich-doc. It can
+ safely be removed if nothing else depends on it.
diff --git a/debian/copyright b/debian/copyright
index 49423d5..61fda01 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -596,4 +596,3 @@ Version 1.0 dated 2006-09-05.
The Debian packaging is © 2009, Lucas Nussbaum <lucas at lucas-nussbaum.net>
and is licensed under the GPL Version 3, see `/usr/share/common-licenses/GPL-3'.
-
diff --git a/debian/libmpich-dev.install b/debian/libmpich-dev.install
index c90c188..6894cbf 100644
--- a/debian/libmpich-dev.install
+++ b/debian/libmpich-dev.install
@@ -4,13 +4,13 @@ usr/bin/mpichversion
usr/bin/mpicxx.*
usr/bin/mpif77.*
usr/bin/mpif90.*
+usr/include/mpich/mpi*
+usr/include/mpich/opa*
+usr/include/mpich/primitives/
usr/lib/*/lib*mpich*.a
usr/lib/*/lib*mpich*.so
-usr/lib/*/lib*opa*a
-usr/lib/*/lib*opa*so
usr/lib/*/lib*mpl*.a
usr/lib/*/lib*mpl*.so
+usr/lib/*/lib*opa*a
+usr/lib/*/lib*opa*so
usr/lib/*/pkgconfig/mpich*.pc
-usr/include/mpich/opa*
-usr/include/mpich/mpi*
-usr/include/mpich/primitives/
diff --git a/debian/libmpich10.install b/debian/libmpich10.install
index 3ded4cc..d3980f2 100644
--- a/debian/libmpich10.install
+++ b/debian/libmpich10.install
@@ -1,5 +1,5 @@
-usr/lib/*/libmpich.so.10*
usr/lib/*/libfmpich.so.10*
+usr/lib/*/libmpich.so.10*
usr/lib/*/libmpichcxx.so.10*
usr/lib/*/libmpichf90.so.10*
usr/lib/*/libmpl.so.1*
diff --git a/debian/mpich.install b/debian/mpich.install
index 0bc183a..7b3042d 100644
--- a/debian/mpich.install
+++ b/debian/mpich.install
@@ -1,4 +1,4 @@
-usr/bin/mpiexec.hydra
+usr/bin/hydra*
usr/bin/mpiexec
+usr/bin/mpiexec.hydra
usr/bin/mpirun
-usr/bin/hydra*
--
mpich.git
More information about the debian-science-commits
mailing list