[Pkg-openmpi-commits] r251 - in /openmpi/trunk/debian: changelog patches/build_hurd patches/manpage-spelling-errors

[manuel at users.alioth.debian.org]

Author: manuel
Date: Mon Jul 12 19:34:22 2010
New Revision: 251

URL: http://svn.debian.org/wsvn/pkg-openmpi/?sc=1&rev=251
Log:
Updated patches

Modified:
    openmpi/trunk/debian/changelog
    openmpi/trunk/debian/patches/build_hurd
    openmpi/trunk/debian/patches/manpage-spelling-errors

Modified: openmpi/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/trunk/debian/changelog?rev=251&op=diff
==============================================================================
--- openmpi/trunk/debian/changelog (original)
+++ openmpi/trunk/debian/changelog Mon Jul 12 19:34:22 2010
@@ -2,8 +2,9 @@
 
   * New upstream release. Closes: #585800.
   * Bumped SONAME. No changes in ABI.
-
- -- Manuel Prinz <manuel at debian.org>  Mon, 12 Jul 2010 18:34:07 +0200
+  * Updated patches.
+
+ -- Manuel Prinz <manuel at debian.org>  Mon, 12 Jul 2010 21:36:31 +0200
 
 openmpi (1.4.1-3) unstable; urgency=low
 

Modified: openmpi/trunk/debian/patches/build_hurd
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/trunk/debian/patches/build_hurd?rev=251&op=diff
==============================================================================
--- openmpi/trunk/debian/patches/build_hurd (original)
+++ openmpi/trunk/debian/patches/build_hurd Mon Jul 12 19:34:22 2010
@@ -158,7 +158,7 @@
  #else
 --- a/orte/mca/odls/base/odls_base_default_fns.c
 +++ b/orte/mca/odls/base/odls_base_default_fns.c
-@@ -849,8 +849,13 @@
+@@ -851,8 +851,13 @@
      orte_odls_job_t *jobdat;
      orte_pmap_t *pmap;
      char *pathenv = NULL, *mpiexec_pathenv = NULL;
@@ -172,7 +172,7 @@
      char **argvptr;
      char *full_search;
      char **argvsav=NULL;
-@@ -863,7 +868,11 @@
+@@ -865,7 +870,11 @@
       * bouncing around as we execute various apps, but we will always return
       * to this place as our default directory
       */
@@ -184,7 +184,7 @@
      
      /* find the jobdat for this job */
      jobdat = NULL;
-@@ -1014,7 +1023,11 @@
+@@ -1016,7 +1025,11 @@
           * again not match getcwd! This is beyond our control - we are only
           * ensuring they start out matching.
           */
@@ -196,7 +196,7 @@
          opal_setenv("PWD", dir, true, &app->env);
          
          /* Search for the OMPI_exec_path and PATH settings in the environment. */
-@@ -1363,6 +1376,10 @@
+@@ -1365,6 +1378,10 @@
  
      opal_condition_signal(&orte_odls_globals.cond);
      OPAL_THREAD_UNLOCK(&orte_odls_globals.mutex);
@@ -209,7 +209,7 @@
  
 --- a/orte/orted/orted_main.c
 +++ b/orte/orted/orted_main.c
-@@ -197,7 +197,7 @@
+@@ -199,7 +199,7 @@
      int ret = 0;
      int fd;
      opal_cmd_line_t *cmd_line = NULL;
@@ -218,7 +218,7 @@
      char *jobidstring;
      char *rml_uri;
      int i;
-@@ -439,6 +439,7 @@
+@@ -445,6 +445,7 @@
          }
  
          /* define a log file name in the session directory */
@@ -226,7 +226,7 @@
          sprintf(log_file, "output-orted-%s-%s.log",
                  jobidstring, orte_process_info.nodename);
          log_path = opal_os_path(false,
-@@ -446,6 +447,7 @@
+@@ -452,6 +453,7 @@
                                  orte_process_info.top_session_dir,
                                  log_file,
                                  NULL);

Modified: openmpi/trunk/debian/patches/manpage-spelling-errors
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/trunk/debian/patches/manpage-spelling-errors?rev=251&op=diff
==============================================================================
--- openmpi/trunk/debian/patches/manpage-spelling-errors (original)
+++ openmpi/trunk/debian/patches/manpage-spelling-errors Mon Jul 12 19:34:22 2010
@@ -5,7 +5,7 @@
 
 --- a/orte/tools/orterun/orterun.1in
 +++ b/orte/tools/orterun/orterun.1in
-@@ -680,7 +680,7 @@
+@@ -683,7 +683,7 @@
  The \fI-nolocal\fP option prevents any processes from being mapped onto the
  local host (in this case node aa).  While \fImpirun\fP typically consumes
  few system resources, \fI-nolocal\fP can be helpful for launching very