[Pkg-openmpi-commits] r284 - in /openmpi/trunk/debian: ./ patches/
manuel at users.alioth.debian.org
manuel at users.alioth.debian.org
Mon Nov 7 20:05:51 UTC 2011
Author: manuel
Date: Mon Nov 7 20:05:50 2011
New Revision: 284
URL: http://svn.debian.org/wsvn/pkg-openmpi/?sc=1&rev=284
Log:
Reworked packaging, updating to latest upstream version
Added:
openmpi/trunk/debian/libopenmpi2.install
- copied, changed from r283, openmpi/trunk/debian/libopenmpi1.3.install
openmpi/trunk/debian/libopenmpi2.links
- copied, changed from r283, openmpi/trunk/debian/libopenmpi1.3.links
openmpi/trunk/debian/libopenmpi2.lintian-overrides
openmpi/trunk/debian/openmpi-bin.manpages
openmpi/trunk/debian/openmpi-checkpoint.manpages
openmpi/trunk/debian/openmpi-doc.manpages
openmpi/trunk/debian/patches/ompi_autogen_sh.patch
Removed:
openmpi/trunk/debian/README.source
openmpi/trunk/debian/clean_symlinks
openmpi/trunk/debian/libopenmpi1.3.install
openmpi/trunk/debian/libopenmpi1.3.links
openmpi/trunk/debian/shlibs.local
Modified:
openmpi/trunk/debian/changelog
openmpi/trunk/debian/compat
openmpi/trunk/debian/control
openmpi/trunk/debian/copyright
openmpi/trunk/debian/libopenmpi-dev.README.Debian
openmpi/trunk/debian/libopenmpi-dev.install
openmpi/trunk/debian/libopenmpi-dev.links
openmpi/trunk/debian/openmpi-bin.install
openmpi/trunk/debian/openmpi-checkpoint.install
openmpi/trunk/debian/openmpi-checkpoint.links
openmpi/trunk/debian/openmpi-common.install
openmpi/trunk/debian/openmpi-doc.install
openmpi/trunk/debian/patches/build_hurd
openmpi/trunk/debian/patches/manpage_macros
openmpi/trunk/debian/patches/series
openmpi/trunk/debian/rules
openmpi/trunk/debian/watch
Modified: openmpi/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/trunk/debian/changelog?rev=284&op=diff
==============================================================================
--- openmpi/trunk/debian/changelog (original)
+++ openmpi/trunk/debian/changelog Mon Nov 7 20:05:50 2011
@@ -1,10 +1,22 @@
-openmpi (1.4.3-3) UNRELEASED; urgency=low
-
- * ACK the NMU
- * Switch to dpkg-source 3.0 (quilt) format
- * Standards-Version updated to version 3.9.2
-
- -- Sylvestre Ledru <sylvestre at debian.org> Tue, 17 May 2011 16:07:48 +0200
+openmpi (1.5.4-1) UNRELEASED; urgency=low
+
+ * New upstream release. Closes: 619998.
+ - ABI changes, bumped SONAME.
+ * Changes in packaging:
+ - Using "3.0 (quilt)" source format.
+ - Deleted README.source (obsolete).
+ - Updated watch file.
+ - Bumped Standards-Version to 3.9.2. No changes needed.
+ - Changed hard-coded list of non-Linux architectures in Build-Depends to
+ "linux-any". Closes: 634628.
+ - openmpi-bin now "Suggests" openmpi-checkpoint instead of recommending it.
+ - Deleted shlibs.local (obsolete).
+ - Updated debian/copyright.
+ - Updated patches.
+ - Substituted "OpenMPI" with "Open MPI" (official writing).
+ * Acknowledge NMU. Thanks to Riku Voipio!
+
+ -- Manuel Prinz <manuel at debian.org> Tue, 13 Sep 2011 17:06:15 +0200
openmpi (1.4.3-2.1) unstable; urgency=low
Modified: openmpi/trunk/debian/compat
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/trunk/debian/compat?rev=284&op=diff
==============================================================================
--- openmpi/trunk/debian/compat (original)
+++ openmpi/trunk/debian/compat Mon Nov 7 20:05:50 2011
@@ -1,1 +1,1 @@
-5
+8
Modified: openmpi/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/trunk/debian/control?rev=284&op=diff
==============================================================================
--- openmpi/trunk/debian/control (original)
+++ openmpi/trunk/debian/control Mon Nov 7 20:05:50 2011
@@ -4,7 +4,7 @@
Homepage: http://www.open-mpi.org/
Maintainer: Debian Open MPI Maintainers <pkg-openmpi-maintainers at lists.alioth.debian.org>
Uploaders: Manuel Prinz <manuel at debian.org>, Sylvestre Ledru <sylvestre at debian.org>
-Build-Depends: debhelper (>= 5.0.0), libibverbs-dev (>= 1.1.1) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], gfortran, gcc (>= 4:4.1.2), chrpath, quilt, libcr-dev [amd64 armel i386 powerpc], libnuma-dev [amd64 i386 ia64 mips mipsel powerpc], autoconf (>= 2.59), automake1.10, libtool, libltdl-dev, libtorque2-dev
+Build-Depends: debhelper (>= 8.0.0~), libibverbs-dev (>= 1.1.1), gfortran, gcc (>= 4:4.1.2), chrpath, quilt, libcr-dev [amd64 armel i386 powerpc], libnuma-dev [amd64 i386 ia64 mips mipsel powerpc], autoconf (>= 2.59), automake1.10, libtool, libltdl-dev, libtorque2-dev
Standards-Version: 3.9.2
Vcs-Svn: svn://svn.debian.org/svn/pkg-openmpi/openmpi/trunk/
Vcs-Browser: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/trunk/
@@ -12,8 +12,7 @@
Package: openmpi-bin
Architecture: alpha amd64 armel armhf i386 ia64 powerpc powerpcspe ppc64 sparc sparc64 kfreebsd-i386 kfreebsd-amd64 hurd-i386
Depends: ${shlibs:Depends}, ${misc:Depends}, openmpi-common (= ${source:Version})
-Recommends: openmpi-checkpoint [ amd64 armel i386 powerpc ]
-Suggests: gfortran
+Suggests: gfortran, openmpi-checkpoint [amd64 armel i386 powerpc]
Description: high performance message passing library -- binaries
Open MPI is a project combining technologies and resources from several other
projects (FT-MPI, LA-MPI, LAM/MPI, and PACX-MPI) in order to build the best
@@ -40,7 +39,7 @@
Package: libopenmpi-dev
Section: libdevel
Architecture: alpha amd64 armel armhf i386 ia64 powerpc powerpcspe ppc64 sparc sparc64 kfreebsd-i386 kfreebsd-amd64 hurd-i386
-Depends: ${shlibs:Depends}, ${misc:Depends}, libopenmpi1.3 (= ${binary:Version}), openmpi-common (= ${source:Version}), libibverbs-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386]
+Depends: ${shlibs:Depends}, ${misc:Depends}, libopenmpi2 (= ${binary:Version}), openmpi-common (= ${source:Version}), libibverbs-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386]
Conflicts: openmpi-dev
Replaces: openmpi-dev, openmpi-bin (<= 1.2.4-0)
Provides: openmpi-dev
@@ -54,7 +53,7 @@
This package contains the header files and compiler wrappers which are needed
to compile and link programs against libopenmpi.
-Package: libopenmpi1.3
+Package: libopenmpi2
Section: libs
Architecture: alpha amd64 armel armhf i386 ia64 powerpc powerpcspe ppc64 sparc sparc64 kfreebsd-i386 kfreebsd-amd64 hurd-i386
Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -102,7 +101,7 @@
Package: libopenmpi-dbg
Section: debug
Architecture: alpha amd64 armel armhf i386 ia64 powerpc powerpcspe ppc64 sparc sparc64 kfreebsd-i386 kfreebsd-amd64 hurd-i386
-Depends: ${misc:Depends}, openmpi-bin (= ${binary:Version}), libopenmpi1.3 (= ${binary:Version})
+Depends: ${misc:Depends}, openmpi-bin (= ${binary:Version}), libopenmpi2 (= ${binary:Version})
Conflicts: openmpi-dbg
Replaces: openmpi-dbg
Provides: openmpi-dbg
Modified: openmpi/trunk/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/trunk/debian/copyright?rev=284&op=diff
==============================================================================
--- openmpi/trunk/debian/copyright (original)
+++ openmpi/trunk/debian/copyright Mon Nov 7 20:05:50 2011
@@ -5,25 +5,25 @@
Copyright Holder:
-Copyright (c) 2004-2008 The Trustees of Indiana University and Indiana
+Copyright (c) 2004-2010 The Trustees of Indiana University and Indiana
University Research and Technology
Corporation. All rights reserved.
-Copyright (c) 2004-2009 The University of Tennessee and The University
+Copyright (c) 2004-2010 The University of Tennessee and The University
of Tennessee Research Foundation. All rights
reserved.
-Copyright (c) 2004-2008 High Performance Computing Center Stuttgart,
+Copyright (c) 2004-2010 High Performance Computing Center Stuttgart,
University of Stuttgart. All rights reserved.
-Copyright (c) 2004-2007 The Regents of the University of California.
+Copyright (c) 2004-2008 The Regents of the University of California.
All rights reserved.
-Copyright (c) 2006-2009 Los Alamos National Security, LLC. All rights
+Copyright (c) 2006-2010 Los Alamos National Security, LLC. All rights
reserved.
-Copyright (c) 2006-2009 Cisco Systems, Inc. All rights reserved.
-Copyright (c) 2006-2008 Voltaire, Inc. All rights reserved.
-Copyright (c) 2006-2008 Sandia National Laboratories. All rights reserved.
-Copyright (c) 2006-2009 Sun Microsystems, Inc. All rights reserved.
+Copyright (c) 2006-2010 Cisco Systems, Inc. All rights reserved.
+Copyright (c) 2006-2010 Voltaire, Inc. All rights reserved.
+Copyright (c) 2006-2010 Sandia National Laboratories. All rights reserved.
+Copyright (c) 2006-2010 Sun Microsystems, Inc. All rights reserved.
Use is subject to license terms.
-Copyright (c) 2006-2009 The University of Houston. All rights reserved.
-Copyright (c) 2006-2008 Myricom, Inc. All rights reserved.
+Copyright (c) 2006-2010 The University of Houston. All rights reserved.
+Copyright (c) 2006-2009 Myricom, Inc. All rights reserved.
Copyright (c) 2007-2008 UT-Battelle, LLC. All rights reserved.
Copyright (c) 2007-2008 IBM Corporation. All rights reserved.
Copyright (c) 1998-2005 Forschungszentrum Juelich, Juelich Supercomputing
@@ -35,8 +35,11 @@
Copyright (c) 2007 Lawrence Livermore National Security, LLC.
All rights reserved.
Copyright (c) 2007-2009 Mellanox Technologies. All rights reserved.
-Copyright (c) 2006 QLogic Corporation. All rights reserved.
-
+Copyright (c) 2006-2010 QLogic Corporation. All rights reserved.
+Copyright (c) 2008-2010 Oak Ridge National Labs. All rights reserved.
+Copyright (c) 2006-2010 Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2009 Bull SAS. All rights reserved.
+Copyright (c) 2010 ARM ltd. All rights reserved.
License:
Modified: openmpi/trunk/debian/libopenmpi-dev.README.Debian
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/trunk/debian/libopenmpi-dev.README.Debian?rev=284&op=diff
==============================================================================
--- openmpi/trunk/debian/libopenmpi-dev.README.Debian (original)
+++ openmpi/trunk/debian/libopenmpi-dev.README.Debian Mon Nov 7 20:05:50 2011
@@ -1,15 +1,15 @@
-OpenMPI for Debian - Developer Notes
-------------------------------------
+Open MPI for Debian - Developer Notes
+-------------------------------------
MPI Alternatives
----------------
-The current OpenMPI version of Debian uses the Debian Alternatives system.
-Although OpenMPI might replace most of the existing MPI implementations in the
+The current Open MPI version of Debian uses the Debian Alternatives system.
+Although Open MPI might replace most of the existing MPI implementations in the
future (see http://www.open-mpi.org/faq/?category=general#why), we decided to
not affect any other MPI implementation already installed on your system.
-You can setup OpenMPI as default MPI implementation by selecting openmpi as
+You can setup Open MPI as default MPI implementation by selecting openmpi as
the "mpi" alternative:
update-alternatives --config mpi
@@ -23,4 +23,4 @@
under /usr/lib instead of relying on update-alternatives. This may also allow
parallel builds.
- -- Debian OpenMPI Team <pkg-openmpi-maintainers at lists.alioth.debian.org>, Mon, 21 Jul 2008 16:34:30 +0200
+ -- Debian Open MPI Team <pkg-openmpi-maintainers at lists.alioth.debian.org>, Mon, 21 Jul 2008 16:34:30 +0200
Modified: openmpi/trunk/debian/libopenmpi-dev.install
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/trunk/debian/libopenmpi-dev.install?rev=284&op=diff
==============================================================================
--- openmpi/trunk/debian/libopenmpi-dev.install (original)
+++ openmpi/trunk/debian/libopenmpi-dev.install Mon Nov 7 20:05:50 2011
@@ -1,13 +1,35 @@
+## Compiler wrappers (symlinks) and man pages
+usr/bin/mpic++.openmpi
+usr/share/man/man1/mpic++.openmpi.1
+usr/bin/mpicc.openmpi
+usr/share/man/man1/mpicc.openmpi.1
+usr/bin/mpiCC.openmpi
+# NOTE: mpiCC.openmpi.1 is installed as symlink
+usr/bin/mpicxx.openmpi
+usr/share/man/man1/mpicxx.openmpi.1
+usr/bin/mpif77.openmpi
+usr/share/man/man1/mpif77.openmpi.1
+usr/bin/mpif90.openmpi
+usr/share/man/man1/mpif90.openmpi.1
+usr/bin/opalc++
+# usr/share/man/man1/opalc++.1
+# NOTE: opalc++.1 is not provided upstream in 1.5.4
+usr/bin/opalcc
+usr/share/man/man1/opalcc.1
+usr/bin/ortec++
+# usr/share/man/man1/ortec++.1
+usr/bin/ortecc
+# usr/share/man/man1/ortecc.1
+usr/bin/orteCC
+# Note: There's no man page for ortecc
+## Wrappers and man pages
usr/bin/opal_wrapper
+usr/share/man/man1/opal_wrapper.1
+usr/bin/orte_wrapper_script
+# NOTE: There's no man page for opal_wrapper_script (upstream, lintian warning)
+## Library headers
usr/lib/openmpi/include/*
+## .so symlinks
usr/lib/openmpi/lib/*.so
-usr/share/man/man1/mpicc.openmpi.1
-usr/share/man/man1/mpic++.openmpi.1
-usr/share/man/man1/mpicxx.openmpi.1
-usr/share/man/man1/mpif77.openmpi.1
-usr/share/man/man1/mpif90.openmpi.1
-usr/share/man/man1/opalc++.1
-usr/share/man/man1/opalcc.1
-usr/share/man/man1/opal_wrapper.1
-usr/share/man/man1/ortec++.1
-usr/share/man/man1/ortecc.1
+## pkg-config .pc files
+usr/lib/openmpi/lib/pkgconfig/*.pc
Modified: openmpi/trunk/debian/libopenmpi-dev.links
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/trunk/debian/libopenmpi-dev.links?rev=284&op=diff
==============================================================================
--- openmpi/trunk/debian/libopenmpi-dev.links (original)
+++ openmpi/trunk/debian/libopenmpi-dev.links Mon Nov 7 20:05:50 2011
@@ -1,19 +1,18 @@
-usr/bin/opal_wrapper usr/bin/mpic++.openmpi
-usr/bin/opal_wrapper usr/bin/mpicc.openmpi
-usr/bin/opal_wrapper usr/bin/mpiCC.openmpi
-usr/bin/opal_wrapper usr/bin/mpicxx.openmpi
-usr/bin/opal_wrapper usr/bin/mpif77.openmpi
-usr/bin/opal_wrapper usr/bin/mpif90.openmpi
-usr/bin/opal_wrapper usr/bin/opalc++
-usr/bin/opal_wrapper usr/bin/opalcc
-usr/bin/opal_wrapper usr/bin/ortec++
-usr/bin/opal_wrapper usr/bin/ortecc
+## Man pages (link provided by upstream, needs recreation because of renaming):
usr/share/man/man1/mpic++.openmpi.1 usr/share/man/man1/mpiCC.openmpi.1
-usr/lib/libmca_common_sm.so.1 usr/lib/libmca_common_sm.so
-usr/lib/libopen-pal.so.0 usr/lib/libopen-pal.so
-usr/lib/libopen-rte.so.0 usr/lib/libopen-rte.so
-usr/lib/libmpi_cxx.so.0 usr/lib/libmpi_cxx.so
-usr/lib/libmpi_f77.so.0 usr/lib/libmpi_f77.so
-usr/lib/libmpi_f90.so.0 usr/lib/libmpi_f90.so
-# Convenience link for header files, see bug #493875
+# Missing links
+usr/share/man/man1/opal_wrapper.1 usr/share/man/man1/opalCC.1
+usr/share/man/man1/opal_wrapper.1 usr/share/man/man1/opalc++.1
+usr/share/man/man1/opal_wrapper.1 usr/share/man/man1/orteCC.1
+usr/share/man/man1/opal_wrapper.1 usr/share/man/man1/ortec++.1
+usr/share/man/man1/opal_wrapper.1 usr/share/man/man1/ortecc.1
+## SONAME symlinks
+usr/lib/libmca_common_sm.so.2 usr/lib/libmca_common_sm.so
+usr/lib/libmpi_cxx.so.1 usr/lib/libmpi_cxx.so
+usr/lib/libmpi_f77.so.1 usr/lib/libmpi_f77.so
+usr/lib/libmpi_f90.so.1 usr/lib/libmpi_f90.so
+usr/lib/ompitrace.so.1 usr/lib/libompitrace.so
+usr/lib/libopen-pal.so.2 usr/lib/libopen-pal.so
+usr/lib/libopen-rte.so.2 usr/lib/libopen-rte.so
+## Convenience link for header files, see bug #493875
usr/lib/openmpi/include/ usr/include/openmpi
Copied: openmpi/trunk/debian/libopenmpi2.install (from r283, openmpi/trunk/debian/libopenmpi1.3.install)
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/trunk/debian/libopenmpi2.install?rev=284&op=diff
==============================================================================
--- openmpi/trunk/debian/libopenmpi1.3.install (original)
+++ openmpi/trunk/debian/libopenmpi2.install Mon Nov 7 20:05:50 2011
@@ -1,10 +1,99 @@
-usr/lib/openmpi/lib/libmpi.so.0.0.2
-usr/lib/openmpi/lib/libmpi_cxx.so.0.0.1
-usr/lib/openmpi/lib/libmpi_f77.so.0.0.1
-usr/lib/openmpi/lib/libmpi_f90.so.0.0.1
-usr/lib/openmpi/lib/libopen-pal.so.0.0.0
-usr/lib/openmpi/lib/libopen-rte.so.0.0.0
-usr/lib/openmpi/lib/libopenmpi_malloc.so.0.0.0
-usr/lib/openmpi/lib/libmca_common_sm.so.1.0.0
-usr/lib/openmpi/lib/openmpi/*.so
+## Shared libraries
+usr/lib/openmpi/lib/libmca_common_sm.so.2.0.0
+usr/lib/openmpi/lib/libmpi_cxx.so.1.0.1
+usr/lib/openmpi/lib/libmpi_f77.so.1.0.2
+usr/lib/openmpi/lib/libmpi_f90.so.1.1.0
+usr/lib/openmpi/lib/libmpi.so.1.0.2
+usr/lib/openmpi/lib/libompitrace.so.0.0.0
+usr/lib/openmpi/lib/libopen-pal.so.3.0.0
+usr/lib/openmpi/lib/libopen-rte.so.3.0.0
+## Plugins
+usr/lib/openmpi/lib/openmpi/libompi_dbg_msgq.so
+usr/lib/openmpi/lib/openmpi/mca_allocator_basic.so
+usr/lib/openmpi/lib/openmpi/mca_allocator_bucket.so
+usr/lib/openmpi/lib/openmpi/mca_bml_r2.so
+usr/lib/openmpi/lib/openmpi/mca_btl_ofud.so
+usr/lib/openmpi/lib/openmpi/mca_btl_openib.so
+usr/lib/openmpi/lib/openmpi/mca_btl_self.so
+usr/lib/openmpi/lib/openmpi/mca_btl_sm.so
+usr/lib/openmpi/lib/openmpi/mca_btl_tcp.so
+usr/lib/openmpi/lib/openmpi/mca_carto_auto_detect.so
+usr/lib/openmpi/lib/openmpi/mca_carto_file.so
+usr/lib/openmpi/lib/openmpi/mca_coll_basic.so
+usr/lib/openmpi/lib/openmpi/mca_coll_hierarch.so
+usr/lib/openmpi/lib/openmpi/mca_coll_inter.so
+usr/lib/openmpi/lib/openmpi/mca_coll_self.so
+usr/lib/openmpi/lib/openmpi/mca_coll_sm.so
+usr/lib/openmpi/lib/openmpi/mca_coll_sync.so
+usr/lib/openmpi/lib/openmpi/mca_coll_tuned.so
+usr/lib/openmpi/lib/openmpi/mca_crcp_bkmrk.so
+usr/lib/openmpi/lib/openmpi/mca_crs_none.so
+usr/lib/openmpi/lib/openmpi/mca_crs_self.so
+usr/lib/openmpi/lib/openmpi/mca_dpm_orte.so
+usr/lib/openmpi/lib/openmpi/mca_errmgr_default.so
+usr/lib/openmpi/lib/openmpi/mca_ess_env.so
+usr/lib/openmpi/lib/openmpi/mca_ess_hnp.so
+usr/lib/openmpi/lib/openmpi/mca_ess_singleton.so
+usr/lib/openmpi/lib/openmpi/mca_ess_slave.so
+usr/lib/openmpi/lib/openmpi/mca_ess_slurmd.so
+usr/lib/openmpi/lib/openmpi/mca_ess_slurm.so
+usr/lib/openmpi/lib/openmpi/mca_ess_tm.so
+usr/lib/openmpi/lib/openmpi/mca_ess_tool.so
+usr/lib/openmpi/lib/openmpi/mca_filem_rsh.so
+usr/lib/openmpi/lib/openmpi/mca_grpcomm_bad.so
+usr/lib/openmpi/lib/openmpi/mca_grpcomm_basic.so
+usr/lib/openmpi/lib/openmpi/mca_grpcomm_hier.so
+usr/lib/openmpi/lib/openmpi/mca_iof_hnp.so
+usr/lib/openmpi/lib/openmpi/mca_iof_orted.so
+usr/lib/openmpi/lib/openmpi/mca_iof_tool.so
+usr/lib/openmpi/lib/openmpi/mca_io_romio.so
+usr/lib/openmpi/lib/openmpi/mca_maffinity_first_use.so
+usr/lib/openmpi/lib/openmpi/mca_maffinity_libnuma.so
+usr/lib/openmpi/lib/openmpi/mca_mpool_fake.so
+usr/lib/openmpi/lib/openmpi/mca_mpool_rdma.so
+usr/lib/openmpi/lib/openmpi/mca_mpool_sm.so
+usr/lib/openmpi/lib/openmpi/mca_notifier_command.so
+usr/lib/openmpi/lib/openmpi/mca_notifier_syslog.so
+usr/lib/openmpi/lib/openmpi/mca_odls_default.so
+usr/lib/openmpi/lib/openmpi/mca_oob_tcp.so
+usr/lib/openmpi/lib/openmpi/mca_osc_pt2pt.so
+usr/lib/openmpi/lib/openmpi/mca_osc_rdma.so
+usr/lib/openmpi/lib/openmpi/mca_paffinity_hwloc.so
+usr/lib/openmpi/lib/openmpi/mca_plm_rshd.so
+usr/lib/openmpi/lib/openmpi/mca_plm_rsh.so
+usr/lib/openmpi/lib/openmpi/mca_plm_slurm.so
+usr/lib/openmpi/lib/openmpi/mca_plm_tm.so
+usr/lib/openmpi/lib/openmpi/mca_pml_bfo.so
+usr/lib/openmpi/lib/openmpi/mca_pml_cm.so
+usr/lib/openmpi/lib/openmpi/mca_pml_crcpw.so
+usr/lib/openmpi/lib/openmpi/mca_pml_csum.so
+usr/lib/openmpi/lib/openmpi/mca_pml_ob1.so
+usr/lib/openmpi/lib/openmpi/mca_pml_v.so
+usr/lib/openmpi/lib/openmpi/mca_pstat_linux.so
+usr/lib/openmpi/lib/openmpi/mca_pubsub_orte.so
+usr/lib/openmpi/lib/openmpi/mca_ras_cm.so
+usr/lib/openmpi/lib/openmpi/mca_ras_slurm.so
+usr/lib/openmpi/lib/openmpi/mca_ras_tm.so
+usr/lib/openmpi/lib/openmpi/mca_rcache_vma.so
+usr/lib/openmpi/lib/openmpi/mca_rmaps_load_balance.so
+usr/lib/openmpi/lib/openmpi/mca_rmaps_rank_file.so
+usr/lib/openmpi/lib/openmpi/mca_rmaps_resilient.so
+usr/lib/openmpi/lib/openmpi/mca_rmaps_round_robin.so
+usr/lib/openmpi/lib/openmpi/mca_rmaps_seq.so
+usr/lib/openmpi/lib/openmpi/mca_rmaps_topo.so
+usr/lib/openmpi/lib/openmpi/mca_rmcast_tcp.so
+usr/lib/openmpi/lib/openmpi/mca_rmcast_udp.so
+usr/lib/openmpi/lib/openmpi/mca_rml_ftrm.so
+usr/lib/openmpi/lib/openmpi/mca_rml_oob.so
+usr/lib/openmpi/lib/openmpi/mca_routed_binomial.so
+usr/lib/openmpi/lib/openmpi/mca_routed_cm.so
+usr/lib/openmpi/lib/openmpi/mca_routed_direct.so
+usr/lib/openmpi/lib/openmpi/mca_routed_linear.so
+usr/lib/openmpi/lib/openmpi/mca_routed_radix.so
+usr/lib/openmpi/lib/openmpi/mca_routed_slave.so
+usr/lib/openmpi/lib/openmpi/mca_snapc_full.so
+usr/lib/openmpi/lib/openmpi/mca_sysinfo_linux.so
+usr/lib/openmpi/lib/openmpi/mca_topo_unity.so
+usr/lib/openmpi/lib/openmpi/mca_vprotocol_pessimist.so
+## Other files
usr/lib/openmpi/lib/mpi.mod
Copied: openmpi/trunk/debian/libopenmpi2.links (from r283, openmpi/trunk/debian/libopenmpi1.3.links)
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/trunk/debian/libopenmpi2.links?rev=284&op=diff
==============================================================================
--- openmpi/trunk/debian/libopenmpi1.3.links (original)
+++ openmpi/trunk/debian/libopenmpi2.links Mon Nov 7 20:05:50 2011
@@ -1,16 +1,18 @@
-usr/lib/openmpi/lib/libmca_common_sm.so.1.0.0 usr/lib/libmca_common_sm.so.1.0.0
-usr/lib/openmpi/lib/libopen-pal.so.0.0.0 usr/lib/libopen-pal.so.0.0.0
-usr/lib/openmpi/lib/libopen-rte.so.0.0.0 usr/lib/libopen-rte.so.0.0.0
-usr/lib/openmpi/lib/libopenmpi_malloc.so.0.0.0 usr/lib/libopenmpi_malloc.so.0.0.0
-usr/lib/openmpi/lib/libmpi.so.0.0.2 usr/lib/libmpi.so.0.0.2
-usr/lib/openmpi/lib/libmpi_cxx.so.0.0.1 usr/lib/libmpi_cxx.so.0.0.1
-usr/lib/openmpi/lib/libmpi_f77.so.0.0.1 usr/lib/libmpi_f77.so.0.0.1
-usr/lib/openmpi/lib/libmpi_f90.so.0.0.1 usr/lib/libmpi_f90.so.0.0.1
-usr/lib/libmca_common_sm.so.1.0.0 usr/lib/libmca_common_sm.so.1
-usr/lib/libopen-pal.so.0.0.0 usr/lib/libopen-pal.so.0
-usr/lib/libopen-rte.so.0.0.0 usr/lib/libopen-rte.so.0
-usr/lib/libopenmpi_malloc.so.0.0.0 usr/lib/libopenmpi_malloc.so.0
-usr/lib/libmpi.so.0.0.2 usr/lib/libmpi.so.0
-usr/lib/libmpi_cxx.so.0.0.1 usr/lib/libmpi_cxx.so.0
-usr/lib/libmpi_f77.so.0.0.1 usr/lib/libmpi_f77.so.0
-usr/lib/libmpi_f90.so.0.0.1 usr/lib/libmpi_f90.so.0
+# Compatibility links to /usr/bin
+usr/lib/openmpi/lib/libmca_common_sm.so.2.0.0 usr/lib/libmca_common_sm.so.2.0.0
+usr/lib/openmpi/lib/libmpi_cxx.so.1.0.1 usr/lib/libmpi_cxx.so.1.0.1
+usr/lib/openmpi/lib/libmpi_f77.so.1.0.2 usr/lib/libmpi_f77.so.1.0.2
+usr/lib/openmpi/lib/libmpi_f90.so.1.1.0 usr/lib/libmpi_f90.so.1.1.0
+usr/lib/openmpi/lib/libmpi.so.1.0.2 usr/lib/libmpi.so.1.0.2
+usr/lib/openmpi/lib/libompitrace.so.0.0.0 usr/lib/libompitrace.so.0.0.0
+usr/lib/openmpi/lib/libopen-pal.so.3.0.0 usr/lib/libopen-pal.so.3.0.0
+usr/lib/openmpi/lib/libopen-rte.so.3.0.0 usr/lib/libopen-rte.so.3.0.0
+# SONAME symlinks
+usr/lib/libmca_common_sm.so.2.0.0 usr/lib/libmca_common_sm.so.2
+usr/lib/libmpi_cxx.so.1.0.1 usr/lib/libmpi_cxx.so.1
+usr/lib/libmpi_f77.so.1.0.2 usr/lib/libmpi_f77.so.1
+usr/lib/libmpi_f90.so.1.1.0 usr/lib/libmpi_f90.so.1
+usr/lib/libmpi.so.1.0.2 usr/lib/libmpi.so.1
+usr/lib/libompitrace.so.0.0.0 usr/lib/libompitrace.so.0
+usr/lib/libopen-pal.so.3.0.0 usr/lib/libopen-pal.so.3
+usr/lib/libopen-rte.so.3.0.0 usr/lib/libopen-rte.so.3
Added: openmpi/trunk/debian/libopenmpi2.lintian-overrides
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/trunk/debian/libopenmpi2.lintian-overrides?rev=284&op=file
==============================================================================
--- openmpi/trunk/debian/libopenmpi2.lintian-overrides (added)
+++ openmpi/trunk/debian/libopenmpi2.lintian-overrides Mon Nov 7 20:05:50 2011
@@ -1,0 +1,6 @@
+# Open MPI currently uses it's own (slightly modified) version of libltdl. There
+# is no support for building with libltdl provided by Debian and upstream is not
+# willed to support that (at the moment, at least).
+libopenmpi2 binary: embedded-library usr/lib/openmpi/lib/libmpi.so.1.0.2: ltdl
+libopenmpi2 binary: embedded-library usr/lib/openmpi/lib/libopen-pal.so.3.0.0: ltdl
+libopenmpi2 binary: embedded-library usr/lib/openmpi/lib/libopen-rte.so.3.0.0: ltdl
Modified: openmpi/trunk/debian/openmpi-bin.install
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/trunk/debian/openmpi-bin.install?rev=284&op=diff
==============================================================================
--- openmpi/trunk/debian/openmpi-bin.install (original)
+++ openmpi/trunk/debian/openmpi-bin.install Mon Nov 7 20:05:50 2011
@@ -1,25 +1,19 @@
-etc/*
+## Configuration files
+etc/openmpi/*
+## Executables
usr/bin/ompi-clean
usr/bin/ompi_info
usr/bin/ompi-iof
usr/bin/ompi-ps
usr/bin/ompi-server
-#usr/bin/opari
usr/bin/orte-clean
usr/bin/orted
usr/bin/orte-iof
usr/bin/orte-ps
usr/bin/orterun
-#usr/bin/otf*
-usr/share/man/man1/ompi-clean.1
-usr/share/man/man1/ompi_info.1
-usr/share/man/man1/ompi-iof.1
-usr/share/man/man1/ompi-ps.1
-usr/share/man/man1/ompi-server.1
-#usr/share/man/man1/opari.1
-usr/share/man/man1/orte-clean.1
-usr/share/man/man1/orted.1
-usr/share/man/man1/orte-iof.1
-usr/share/man/man1/orte-ps.1
-usr/share/man/man1/orterun.1
-usr/share/man/man1/mpiexec.openmpi.1
+usr/bin/ompi-probe
+usr/bin/ompi-profiler
+usr/bin/ompi-top
+# orte-bootproxy.sh was renamed to orte-bootproxy in debian/rules
+usr/bin/orte-bootproxy
+usr/bin/orte-top
Added: openmpi/trunk/debian/openmpi-bin.manpages
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/trunk/debian/openmpi-bin.manpages?rev=284&op=file
==============================================================================
--- openmpi/trunk/debian/openmpi-bin.manpages (added)
+++ openmpi/trunk/debian/openmpi-bin.manpages Mon Nov 7 20:05:50 2011
@@ -1,0 +1,17 @@
+debian/tmp/usr/share/man/man1/ompi-clean.1
+debian/tmp/usr/share/man/man1/ompi_info.1
+debian/tmp/usr/share/man/man1/ompi-iof.1
+debian/tmp/usr/share/man/man1/ompi-probe.1
+debian/tmp/usr/share/man/man1/ompi-profiler.1
+debian/tmp/usr/share/man/man1/ompi-ps.1
+debian/tmp/usr/share/man/man1/ompi-server.1
+debian/tmp/usr/share/man/man1/ompi-top.1
+debian/tmp/usr/share/man/man1/orte-clean.1
+debian/tmp/usr/share/man/man1/orted.1
+debian/tmp/usr/share/man/man1/orte-iof.1
+debian/tmp/usr/share/man/man1/orte-ps.1
+debian/tmp/usr/share/man/man1/orte-top.1
+# Note: Those are identical and could by symlinked
+debian/tmp/usr/share/man/man1/orterun.1
+debian/tmp/usr/share/man/man1/mpiexec.openmpi.1
+debian/tmp/usr/share/man/man1/mpirun.openmpi.1
Modified: openmpi/trunk/debian/openmpi-checkpoint.install
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/trunk/debian/openmpi-checkpoint.install?rev=284&op=diff
==============================================================================
--- openmpi/trunk/debian/openmpi-checkpoint.install (original)
+++ openmpi/trunk/debian/openmpi-checkpoint.install Mon Nov 7 20:05:50 2011
@@ -1,15 +1,9 @@
+## Binaries
+usr/bin/ompi-checkpoint
+usr/bin/ompi-restart
+usr/bin/opal-checkpoint
+usr/bin/opal-restart
usr/bin/orte-checkpoint
usr/bin/orte-restart
-usr/bin/opal-checkpoint
-usr/bin/opal-restart
-usr/share/man/man1/ompi-checkpoint.1
-usr/share/man/man1/ompi-restart.1
-usr/share/man/man1/opal-checkpoint.1
-usr/share/man/man1/opal-restart.1
-usr/share/man/man1/orte-checkpoint.1
-usr/share/man/man1/orte-restart.1
-usr/share/man/man7/ompi_crcp.7
-usr/share/man/man7/opal_crs.7
-usr/share/man/man7/orte_filem.7
-usr/share/man/man7/orte_snapc.7
+## BLCR plugin
usr/lib/openmpi/lib/openmpi/mca_crs_blcr.so
Modified: openmpi/trunk/debian/openmpi-checkpoint.links
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/trunk/debian/openmpi-checkpoint.links?rev=284&op=diff
==============================================================================
--- openmpi/trunk/debian/openmpi-checkpoint.links (original)
+++ openmpi/trunk/debian/openmpi-checkpoint.links Mon Nov 7 20:05:50 2011
@@ -1,2 +1,2 @@
-usr/bin/orte-checkpoint usr/bin/ompi-checkpoint
-usr/bin/orte-restart usr/bin/ompi-restart
+#usr/bin/orte-checkpoint usr/bin/ompi-checkpoint
+#usr/bin/orte-restart usr/bin/ompi-restart
Added: openmpi/trunk/debian/openmpi-checkpoint.manpages
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/trunk/debian/openmpi-checkpoint.manpages?rev=284&op=file
==============================================================================
--- openmpi/trunk/debian/openmpi-checkpoint.manpages (added)
+++ openmpi/trunk/debian/openmpi-checkpoint.manpages Mon Nov 7 20:05:50 2011
@@ -1,0 +1,8 @@
+debian/tmp/usr/share/man/man1/ompi-checkpoint.1
+debian/tmp/usr/share/man/man1/ompi-restart.1
+debian/tmp/usr/share/man/man1/opal-checkpoint.1
+debian/tmp/usr/share/man/man1/opal-restart.1
+debian/tmp/usr/share/man/man1/orte-checkpoint.1
+debian/tmp/usr/share/man/man1/orte-restart.1
+debian/tmp/usr/share/man/man7/ompi_crcp.7
+debian/tmp/usr/share/man/man7/opal_crs.7
Modified: openmpi/trunk/debian/openmpi-common.install
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/trunk/debian/openmpi-common.install?rev=284&op=diff
==============================================================================
--- openmpi/trunk/debian/openmpi-common.install (original)
+++ openmpi/trunk/debian/openmpi-common.install Mon Nov 7 20:05:50 2011
@@ -1,1 +1,4 @@
+## Aggregate MCA (AMCA) Parameter Sets
+usr/share/openmpi/amca-param-sets/*
+## Help files and other stuff
usr/share/openmpi/*
Modified: openmpi/trunk/debian/openmpi-doc.install
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/trunk/debian/openmpi-doc.install?rev=284&op=diff
==============================================================================
--- openmpi/trunk/debian/openmpi-doc.install (original)
+++ openmpi/trunk/debian/openmpi-doc.install Mon Nov 7 20:05:50 2011
@@ -1,2 +1,3 @@
-usr/share/man/man3/*
-usr/share/man/man7/orte_hosts.7
+#usr/share/man/man7/orte_filem.7
+#usr/share/man/man7/orte_hosts.7
+#usr/share/man/man7/orte_snapc.7
Added: openmpi/trunk/debian/openmpi-doc.manpages
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/trunk/debian/openmpi-doc.manpages?rev=284&op=file
==============================================================================
--- openmpi/trunk/debian/openmpi-doc.manpages (added)
+++ openmpi/trunk/debian/openmpi-doc.manpages Mon Nov 7 20:05:50 2011
@@ -1,0 +1,3 @@
+debian/tmp/usr/share/man/man7/orte_filem.7
+debian/tmp/usr/share/man/man7/orte_hosts.7
+debian/tmp/usr/share/man/man7/orte_snapc.7
Modified: openmpi/trunk/debian/patches/build_hurd
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/trunk/debian/patches/build_hurd?rev=284&op=diff
==============================================================================
--- openmpi/trunk/debian/patches/build_hurd (original)
+++ openmpi/trunk/debian/patches/build_hurd Mon Nov 7 20:05:50 2011
@@ -34,27 +34,9 @@
}
pid = getpid();
-@@ -138,9 +143,17 @@
- fprintf(stderr, "[%s:%d] Abort %s completed successfully; not able to guarantee that all other processes were killed!\n",
- host, (int) pid, ompi_mpi_finalized ?
- "after MPI_FINALIZE" : "before MPI_INIT");
-+ if (free_host) {
-+ free(host);
-+ }
- exit(errcode);
- }
-
-+ if (free_host) {
-+ free(host);
-+ host = NULL;
-+ }
-+
- /* abort local procs in the communicator. If the communicator is
- an intercommunicator AND the abort has explicitly requested
- that we abort the remote procs, then do that as well. */
--- a/ompi/runtime/ompi_mpi_finalize.c
+++ b/ompi/runtime/ompi_mpi_finalize.c
-@@ -100,13 +100,18 @@
+@@ -101,13 +101,18 @@
/* Note that if we're already finalized, we cannot raise an
MPI exception. The best that we can do is write something
to stderr. */
@@ -77,7 +59,7 @@
--- a/opal/mca/base/mca_base_component_find.c
+++ b/opal/mca/base/mca_base_component_find.c
-@@ -205,11 +205,16 @@
+@@ -208,11 +208,16 @@
}
if (opal_list_get_end(found_components) == item) {
@@ -114,37 +96,9 @@
opal_output(0, "Error: Unable to get the current working directory\n");
cwd = strdup(".");
}
---- a/opal/mca/paffinity/darwin/configure.m4
-+++ b/opal/mca/paffinity/darwin/configure.m4
-@@ -23,9 +23,9 @@
- # -----------------------------------------------------------
- AC_DEFUN([MCA_paffinity_darwin_CONFIG],[
- OMPI_VAR_SCOPE_PUSH([paff_darwin_happy])
-- # check to see if we have <mach/mach_host.h>
-+ # check to see if we have <mach-o/arch.h>
- # as this is a Darwin-specific thing
-- AC_CHECK_HEADER([mach/mach_host.h], [paff_darwin_happy=yes], [paff_darwin_happy=no])
-+ AC_CHECK_HEADER([mach-o/arch.h], [paff_darwin_happy=yes], [paff_darwin_happy=no])
-
- AS_IF([test "$paff_darwin_happy" = "yes"], [$1], [$2])
- OMPI_VAR_SCOPE_POP
--- a/opal/util/stacktrace.c
+++ b/opal/util/stacktrace.c
-@@ -363,6 +363,13 @@
- fflush(stderr);
- }
-
-+#ifndef SA_SIGINFO
-+static void show_stackframe_handler (int signo)
-+{
-+ show_stackframe(signo, NULL, NULL);
-+}
-+
-+#endif /* SA_SIGINFO */
- #endif /* OMPI_WANT_PRETTY_PRINT_STACKTRACE && ! defined(__WINDOWS__) */
-
-
-@@ -422,8 +429,12 @@
+@@ -444,8 +444,12 @@
mca_base_param_lookup_string (param, &string_value);
memset(&act, 0, sizeof(act));
@@ -159,9 +113,9 @@
#else
--- a/orte/mca/odls/base/odls_base_default_fns.c
+++ b/orte/mca/odls/base/odls_base_default_fns.c
-@@ -851,8 +851,13 @@
- orte_odls_job_t *jobdat;
- orte_pmap_t *pmap;
+@@ -1338,8 +1338,13 @@
+ orte_local_rank_t local_rank;
+ orte_node_rank_t node_rank;
char *pathenv = NULL, *mpiexec_pathenv = NULL;
+#if !defined(MAXPATHLEN) && defined(__GLIBC__)
+ char *basedir=NULL;
@@ -173,19 +127,7 @@
char **argvptr;
char *full_search;
char **argvsav=NULL;
-@@ -865,7 +870,11 @@
- * bouncing around as we execute various apps, but we will always return
- * to this place as our default directory
- */
-+#if !defined(MAXPATHLEN) && defined(__GLIBC__)
-+ basedir = get_current_dir_name();
-+#else
- getcwd(basedir, sizeof(basedir));
-+#endif
-
- /* find the jobdat for this job */
- jobdat = NULL;
-@@ -1016,7 +1025,11 @@
+@@ -1593,7 +1598,11 @@
* again not match getcwd! This is beyond our control - we are only
* ensuring they start out matching.
*/
@@ -197,8 +139,8 @@
opal_setenv("PWD", dir, true, &app->env);
/* Search for the OMPI_exec_path and PATH settings in the environment. */
-@@ -1365,6 +1378,10 @@
-
+@@ -2090,6 +2099,10 @@
+ GETOUT:
opal_condition_signal(&orte_odls_globals.cond);
OPAL_THREAD_UNLOCK(&orte_odls_globals.mutex);
+#if !defined(MAXPATHLEN) && defined(__GLIBC__)
@@ -210,7 +152,7 @@
--- a/orte/orted/orted_main.c
+++ b/orte/orted/orted_main.c
-@@ -199,7 +199,7 @@
+@@ -227,7 +227,7 @@
int ret = 0;
int fd;
opal_cmd_line_t *cmd_line = NULL;
@@ -219,15 +161,7 @@
char *jobidstring;
char *rml_uri;
int i;
-@@ -445,6 +445,7 @@
- }
-
- /* define a log file name in the session directory */
-+ log_file = malloc(strlen(jobidstring) + strlen(orte_process_info.nodename) + 19);
- sprintf(log_file, "output-orted-%s-%s.log",
- jobidstring, orte_process_info.nodename);
- log_path = opal_os_path(false,
-@@ -452,6 +453,7 @@
+@@ -489,6 +489,7 @@
orte_process_info.top_session_dir,
log_file,
NULL);
@@ -237,7 +171,7 @@
if (fd < 0) {
--- a/orte/util/context_fns.c
+++ b/orte/util/context_fns.c
-@@ -56,10 +56,12 @@
+@@ -55,10 +55,12 @@
{
bool good = true;
const char *tmp;
Modified: openmpi/trunk/debian/patches/manpage_macros
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/trunk/debian/patches/manpage_macros?rev=284&op=diff
==============================================================================
--- openmpi/trunk/debian/patches/manpage_macros (original)
+++ openmpi/trunk/debian/patches/manpage_macros Mon Nov 7 20:05:50 2011
@@ -3,7 +3,7 @@
choke and probably should not be there anyway.
Author: Manuel Prinz <manuel at debian.org>
Forwarded: yes
-Last-Update: 2010-10-09
+Last-Update: 2011-09-13
--- a/orte/tools/orterun/orterun.1in
+++ b/orte/tools/orterun/orterun.1in
@@ -12,10 +12,3 @@
.\" Copyright (c) 2009 Cisco Systems, Inc. All rights reserved.
.\" Copyright (c) 2008-2009 Sun Microsystems, Inc. All rights reserved.
.\" Copyright (c) 2010 Cisco Systems, Inc. All rights reserved.
---- a/ompi/mpi/man/man3/MPI_Init_thread.3in
-+++ b/ompi/mpi/man/man3/MPI_Init_thread.3in
-@@ -1,4 +1,3 @@
--. -*- nroff -*-
- .\"Copyright 2006-2008 Sun Microsystems, Inc.
- .\" Copyright (c) 1996 Thinking Machines Corporation
- .\" Copyright (c) 2010 Cisco Systems, Inc. All rights reserved.
Added: openmpi/trunk/debian/patches/ompi_autogen_sh.patch
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/trunk/debian/patches/ompi_autogen_sh.patch?rev=284&op=file
==============================================================================
--- openmpi/trunk/debian/patches/ompi_autogen_sh.patch (added)
+++ openmpi/trunk/debian/patches/ompi_autogen_sh.patch Mon Nov 7 20:05:50 2011
@@ -1,0 +1,12 @@
+--- a/autogen.sh
++++ b/autogen.sh
+@@ -664,6 +664,9 @@
+ touch -r aclocal.m4 config/libtool.m4
+ fi
+
++ # Ensure libtool.m4 is very old so that make does not rebuild aclocal.m4
++ touch -t 197001010000.00 config/libtool.m4
++
+ run_and_check $ompi_autoconf
+
+ run_and_check $ompi_automake --foreign -a --copy --include-deps
Modified: openmpi/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/trunk/debian/patches/series?rev=284&op=diff
==============================================================================
--- openmpi/trunk/debian/patches/series (original)
+++ openmpi/trunk/debian/patches/series Mon Nov 7 20:05:50 2011
@@ -1,5 +1,7 @@
+ompi_autogen_sh.patch
build_hurd
manpage_macros
-arm_support
-openmpi-link-fix
-
+# ARM support is incorporated upstream
+#arm_support
+# Link fix is obsolete, since we do not ship .la files anymore
+#openmpi-link-fix
Modified: openmpi/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/trunk/debian/rules?rev=284&op=diff
==============================================================================
--- openmpi/trunk/debian/rules (original)
+++ openmpi/trunk/debian/rules Mon Nov 7 20:05:50 2011
@@ -1,192 +1,81 @@
#!/usr/bin/make -f
-#include /usr/share/dpatch/dpatch.make
-include /usr/share/quilt/quilt.make
-
-# These are used for cross-compiling and for saving the configure script
-# from having to guess our platform (since we know it already)
-DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-DEB_HOST_GNU_CPU ?= $(shell dpkg-architecture -qDEB_HOST_GNU_CPU)
-
-CFLAGS = -Wall -g
-
-ifneq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE))
- CROSS= --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
-else
- CROSS= --build $(DEB_BUILD_GNU_TYPE)
-endif
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
- CFLAGS += -O0
-else
- CFLAGS += -O2
-endif
+# export DH_VERBOSE=1
ifeq (sparc,$(DEB_HOST_GNU_CPU))
CFLAGS += -mcpu=v9
endif
# BLCR checkpointing support
-BLCR_ARCH = "amd64 armel i386 powerpc"
+BLCR_ARCH := "amd64 armel i386 powerpc"
ifneq (,$(findstring $(DEB_HOST_ARCH),$(BLCR_ARCH)))
CHKPT = --with-ft=cr --with-blcr=/usr --with-blcr-libdir=/usr/lib
endif
# Memory affinity support
-NUMA_ARCH = "amd64 i386 ia64 mips mipsel powerpc"
+NUMA_ARCH := "amd64 i386 ia64 mips mipsel powerpc"
ifneq (,$(findstring $(DEB_HOST_ARCH),$(NUMA_ARCH)))
NUMA = --with-libnuma=/usr --with-libnuma-libdir=/usr/lib
endif
-# Torque support. Does not build on HURD currently,
-# should be fine on all other arches.
-ifneq (hurd-i386,$(DEB_HOST_ARCH))
- TORQUE=--with-tm
-endif
+# TODO: GridEngine support. Some files do not install correctly.
-COMMON_CONFIG_PARAMS = \
- $(CROSS) \
- $(CHKPT) \
- $(NUMA) \
- --prefix=/usr \
- --mandir=\$${prefix}/share/man \
- --infodir=\$${prefix}/share/info \
- --sysconfdir=/etc/openmpi \
- --libdir=\$${prefix}/lib/openmpi/lib \
- --includedir=\$${prefix}/lib/openmpi/include \
- --with-devel-headers \
- --enable-heterogeneous \
- $(TORQUE)
+# Flags for the static build: see bug #502232
+#STATIC_CONFIG_PARAMS = --enable-static
+
+%:
+ dh $@ --parallel #--with autotools_dev
+
+override_dh_auto_configure:
+ dh_auto_configure -- \
+ $(CHKPT) $(NUMA) $(TORQUE) \
+ --with-devel-headers \
+ --enable-heterogeneous \
+ --disable-vt \
+ --sysconfdir=/etc/openmpi \
+ --libdir=\$${prefix}/lib/openmpi/lib \
+ --includedir=\$${prefix}/lib/openmpi/include
# Thread support disabled because it's broken, see bug #435581
# --enable-mpi-threads \
# --enable-progress-threads
-# Flags for the static build: see bug #502232
-STATIC_CONFIG_PARAMS = --enable-static
+override_dh_install:
+# Strip rpath info from all executables and libraries.
+ find debian/tmp/ -type f -perm -+x -a ! -name '*.la' -a ! -name '*.mod' -exec chrpath -d '{}' \;
+# Empty dependency_libs in all .la files.
+ find debian/tmp/ -type f -name '*.la' -exec sed -i "s,^dependency_libs=.*,dependency_libs=''," '{}' \;
+# Rename the compiler and startup wrappers.
+## for f in mpic++ mpicc mpiCC mpicxx mpiexec mpif77 mpif90 mpirun opalc++ opalcc ortec++ ortecc orteCC ; do \ ##
+ for f in mpic++ mpicc mpiCC mpicxx mpiexec mpif77 mpif90 mpirun ; do \
+ mv debian/tmp/usr/bin/$${f} debian/tmp/usr/bin/$${f}.openmpi ; \
+ done
+# Rename the compiler wrapper man pages.
+ for f in mpic++ mpicc mpicxx mpiexec mpif77 mpif90 mpirun ; do \
+ mv debian/tmp/usr/share/man/man1/$${f}.1 debian/tmp/usr/share/man/man1/$${f}.openmpi.1 ; \
+ done
+# Rename orte-bootproxy.sh to orte-bootproxy
+ mv debian/tmp/usr/bin/orte-bootproxy.sh debian/tmp/usr/bin/orte-bootproxy
+# Remove dangling symlink(s)
+ rm -f debian/tmp/usr/share/man/man1/mpiCC.1
+ rm -f debian/tmp/usr/share/man/man1/orteCC.1
+# Remove COPYRIGHT file of ptmalloc2. It's reproduced in debian/copyright.
+ rm -f -r debian/tmp/usr/share/openmpi/doc/
+# Continue as usual
+ dh_install
-.PHONY: autoreconf
-autoreconf: patch autoreconf-stamp
-autoreconf-stamp:
- dh_testdir
- ./autogen.sh
- autoreconf
- touch $@
+override_dh_fixperms:
+ chmod 0644 debian/libopenmpi2/usr/lib/openmpi/lib/mpi.mod
+ dh_fixperms
-.PHONY: build
-build: build-shared build-static
+override_dh_installdocs:
+ dh_installdocs --all AUTHORS NEWS README
-build-shared: autoreconf build-shared-stamp
-build-shared-stamp:
- dh_testdir
- mkdir -p build/shared
- (cd build/shared && LDFLAGS="" CFLAGS="$(CFLAGS)" ../../configure $(COMMON_CONFIG_PARAMS))
- $(MAKE) -C build/shared
- touch $@
+#override_dh_shlibdeps:
+# export LD_LIBRARY_PATH="$(CURDIR)/debian/tmp/usr/lib/openmpi/lib"
+# dh_shlibdeps -Llibopenmpi2
-build-static: autoreconf build-static-stamp
-build-static-stamp:
- dh_testdir
- mkdir -p build/static
- (cd build/static && LDFLAGS="" CFLAGS="$(CFLAGS)" ../../configure $(COMMON_CONFIG_PARAMS) $(STATIC_CONFIG_PARAMS))
- $(MAKE) -C build/static
- touch $@
+override_dh_strip:
+ dh_strip --dbg-package=libopenmpi-dbg
-# Everything is built in the "build" target
-build-arch: build
-build-indep: build
-
-check: check-stamp build
-check-stamp:
-ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
- -$(MAKE) check
-endif
- touch $@
-
-clean: clean-work unpatch
-clean-work:
- dh_testdir
- dh_testroot
- rm -rf configure-stamp build/ build-shared-stamp build-static-stamp check-stamp autoreconf-stamp
- rm -rf check debian/openmpi
- xargs rm -f < debian/clean_symlinks
- [ ! -f Makefile ] || $(MAKE) distclean
- # some additional cleanups
- rm -rf opal/libltdl/.libs
- dh_clean
-
-install-indep: build-indep check
- dh_testdir
- dh_testroot
- dh_clean -k -i
- dh_installdirs -i
- dh_install -i --sourcedir=$(CURDIR)/debian/openmpi
-
-install-arch: build-arch check
- dh_testdir
- dh_testroot
- dh_clean -k -s
- $(MAKE) -C build/static install DESTDIR=$(CURDIR)/debian/libopenmpi-dev/
- $(MAKE) -C build/shared install DESTDIR=$(CURDIR)/debian/openmpi/
- rm -rf $(CURDIR)/debian/libopenmpi-dev/usr/lib/openmpi/include/ $(CURDIR)/debian/libopenmpi-dev/etc/ $(CURDIR)/debian/libopenmpi-dev/usr/share/ $(CURDIR)/debian/libopenmpi-dev/usr/bin/
- rm -f $(CURDIR)/debian/libopenmpi-dev/usr/lib/openmpi/lib/mpi.mod
- find $(CURDIR)/debian/libopenmpi-dev/ -name '*\.so*' -exec rm -f '{}' \;
-
- # Strip rpath info from all executables and libraries
- find debian/openmpi/ -type f -perm -+x -a ! -name '*.la' -a ! -name '*.mod' -exec chrpath -d '{}' \;
- for f in mpic++ mpicc mpicxx mpiexec mpif77 mpif90 ; do \
- cp debian/openmpi/usr/share/man/man1/$${f}.1 debian/openmpi/usr/share/man/man1/$${f}.openmpi.1 ; \
- done
-
- # Empty dependency_libs in all .la files. This is part of the "Remove
- # .la files" release goal for Squeeze.
- find debian/libopenmpi-dev/ -type f -name '*.la' -exec sed -i "s,^dependency_libs=.*,dependency_libs=''," '{}' \;
-
- chmod 644 debian/openmpi/usr/lib/openmpi/lib/mpi.mod
- sed -i 's/3OpenMPI/3/' debian/openmpi/usr/share/man/man3/*.3
-
- dh_install -s --sourcedir=$(CURDIR)/debian/openmpi --list-missing
- # This gets installed by the wildcard, but we want to remove it really, so it's only used for checkpointing
- -rm -f debian/libopenmpi*/usr/lib/openmpi/lib/openmpi/mca_crs_blcr.so
-
-binary-indep: install-indep
- dh_testdir -i
- dh_testroot -i
- dh_installchangelogs -i
- dh_installdocs --all AUTHORS NEWS README
- dh_installexamples -popenmpi-doc examples/*
- dh_installman -i
- dh_link -i
- dh_strip -i
- dh_compress -i
- dh_fixperms -i
- dh_makeshlibs -i
- dh_installdeb -i
- dh_shlibdeps -i
- dh_gencontrol -i
- dh_md5sums -i
- dh_builddeb -i
-
-binary-arch: install-arch
- dh_testdir -a
- dh_testroot -a
- dh_installchangelogs -a
- dh_installdocs --all AUTHORS NEWS README
- dh_installexamples -a
- dh_installman -a
- dh_link -a
- dh_strip -a --dbg-package=libopenmpi-dbg
- dh_compress -a
- dh_fixperms -a
- dh_makeshlibs -plibopenmpi1.3
- dh_makeshlibs -n -plibopenmpi-dev
- dh_installdeb -a
- dh_shlibdeps -a -l$(CURDIR)/debian/openmpi/usr/lib/openmpi/lib -Llibopenmpi1.3
- dh_gencontrol -a
- dh_md5sums -a
- dh_builddeb -a
-
-binary: binary-arch binary-indep
-
-.PHONY: binary binary-arch binary-indep build-arch build-indep clean install-arch install-indep
+override_dh_auto_test:
Modified: openmpi/trunk/debian/watch
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/trunk/debian/watch?rev=284&op=diff
==============================================================================
--- openmpi/trunk/debian/watch (original)
+++ openmpi/trunk/debian/watch Mon Nov 7 20:05:50 2011
@@ -1,2 +1,2 @@
version=3
-http://www.open-mpi.org/software/ompi/v1.4/ .*/openmpi-([\d+\.]+)\.tar\.gz
+http://www.open-mpi.org/software/ompi/v1.5/ .*/openmpi-([\d+\.]+)\.tar\.gz
More information about the Pkg-openmpi-commits
mailing list