[Pkg-openmpi-commits] r301 - in /openmpi/branches/1.4: ./ debian/ debian/patches/ debian/source/
sylvestre at users.alioth.debian.org
sylvestre at users.alioth.debian.org
Tue May 15 15:38:21 UTC 2012
Author: sylvestre
Date: Tue May 15 15:38:21 2012
New Revision: 301
URL: http://svn.debian.org/wsvn/pkg-openmpi/?sc=1&rev=301
Log:
* New upstream release
* Switch to dpkg-source 3.0 (quilt) format
* Refresh of the patches
* Standards-Version updated to version 3.9.3
Added:
openmpi/branches/1.4/
- copied from r298, openmpi/tags/1.4.3-2/
openmpi/branches/1.4/debian/patches/missinglib.diff
openmpi/branches/1.4/debian/source/
openmpi/branches/1.4/debian/source/format
Modified:
openmpi/branches/1.4/debian/changelog
openmpi/branches/1.4/debian/control
openmpi/branches/1.4/debian/libopenmpi1.3.install
openmpi/branches/1.4/debian/libopenmpi1.3.links
openmpi/branches/1.4/debian/patches/build_hurd
openmpi/branches/1.4/debian/patches/manpage_macros
openmpi/branches/1.4/debian/patches/series
Modified: openmpi/branches/1.4/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/branches/1.4/debian/changelog?rev=301&op=diff
==============================================================================
--- openmpi/branches/1.4/debian/changelog (original)
+++ openmpi/branches/1.4/debian/changelog Tue May 15 15:38:21 2012
@@ -1,3 +1,12 @@
+openmpi (1.4.5-1) unstable; urgency=low
+
+ * New upstream release
+ * Switch to dpkg-source 3.0 (quilt) format
+ * Refresh of the patches
+ * Standards-Version updated to version 3.9.3
+
+ -- Sylvestre Ledru <sylvestre at debian.org> Wed, 22 Feb 2012 17:17:31 +0100
+
openmpi (1.4.3-2) unstable; urgency=low
* Fixed symlinks for shared libraries. Thanks to Matthias Klose
Modified: openmpi/branches/1.4/debian/control
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/branches/1.4/debian/control?rev=301&op=diff
==============================================================================
--- openmpi/branches/1.4/debian/control (original)
+++ openmpi/branches/1.4/debian/control Tue May 15 15:38:21 2012
@@ -5,7 +5,7 @@
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
-Standards-Version: 3.9.1
+Standards-Version: 3.9.3
Vcs-Svn: svn://svn.debian.org/svn/pkg-openmpi/openmpi/trunk/
Vcs-Browser: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/trunk/
Modified: openmpi/branches/1.4/debian/libopenmpi1.3.install
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/branches/1.4/debian/libopenmpi1.3.install?rev=301&op=diff
==============================================================================
--- openmpi/branches/1.4/debian/libopenmpi1.3.install (original)
+++ openmpi/branches/1.4/debian/libopenmpi1.3.install Tue May 15 15:38:21 2012
@@ -1,10 +1,10 @@
-usr/lib/openmpi/lib/libmpi.so.0.0.2
+usr/lib/openmpi/lib/libmpi.so.0.0.4
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/libmpi_f77.so.0.0.3
+usr/lib/openmpi/lib/libmpi_f90.so.0.1.0
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/libmca_common_sm.so.1.0.2
usr/lib/openmpi/lib/openmpi/*.so
usr/lib/openmpi/lib/mpi.mod
Modified: openmpi/branches/1.4/debian/libopenmpi1.3.links
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/branches/1.4/debian/libopenmpi1.3.links?rev=301&op=diff
==============================================================================
--- openmpi/branches/1.4/debian/libopenmpi1.3.links (original)
+++ openmpi/branches/1.4/debian/libopenmpi1.3.links Tue May 15 15:38:21 2012
@@ -1,16 +1,16 @@
-usr/lib/openmpi/lib/libmca_common_sm.so.1.0.0 usr/lib/libmca_common_sm.so.1.0.0
+usr/lib/openmpi/lib/libmca_common_sm.so.1.0.2 usr/lib/libmca_common_sm.so.1.0.2
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.so.0.0.4 usr/lib/libmpi.so.0.0.4
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/openmpi/lib/libmpi_f77.so.0.0.3 usr/lib/libmpi_f77.so.0.0.3
+usr/lib/openmpi/lib/libmpi_f90.so.0.1.0 usr/lib/libmpi_f90.so.0.1.0
+usr/lib/libmca_common_sm.so.1.0.2 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.so.0.0.4 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
+usr/lib/libmpi_f77.so.0.0.3 usr/lib/libmpi_f77.so.0
+usr/lib/libmpi_f90.so.0.1.0 usr/lib/libmpi_f90.so.0
Modified: openmpi/branches/1.4/debian/patches/build_hurd
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/branches/1.4/debian/patches/build_hurd?rev=301&op=diff
==============================================================================
--- openmpi/branches/1.4/debian/patches/build_hurd (original)
+++ openmpi/branches/1.4/debian/patches/build_hurd Tue May 15 15:38:21 2012
@@ -4,8 +4,10 @@
Forwarded: yes
Last-Update: 2010-07-20
---- a/ompi/runtime/ompi_mpi_abort.c
-+++ b/ompi/runtime/ompi_mpi_abort.c
+Index: openmpi-1.4.5/ompi/runtime/ompi_mpi_abort.c
+===================================================================
+--- openmpi-1.4.5.orig/ompi/runtime/ompi_mpi_abort.c 2009-12-08 21:36:11.000000000 +0100
++++ openmpi-1.4.5/ompi/runtime/ompi_mpi_abort.c 2012-02-22 17:14:09.000000000 +0100
@@ -53,10 +53,11 @@
bool kill_remote_of_intercomm)
{
@@ -52,8 +54,10 @@
/* 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
+Index: openmpi-1.4.5/ompi/runtime/ompi_mpi_finalize.c
+===================================================================
+--- openmpi-1.4.5.orig/ompi/runtime/ompi_mpi_finalize.c 2009-12-08 21:36:11.000000000 +0100
++++ openmpi-1.4.5/ompi/runtime/ompi_mpi_finalize.c 2012-02-22 17:14:09.000000000 +0100
@@ -100,13 +100,18 @@
/* Note that if we're already finalized, we cannot raise an
MPI exception. The best that we can do is write something
@@ -75,8 +79,10 @@
return MPI_ERR_OTHER;
}
---- a/opal/mca/base/mca_base_component_find.c
-+++ b/opal/mca/base/mca_base_component_find.c
+Index: openmpi-1.4.5/opal/mca/base/mca_base_component_find.c
+===================================================================
+--- openmpi-1.4.5.orig/opal/mca/base/mca_base_component_find.c 2010-08-24 23:00:31.000000000 +0200
++++ openmpi-1.4.5/opal/mca/base/mca_base_component_find.c 2012-02-22 17:14:09.000000000 +0100
@@ -205,11 +205,16 @@
}
@@ -96,8 +102,10 @@
return OPAL_ERR_NOT_FOUND;
}
}
---- a/opal/mca/base/mca_base_param.c
-+++ b/opal/mca/base/mca_base_param.c
+Index: openmpi-1.4.5/opal/mca/base/mca_base_param.c
+===================================================================
+--- openmpi-1.4.5.orig/opal/mca/base/mca_base_param.c 2009-12-08 21:36:07.000000000 +0100
++++ openmpi-1.4.5/opal/mca/base/mca_base_param.c 2012-02-22 17:14:09.000000000 +0100
@@ -186,8 +186,14 @@
home = (char*)opal_home_directory();
@@ -114,8 +122,10 @@
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
+Index: openmpi-1.4.5/opal/mca/paffinity/darwin/configure.m4
+===================================================================
+--- openmpi-1.4.5.orig/opal/mca/paffinity/darwin/configure.m4 2009-12-08 21:36:06.000000000 +0100
++++ openmpi-1.4.5/opal/mca/paffinity/darwin/configure.m4 2012-02-22 17:14:09.000000000 +0100
@@ -23,9 +23,9 @@
# -----------------------------------------------------------
AC_DEFUN([MCA_paffinity_darwin_CONFIG],[
@@ -128,8 +138,10 @@
AS_IF([test "$paff_darwin_happy" = "yes"], [$1], [$2])
OMPI_VAR_SCOPE_POP
---- a/opal/util/stacktrace.c
-+++ b/opal/util/stacktrace.c
+Index: openmpi-1.4.5/opal/util/stacktrace.c
+===================================================================
+--- openmpi-1.4.5.orig/opal/util/stacktrace.c 2010-04-13 19:30:27.000000000 +0200
++++ openmpi-1.4.5/opal/util/stacktrace.c 2012-02-22 17:14:09.000000000 +0100
@@ -363,6 +363,13 @@
fflush(stderr);
}
@@ -157,8 +169,10 @@
#ifdef SA_ONESHOT
act.sa_flags |= SA_ONESHOT;
#else
---- a/orte/mca/odls/base/odls_base_default_fns.c
-+++ b/orte/mca/odls/base/odls_base_default_fns.c
+Index: openmpi-1.4.5/orte/mca/odls/base/odls_base_default_fns.c
+===================================================================
+--- openmpi-1.4.5.orig/orte/mca/odls/base/odls_base_default_fns.c 2011-09-06 16:25:54.000000000 +0200
++++ openmpi-1.4.5/orte/mca/odls/base/odls_base_default_fns.c 2012-02-22 17:14:09.000000000 +0100
@@ -851,8 +851,13 @@
orte_odls_job_t *jobdat;
orte_pmap_t *pmap;
@@ -208,8 +222,10 @@
return rc;
}
---- a/orte/orted/orted_main.c
-+++ b/orte/orted/orted_main.c
+Index: openmpi-1.4.5/orte/orted/orted_main.c
+===================================================================
+--- openmpi-1.4.5.orig/orte/orted/orted_main.c 2010-04-13 19:30:34.000000000 +0200
++++ openmpi-1.4.5/orte/orted/orted_main.c 2012-02-22 17:14:09.000000000 +0100
@@ -199,7 +199,7 @@
int ret = 0;
int fd;
@@ -235,8 +251,10 @@
fd = open(log_path, O_RDWR|O_CREAT|O_TRUNC, 0640);
if (fd < 0) {
---- a/orte/util/context_fns.c
-+++ b/orte/util/context_fns.c
+Index: openmpi-1.4.5/orte/util/context_fns.c
+===================================================================
+--- openmpi-1.4.5.orig/orte/util/context_fns.c 2009-12-08 21:36:44.000000000 +0100
++++ openmpi-1.4.5/orte/util/context_fns.c 2012-02-22 17:14:09.000000000 +0100
@@ -56,10 +56,12 @@
{
bool good = true;
Modified: openmpi/branches/1.4/debian/patches/manpage_macros
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/branches/1.4/debian/patches/manpage_macros?rev=301&op=diff
==============================================================================
--- openmpi/branches/1.4/debian/patches/manpage_macros (original)
+++ openmpi/branches/1.4/debian/patches/manpage_macros Tue May 15 15:38:21 2012
@@ -5,17 +5,12 @@
Forwarded: yes
Last-Update: 2010-10-09
---- a/orte/tools/orterun/orterun.1in
-+++ b/orte/tools/orterun/orterun.1in
+Index: openmpi-1.4.5/ompi/mpi/man/man3/MPI_Init_thread.3in
+===================================================================
+--- openmpi-1.4.5.orig/ompi/mpi/man/man3/MPI_Init_thread.3in 2012-01-30 22:27:46.000000000 +0100
++++ openmpi-1.4.5/ompi/mpi/man/man3/MPI_Init_thread.3in 2012-02-22 17:16:36.000000000 +0100
@@ -1,4 +1,3 @@
-. -*- nroff -*-
- .\" 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 2006-2008 Sun Microsystems, Inc.
.\" Copyright (c) 1996 Thinking Machines Corporation
.\" Copyright (c) 2010 Cisco Systems, Inc. All rights reserved.
Added: openmpi/branches/1.4/debian/patches/missinglib.diff
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/branches/1.4/debian/patches/missinglib.diff?rev=301&op=file
==============================================================================
--- openmpi/branches/1.4/debian/patches/missinglib.diff (added)
+++ openmpi/branches/1.4/debian/patches/missinglib.diff Tue May 15 15:38:21 2012
@@ -1,0 +1,104 @@
+Index: openmpi-1.4.5/orte/tools/orte-checkpoint/Makefile.am
+===================================================================
+--- openmpi-1.4.5.orig/orte/tools/orte-checkpoint/Makefile.am 2012-05-15 11:58:45.000000000 +0200
++++ openmpi-1.4.5/orte/tools/orte-checkpoint/Makefile.am 2012-05-15 11:58:49.000000000 +0200
+@@ -47,7 +47,7 @@
+ endif # OMPI_INSTALL_BINARIES
+
+ orte_checkpoint_SOURCES = orte-checkpoint.c
+-orte_checkpoint_LDADD = $(top_builddir)/orte/libopen-rte.la
++orte_checkpoint_LDADD = $(top_builddir)/orte/libopen-rte.la -lopen-pal
+
+ endif # WANT_FT
+ endif # !ORTE_DISABLE_FULL_SUPPORT
+Index: openmpi-1.4.5/orte/tools/orte-clean/Makefile.am
+===================================================================
+--- openmpi-1.4.5.orig/orte/tools/orte-clean/Makefile.am 2012-05-15 11:58:45.000000000 +0200
++++ openmpi-1.4.5/orte/tools/orte-clean/Makefile.am 2012-05-15 11:58:49.000000000 +0200
+@@ -40,7 +40,7 @@
+ endif # OMPI_INSTALL_BINARIES
+
+ orte_clean_SOURCES = orte-clean.c
+-orte_clean_LDADD = $(top_builddir)/orte/libopen-rte.la
++orte_clean_LDADD = $(top_builddir)/orte/libopen-rte.la -lopen-pal
+
+ endif # !ORTE_DISABLE_FULL_SUPPORT
+
+Index: openmpi-1.4.5/orte/tools/orte-iof/Makefile.am
+===================================================================
+--- openmpi-1.4.5.orig/orte/tools/orte-iof/Makefile.am 2012-05-15 11:58:45.000000000 +0200
++++ openmpi-1.4.5/orte/tools/orte-iof/Makefile.am 2012-05-15 11:58:49.000000000 +0200
+@@ -40,7 +40,7 @@
+ endif # OMPI_INSTALL_BINARIES
+
+ orte_iof_SOURCES = orte-iof.c
+-orte_iof_LDADD = $(top_builddir)/orte/libopen-rte.la
++orte_iof_LDADD = $(top_builddir)/orte/libopen-rte.la -lopen-pal
+
+ endif # !ORTE_DISABLE_FULL_SUPPORT
+
+Index: openmpi-1.4.5/orte/tools/orte-ps/Makefile.am
+===================================================================
+--- openmpi-1.4.5.orig/orte/tools/orte-ps/Makefile.am 2012-05-15 11:58:45.000000000 +0200
++++ openmpi-1.4.5/orte/tools/orte-ps/Makefile.am 2012-05-15 11:58:52.000000000 +0200
+@@ -40,7 +40,7 @@
+ endif # OMPI_INSTALL_BINARIES
+
+ orte_ps_SOURCES = orte-ps.c
+-orte_ps_LDADD = $(top_builddir)/orte/libopen-rte.la
++orte_ps_LDADD = $(top_builddir)/orte/libopen-rte.la -lopen-pal
+
+ endif # !ORTE_DISABLE_FULL_SUPPORT
+
+Index: openmpi-1.4.5/orte/tools/orte-restart/Makefile.am
+===================================================================
+--- openmpi-1.4.5.orig/orte/tools/orte-restart/Makefile.am 2012-05-15 11:58:45.000000000 +0200
++++ openmpi-1.4.5/orte/tools/orte-restart/Makefile.am 2012-05-15 11:58:52.000000000 +0200
+@@ -47,7 +47,7 @@
+ endif # OMPI_INSTALL_BINARIES
+
+ orte_restart_SOURCES = orte-restart.c
+-orte_restart_LDADD = $(top_builddir)/orte/libopen-rte.la
++orte_restart_LDADD = $(top_builddir)/orte/libopen-rte.la -lopen-pal
+
+ endif # WANT_FT
+ endif # ORTE_DISABLE_FULL_SUPPORT
+Index: openmpi-1.4.5/orte/tools/orterun/Makefile.am
+===================================================================
+--- openmpi-1.4.5.orig/orte/tools/orterun/Makefile.am 2012-05-15 11:58:45.000000000 +0200
++++ openmpi-1.4.5/orte/tools/orterun/Makefile.am 2012-05-15 11:58:52.000000000 +0200
+@@ -55,7 +55,7 @@
+ debuggers.h \
+ debuggers.c
+
+-orterun_LDADD = $(top_builddir)/orte/libopen-rte.la
++orterun_LDADD = $(top_builddir)/orte/libopen-rte.la -lopen-pal
+
+ endif # !ORTE_DISABLE_FULL_SUPPORT
+
+Index: openmpi-1.4.5/ompi/tools/ompi_info/Makefile.am
+===================================================================
+--- openmpi-1.4.5.orig/ompi/tools/ompi_info/Makefile.am 2012-05-15 11:58:45.000000000 +0200
++++ openmpi-1.4.5/ompi/tools/ompi_info/Makefile.am 2012-05-15 11:58:52.000000000 +0200
+@@ -66,7 +66,7 @@
+ output.cc \
+ param.cc \
+ version.cc
+-ompi_info_LDADD = $(top_builddir)/ompi/libmpi.la
++ompi_info_LDADD = $(top_builddir)/ompi/libmpi.la -lopen-rte -lopen-pal
+
+ clean-local:
+ test -z "$(OMPI_CXX_TEMPLATE_REPOSITORY)" || rm -rf $(OMPI_CXX_TEMPLATE_REPOSITORY)
+Index: openmpi-1.4.5/ompi/tools/ompi-server/Makefile.am
+===================================================================
+--- openmpi-1.4.5.orig/ompi/tools/ompi-server/Makefile.am 2012-05-15 11:58:45.000000000 +0200
++++ openmpi-1.4.5/ompi/tools/ompi-server/Makefile.am 2012-05-15 12:15:09.000000000 +0200
+@@ -41,7 +41,7 @@
+ endif # OMPI_INSTALL_BINARIES
+
+ ompi_server_SOURCES = ompi-server.c
+-ompi_server_LDADD = $(top_builddir)/ompi/libmpi.la
++ompi_server_LDADD = $(top_builddir)/ompi/libmpi.la -lopen-rte -lopen-pal
+
+ distclean-local:
+ rm -f $(man_pages)
Modified: openmpi/branches/1.4/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/branches/1.4/debian/patches/series?rev=301&op=diff
==============================================================================
--- openmpi/branches/1.4/debian/patches/series (original)
+++ openmpi/branches/1.4/debian/patches/series Tue May 15 15:38:21 2012
@@ -1,2 +1,3 @@
build_hurd
manpage_macros
+missinglib.diff
Added: openmpi/branches/1.4/debian/source/format
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/branches/1.4/debian/source/format?rev=301&op=file
==============================================================================
--- openmpi/branches/1.4/debian/source/format (added)
+++ openmpi/branches/1.4/debian/source/format Tue May 15 15:38:21 2012
@@ -1,0 +1,1 @@
+3.0 (quilt)
More information about the Pkg-openmpi-commits
mailing list