Description: <short summary of the patch>
 TODO: Put a short summary on the line above and replace this paragraph
 with a longer explanation of this change. Complete the meta-information
 with other relevant fields (see below for details). To make it easier, the
 information below has been extracted from the changelog. Adjust it or drop
 it.
 .
 xmpi (2.2.3b8-12) unstable; urgency=low
 .
   * lintian fixes
Author: Camm Maguire <camm@debian.org>

---
The information above should follow the Patch Tagging Guidelines, please
checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
are templates for supplementary fields that you might want to add:

Origin: <vendor|upstream|other>, <url of original patch>
Bug: <url in upstream bugtracker>
Bug-Debian: http://bugs.debian.org/<bugnumber>
Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
Forwarded: <no|not-needed|url proving that it has been forwarded>
Reviewed-By: <name and email of someone who approved the patch>
Last-Update: <YYYY-MM-DD>

--- a/configure.in
+++ b/configure.in
@@ -66,7 +66,7 @@
 # check for specification of C++ compiler
 # overrules default mpiCC with lam
 
-CXX=mpiCC
+CXX=mpic++
 CC=mpicc
 
 AC_ARG_WITH(cc,       
@@ -84,7 +84,7 @@
 	AC_MSG_ERROR(the --with-cxx option requires the compiler name)
     fi
 
-    AC_MSG_WARN(*** You are not using the mpiCC compiler recommended)
+    AC_MSG_WARN(*** You are not using the mpic++ compiler recommended)
     AC_MSG_WARN(*** for building the LAM libxmpi. Be sure to set)
     AC_MSG_WARN(*** the approprate include paths to the needed files)
 
@@ -206,7 +206,7 @@
 # Run this test to figure out which ones we should use
 #
 
-LAM_CHECK_CONSTANTS
+#LAM_CHECK_CONSTANTS
 
 # Check for programs.
 # Abort if we cannot find one of them
--- a/src/xmpi/xmpi.h
+++ b/src/xmpi/xmpi.h
@@ -72,7 +72,7 @@
 #define XMPI_RANKFONT	"-*-helvetica-bold-r-normal--*-140-*-*-*-*-*-*"
 #define XMPI_MSGFONT	"-*-helvetica-medium-r-normal--*-120-*-*-*-*-*-*"
 
-#define XMPI_HELPCMD 	"netscape http://www.mpi.nd.edu/lam/software/xmpi/"
+#define XMPI_HELPCMD 	"sensible-browser http://www.mpi.nd.edu/lam/software/xmpi/"
 #define XMPI_INFOLABEL 	"Boot"
 
 /*
--- a/src/xmpi/xmpi_vendor.cc
+++ b/src/xmpi/xmpi_vendor.cc
@@ -165,7 +165,7 @@
 vendor_schema_toggle_change_cb(Widget, XtPointer client_data, 
 			       XtPointer call_data)
 {
-  int which = (int) client_data;
+  long which = (long) client_data;
   XmToggleButtonCallbackStruct *state = 
     (XmToggleButtonCallbackStruct *) call_data;
 
@@ -177,7 +177,7 @@
 vendor_schema_textbox_change_cb(Widget ch_widget, XtPointer client_data,
 				XtPointer)
 {
-  int which = (int) client_data;
+  long which = (long) client_data;
 
   if (! (schema_options[which].current_val.xmpi_text == NULL))
     free(schema_options[which].current_val.xmpi_text);
@@ -200,7 +200,7 @@
 vendor_run_toggle_change_cb(Widget, XtPointer client_data, 
 			       XtPointer call_data)
 {
-  int which = (int) client_data;
+  long which = (long) client_data;
   XmToggleButtonCallbackStruct *state = 
     (XmToggleButtonCallbackStruct *) call_data;
 
@@ -213,7 +213,7 @@
 vendor_run_textbox_change_cb(Widget ch_widget, XtPointer client_data,
 				XtPointer)
 {
-  int which = (int) client_data;
+  long which = (long) client_data;
 
   if (! (run_options[which].current_val.xmpi_text == NULL))
     free(run_options[which].current_val.xmpi_text);
--- a/src/libxmpi/ndi_resolve.cc
+++ b/src/libxmpi/ndi_resolve.cc
@@ -79,14 +79,15 @@
 	al_free(newnodelist);
 	return (0);
       }
-    } else if (p->ndi_node == LAM_HOST2COMP) {
+    } // else if (p->ndi_node == LAM_HOST2COMP) {
 
-      if (ndi_cast(newnodelist, 0, NT_WASTE | NT_CAST,
-		   &index)) {
-	al_free(newnodelist);
-	return (0);
-      }
-    } else {
+//       if (ndi_cast(newnodelist, 0, NT_WASTE | NT_CAST,
+// 		   &index)) {
+// 	al_free(newnodelist);
+// 	return (0);
+//       }
+//     } 
+    else {
       newnode.ndi_node = p->ndi_node;
       newnode.ndi_flags = p->ndi_flags;
       newnode.ndi_count = p->ndi_count;
--- a/src/libxmpi/nodeslist.cc
+++ b/src/libxmpi/nodeslist.cc
@@ -218,10 +218,11 @@
     if (node_desc->ndi_node == LOCAL) {
       (*nodes)[1].selected = 1;
       return 0;
-    } else if (node_desc->ndi_node == LAM_HOST2COMP) {
-      (*nodes)[0].selected = 1;
-      return 0;
-    } else
+    } // else if (node_desc->ndi_node == LAM_HOST2COMP) {
+//       (*nodes)[0].selected = 1;
+//       return 0;
+//     } 
+    else
       (*nodes)[node_desc->ndi_node+2].selected = 1;
   }
   
--- a/src/libxmpi/xmpi_asc_parse.cc
+++ b/src/libxmpi/xmpi_asc_parse.cc
@@ -17,6 +17,7 @@
  *	Function:	- parse an application schema
  */
 
+#include <cstdlib>
 #include <string>
 
 using namespace std;
--- a/app-defaults/XMPI
+++ b/app-defaults/XMPI
@@ -42,4 +42,4 @@
 XMPI*popup_help.background:		white
 XMPI*popup_help.foreground:		black
 XMPI*infoLabel:				Boot
-XMPI*helpCmd:		netscape http://www.lam-mpi.org/software/xmpi/help.php
+XMPI*helpCmd:		sensible-browser http://www.lam-mpi.org/software/xmpi/help.php
--- a/man/man1/xmpi.1
+++ b/man/man1/xmpi.1
@@ -329,14 +329,14 @@
 blocked waiting for communication.
 No lines are drawn connecting the
 processes participating in the collective communication.
-.IP \fIBlocking point to point\fR 4
+.IP \fIBlocking_point_to_point\fR 4
 For both the send and receive process contiguous line segments are drawn
 showing the time spent in system overhead and the time spent blocked
 waiting for the communication to complete.
 A line is drawn connecting the send to the receive.
 It originates at the beginning of the send
 segments and is drawn to the end of the matching receive segments.
-.IP \fINon-blocking point to point\fR 4
+.IP \fINon-blocking_point_to_point\fR 4
 At the time a non-blocking send or receive is initiated a system
 overhead segment is drawn.
 When the communication is completed via a wait or test, segments showing
@@ -344,7 +344,7 @@
 Lines are drawn between matching sends and receives, except in this case
 the line is drawn from the segment where the send was initiated to where the
 corresponding receive completed.
-.IP \fIWaits and tests\fR 4
+.IP \fIWaits_and_tests\fR 4
 If a non-blocking communication is completed inside a
 wait/test function 
 .I XMPI
@@ -354,7 +354,7 @@
 For example, if an MPI_Issend() is completed
 inside an MPI_Wait(), the function will read
 \fIMPI_Wait (MPI_Issend)\fR.
-.IP \fIMissing traces\fR 4
+.IP \fIMissing_traces\fR 4
 Owing to the use of trace segments or the dropping of overflow traces
 (see lamtrace(1)) there may be send or receive traces which have no match in
 the trace data.