Hi again, On Dirk Eddelbuettel, I updated to patch to merge all the merge into the same changelog entries instead of a few new ones.
Sylvestre
diff -Nur debian.orig/changelog debian/changelog --- debian.orig/changelog 2007-06-04 09:33:44.000000000 +0200 +++ debian/changelog 2007-06-04 10:02:44.000000000 +0200 @@ -1,3 +1,26 @@ +openmpi (1.2.2-1.1) unstable; urgency=low + + * Non-maintainer upload + + [ Sylvestre Ledru] + * New upstream release 1.2.2 + * Patch removed (20implicit_pointer_conversion.dpatch) + * Apply all of Tilmam's patches below (Closes: #415338) + + [ Tilman Koschnick ] + * New upstream release 1.2.0 + * Acknowledge previous NMUs (closes: #386491, #392633, #404003, #404026). + * Fix: mpicc.openmpi fails to run when named mpicc.openmpi (closes: #388216). + * Include manual pages (closes: #413607). + * Add openmpi-mpidoc package for man pages describing the MPI standard. + * Update copyrights. + + [ Andreas Barth ] + * Spelling mistake in the description of the package + Closes: #390238 + + -- Sylvestre Ledru <[EMAIL PROTECTED]> Fri, 1 Jun 2007 14:58:45 +0200 + openmpi (1.1-2.3) unstable; urgency=high * Non-maintainer upload. diff -Nur debian.orig/control debian/control --- debian.orig/control 2007-06-04 09:33:44.000000000 +0200 +++ debian/control 2007-06-04 09:44:16.000000000 +0200 @@ -82,4 +82,4 @@ MPI offers advantages for system and software vendors, application developers and computer science researchers. . - This package ontains debugging symbols for Open MPI. + This package contains debugging symbols for Open MPI. diff -Nur debian.orig/openmpi-mpidoc.install debian/openmpi-mpidoc.install --- debian.orig/openmpi-mpidoc.install 1970-01-01 01:00:00.000000000 +0100 +++ debian/openmpi-mpidoc.install 2007-06-04 09:44:16.000000000 +0200 @@ -0,0 +1 @@ +usr/share/man/man3/* diff -Nur debian.orig/patches/00list debian/patches/00list --- debian.orig/patches/00list 2007-06-04 09:33:44.000000000 +0200 +++ debian/patches/00list 2007-06-04 09:44:16.000000000 +0200 @@ -1,2 +1,2 @@ 10opal_noexecstack -20implicit_pointer_conversion +20fix_manpage_link.dpatch diff -Nur debian.orig/patches/20fix_manpage_link.dpatch debian/patches/20fix_manpage_link.dpatch --- debian.orig/patches/20fix_manpage_link.dpatch 1970-01-01 01:00:00.000000000 +0100 +++ debian/patches/20fix_manpage_link.dpatch 2007-06-04 09:44:16.000000000 +0200 @@ -0,0 +1,14 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 30fix_manpage_link.dpatch by Tilman Koschnick <[EMAIL PROTECTED]> +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Fix link between manpages. + [EMAIL PROTECTED]@ +diff -urNad openmpi-1.2~/ompi/mpi/man/man3/MPI_Status_c2f.3 openmpi-1.2/ompi/mpi/man/man3/MPI_Status_c2f.3 +--- openmpi-1.2~/ompi/mpi/man/man3/MPI_Status_c2f.3 2006-11-09 19:53:42.000000000 +0100 ++++ openmpi-1.2/ompi/mpi/man/man3/MPI_Status_c2f.3 2007-03-18 00:18:20.513262103 +0100 +@@ -1,2 +1,2 @@ +-.so man3/MPI_Status_c2f.3 ++.so man3/MPI_Status_f2c.3 + ' @(#)MPI_Status_c2f.3 1.12 06/03/09 diff -Nur debian.orig/patches/20implicit_pointer_conversion.dpatch debian/patches/20implicit_pointer_conversion.dpatch --- debian.orig/patches/20implicit_pointer_conversion.dpatch 2007-06-04 09:33:44.000000000 +0200 +++ debian/patches/20implicit_pointer_conversion.dpatch 1970-01-01 01:00:00.000000000 +0100 @@ -1,19 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 20implict_pointer_conversion.dpatch by Florian Ragwitz <[EMAIL PROTECTED]> -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Include malloc.h to avoid implict pointer conversion on 64 -## DP: architectures. See #377725. - [EMAIL PROTECTED]@ - ---- openmpi-1.1.orig/ompi/mca/mpool/openib/mpool_openib_module.c 2006-08-07 15:56:18.428275656 +0200 -+++ openmpi-1.1/ompi/mca/mpool/openib/mpool_openib_module.c 2006-08-07 15:55:50.757482256 +0200 -@@ -26,6 +26,7 @@ - #include "ompi/mca/rcache/rcache.h" - #include "ompi/mca/rcache/base/base.h" - #include "ompi/mca/mpool/base/base.h" -+#include <malloc.h> - - extern uint32_t mca_mpool_base_page_size; - extern uint32_t mca_mpool_base_page_size_log;
