[Pkg-openmpi-commits] r164 - in /openmpi/trunk/debian: changelog patches/manpages patches/series rules

Wed Jan 28 22:25:30 UTC 2009

Author: manuel
Date: Wed Jan 28 22:25:30 2009
New Revision: 164

URL: http://svn.debian.org/wsvn/pkg-openmpi/?sc=1&rev=164
Log:
Backported upstream's fix for manpage errors

Added:
    openmpi/trunk/debian/patches/manpages
Modified:
    openmpi/trunk/debian/changelog
    openmpi/trunk/debian/patches/series
    openmpi/trunk/debian/rules

Modified: openmpi/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/trunk/debian/changelog?rev=164&op=diff
==============================================================================

--- openmpi/trunk/debian/changelog (original)
+++ openmpi/trunk/debian/changelog Wed Jan 28 22:25:30 2009
@@ -2,10 +2,11 @@
 
   * Updated debian/watch to point to 1.3 series download location
   * Added a patch to fix build issues with VampirTrace
+  * Added a patch to fix lintian warnings: manpage-has-errors-from-man
   * Added a patch to enable Open MPI to build on MIPS. Many thanks to
     Thiemo Seufer!
 
- -- Manuel Prinz <manuel at debian.org>  Wed, 28 Jan 2009 17:52:10 +0100
+ -- Manuel Prinz <manuel at debian.org>  Wed, 28 Jan 2009 23:22:56 +0100
 
 openmpi (1.3-1) unstable; urgency=low
 

Added: openmpi/trunk/debian/patches/manpages
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/trunk/debian/patches/manpages?rev=164&op=file
==============================================================================
--- openmpi/trunk/debian/patches/manpages (added)
+++ openmpi/trunk/debian/patches/manpages Wed Jan 28 22:25:30 2009
@@ -1,0 +1,90 @@
+--- /dev/null
++++ b/ompi/mpi/man/man3/MPI_Comm_accept.3in
+@@ -0,0 +1,71 @@
++.\"Copyright 2009, Cisco Systems, Inc.  All rights reserved.
++.\"Copyright 2007, Sun Microsystems, Inc.
++.\" Copyright (c) 1996 Thinking Machines Corporation
++.TH MPI_Comm_accept 3OpenMPI "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
++.SH NAME
++\fBMPI_Comm_accept \fP \- Establishes communication with a client.
++
++.SH SYNTAX
++.ft R
++.SH C Syntax
++.nf
++#include <mpi.h>
++int MPI_Comm_accept(char *\fIport_name\fP, MPI_Info \fIinfo\fP, int \fIroot\fP, MPI_Comm \fIcomm\fP, MPI_Comm *\fInewcomm\fP)
++
++.SH Fortran Syntax
++.nf
++INCLUDE 'mpif.h'
++MPI_COMM_ACCEPT(\fIPORT_NAME, INFO, ROOT, COMM, NEWCOMM, IERROR\fP)
++	CHARACTER*(*)	\fIPORT_NAME\fP
++	INTEGER		\fIINFO, ROOT, COMM, NEWCOMM, IERROR\fP
++
++.SH C++ Syntax
++.nf
++#include <mpi.h>
++MPI::Intercomm MPI::Intracomm::Accept(const char* \fIport_name\fP,
++	const MPI::Info& \fIinfo\fP, int \fIroot\fP) const
++
++.SH INPUT PARAMETERS
++.ft R
++.TP 1i
++port_name
++Port name (string, used only on \fIroot\fP).
++.TP 1i
++info
++Options given by root for the accept (handle, used only on root). No options currently supported.
++.TP 1i
++root
++Rank in \fIcomm\fP of root node (integer).
++.TP 1i
++comm
++Intracommunicator over which call is collective (handle).
++
++.SH OUTPUT PARAMETERS
++.ft R
++.TP 1i
++newcomm
++Intercommunicator with client as remote group (handle)
++.TP 1i
++IERROR
++Fortran only: Error status (integer).
++
++.SH DESCRIPTION
++.ft R
++MPI_Comm_accept establishes communication with a client. It is collective over the calling communicator. It returns an intercommunicator that allows communication with the client, after the client has connected with the MPI_Comm_accept function using the MPI_Comm_connect function.
++.sp
++The \fIport_name\fP must have been established through a call to MPI_Open_port on the root.
++
++
++.SH ERRORS
++Almost all MPI routines return an error value; C routines as the value of the function and Fortran routines in the last argument. C++ functions do not return errors. If the default error handler is set to MPI::ERRORS_THROW_EXCEPTIONS, then on error the C++ exception mechanism will be used to throw an MPI:Exception object.
++.sp
++Before the error value is returned, the current MPI error handler is
++called. By default, this error handler aborts the MPI job, except for I/O function errors. The error handler may be changed with MPI_Comm_set_errhandler; the predefined error handler MPI_ERRORS_RETURN may be used to cause error values to be returned.
++.sp
++See the MPI man page for a full list of MPI error codes.
++
++.SH SEE ALSO
++MPI_Comm_connect
++MPI_Open_port
++.br
++
+--- a/orte/tools/orterun/orterun.1in
++++ b/orte/tools/orterun/orterun.1in
+@@ -1,3 +1,4 @@
++.\" Copyright (c) 2009      Cisco Systems, Inc.  All rights reserved.
+ .\" Copyright (c) 2008      Sun Microsystems, Inc.  All rights reserved.
+ .\"
+ .\" Man page for ORTE's orterun command
+@@ -128,7 +129,7 @@
+ .
+ .
+ .TP
+-.B -cf \f |--cartofile <arg0>\fP.
++.B -cf\fR,\fP --cartofile \fR<arg0>\fP
+ Provide a cartography file.
+ .
+ .

Modified: openmpi/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/trunk/debian/patches/series?rev=164&op=diff
==============================================================================
--- openmpi/trunk/debian/patches/series (original)
+++ openmpi/trunk/debian/patches/series Wed Jan 28 22:25:30 2009
@@ -7,3 +7,6 @@
 # This is required because libtool 2.2 is needed which is not yet in
 # unstable. (But in experimental.)
 autogen
+# This patch fixes the manpage issues. It's a backport from upstream SVN,
+# changeset 20307 and will be in 1.3.1.
+manpages

Modified: openmpi/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/trunk/debian/rules?rev=164&op=diff
==============================================================================
--- openmpi/trunk/debian/rules (original)
+++ openmpi/trunk/debian/rules Wed Jan 28 22:25:30 2009
@@ -113,9 +113,6 @@
 	chmod 644 debian/openmpi/usr/lib/openmpi/lib/mpi.mod
 	sed -i 's/3OpenMPI/3/' debian/openmpi/usr/share/man/man3/*.3
 
-        # DE 20 Jan 2009:  OpenMPI 1.3 installs an empty MPI_Comm_accept
-	rm -vf debian/openmpi/usr/share/man/man3/MPI_Comm_accept.3
-
 	dh_install -s --sourcedir=$(CURDIR)/debian/openmpi --list-missing
 
 binary-indep: install-indep


