From 3034b86e3a2bdb83b782a7164780f29ff3d4a353 Mon Sep 17 00:00:00 2001
From: Jari Aalto <jari.aalto@cante.net>
Date: Tue, 24 Apr 2012 23:27:11 +0300
Subject: [PATCH] format-3.0
Organization: Private
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 8bit

Signed-off-by: Jari Aalto <jari.aalto@cante.net>
---
 debian/README.source                               |   19 -
 debian/changelog                                   |   12 +
 debian/compat                                      |    2 +-
 debian/control                                     |    4 +-
 debian/patches/00list                              |   13 -
 debian/patches/10-64bit-pointer-fixes.patch        |   33 +
 ...toreconf_fix.dpatch => 10-autoreconf-fix.patch} |   10 +-
 debian/patches/10-fix-man-section.patch            |   15 +
 ...3_build_fix.dpatch => 10-gcc43-build-fix.patch} |  129 ++--
 debian/patches/10-invoke-man.patch                 |   24 +
 debian/patches/10-kernel-includes-fix.patch        |   19 +
 ..._fixes.dpatch => 10-kfreebsd-build-fixes.patch} |   27 +-
 ...gickcore_api.dpatch => 10-magickcore-api.patch} |   10 +-
 .../{10_open_mode.dpatch => 10-open-mode.patch}    |    8 +-
 debian/patches/10_64bit_pointer_fixes.dpatch       |   37 --
 debian/patches/10_fix_man_section.dpatch           |   37 --
 debian/patches/10_invoke_man.dpatch                |   46 --
 debian/patches/10_kernel_includes_fix.dpatch       |   23 -
 ..._pkgconfig.dpatch => 20-magick-pkgconfig.patch} |   12 +-
 ..._override.dpatch => 30-no-shell-override.patch} |   14 +-
 ...falt_support.dpatch => 40-hdfalt-support.patch} |   12 +-
 ...l_cleanup.dpatch => 90-usr-local-cleanup.patch} |  648 ++++++++++----------
 debian/patches/series                              |   13 +
 debian/rules                                       |   13 +-
 debian/source/format                               |    1 +
 25 files changed, 541 insertions(+), 640 deletions(-)
 delete mode 100644 debian/README.source
 delete mode 100644 debian/patches/00list
 create mode 100644 debian/patches/10-64bit-pointer-fixes.patch
 rename debian/patches/{10_autoreconf_fix.dpatch => 10-autoreconf-fix.patch} (72%)
 create mode 100644 debian/patches/10-fix-man-section.patch
 rename debian/patches/{10_gcc43_build_fix.dpatch => 10-gcc43-build-fix.patch} (60%)
 create mode 100644 debian/patches/10-invoke-man.patch
 create mode 100644 debian/patches/10-kernel-includes-fix.patch
 rename debian/patches/{10_kfreebsd_build_fixes.dpatch => 10-kfreebsd-build-fixes.patch} (55%)
 rename debian/patches/{10_magickcore_api.dpatch => 10-magickcore-api.patch} (82%)
 rename debian/patches/{10_open_mode.dpatch => 10-open-mode.patch} (86%)
 delete mode 100644 debian/patches/10_64bit_pointer_fixes.dpatch
 delete mode 100644 debian/patches/10_fix_man_section.dpatch
 delete mode 100644 debian/patches/10_invoke_man.dpatch
 delete mode 100644 debian/patches/10_kernel_includes_fix.dpatch
 rename debian/patches/{20_magick_pkgconfig.dpatch => 20-magick-pkgconfig.patch} (78%)
 rename debian/patches/{30_no_shell_override.dpatch => 30-no-shell-override.patch} (53%)
 rename debian/patches/{40_hdfalt_support.dpatch => 40-hdfalt-support.patch} (74%)
 rename debian/patches/{90_usr_local_cleanup.dpatch => 90-usr-local-cleanup.patch} (81%)
 create mode 100644 debian/patches/series
 create mode 100644 debian/source/format

diff --git a/debian/README.source b/debian/README.source
deleted file mode 100644
index ae20435..0000000
--- a/debian/README.source
+++ /dev/null
@@ -1,19 +0,0 @@
-This package uses dpatch to manage all modifications to the upstream
-source.  Changes are storged in the source package as diffs with
-special dpatch headers in debian/patches.  The file debian/patches/00list
-determines which dpatch diffs are applied in which order during the build.
-
-To add a new or modify an existing diff, use the tool dpatch-edit-patch,
-provided in package dpatch. Use the name of the diff without suffix .dpatch
-as the first argument to dpatch-edit-patch. It will prepare a copy of the
-source tree ready for editing in a new shell. Upon exit, all modifications
-will be represented in the dpatch diff.
-
-Optionally, if the name of an existing diff (without suffix .dpatch) is given
-as the second argument, the editable copy of the source tree will be patched
-with all dpatches up to and including the specified diff.
-
-Note that dpatch-edit-patch itself does not include a new patch in
-debian/patches/00list. Instead, the file needs to be modified by hand to add
-or remove dpatches.
-
diff --git a/debian/changelog b/debian/changelog
index bf7b5e3..c712eb4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+dx (1:4.4.4-4.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Remove deprecated dpatch and upgrade to packaging format "3.0 quilt".
+  * Update to Standards-Version to 3.9.3 and debhelper to 9.
+  * Add build-arch and build-indep targets; use dh_prep in rules file.
+  * Patches 64bit,gcc43, kfreebsd, usr-local were updated with "quilt
+    refresh" to make them apply cleanly.
+  * Patch 05 is new; in-line changes to local sources.
+
+ -- Jari Aalto <jari.aalto@cante.net>  Tue, 24 Apr 2012 22:21:18 +0300
+
 dx (1:4.4.4-4) unstable; urgency=low
 
   * debian/control: Change build dependency from libjpeg62-dev to
diff --git a/debian/compat b/debian/compat
index 7ed6ff8..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+9
diff --git a/debian/control b/debian/control
index ec7f8b2..549d911 100644
--- a/debian/control
+++ b/debian/control
@@ -2,8 +2,8 @@ Source: dx
 Section: science
 Priority: optional
 Maintainer: Daniel Kobras <kobras@debian.org>
-Build-Depends: lesstif2-dev | lesstif-dev | libmotif-dev, libx11-dev, x11proto-core-dev, libxt-dev, libxpm-dev, libxmu-dev, libbz2-dev, libglu-dev, libmagickwand-dev, libpng12-dev, libhdf4-alt-dev | libhdf4-dev, libnetcdf-dev, libxml2-dev, libjpeg-dev, libtiff4-dev | libtiff-dev, zlib1g-dev | libz-dev, flex, bison, m4, autotools-dev, debhelper (>= 5), ed, dpatch, automake, autoconf, libtool
-Standards-Version: 3.8.4
+Build-Depends: lesstif2-dev | lesstif-dev | libmotif-dev, libx11-dev, x11proto-core-dev, libxt-dev, libxpm-dev, libxmu-dev, libbz2-dev, libglu-dev, libmagickwand-dev, libpng12-dev, libhdf4-alt-dev | libhdf4-dev, libnetcdf-dev, libxml2-dev, libjpeg-dev, libtiff4-dev | libtiff-dev, zlib1g-dev | libz-dev, flex, bison, m4, autotools-dev, debhelper (>= 9), ed, automake, autoconf, libtool
+Standards-Version: 3.9.3
 Homepage: http://www.opendx.org/
 
 Package: dx
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index a872516..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,13 +0,0 @@
-10_fix_man_section
-10_invoke_man
-10_64bit_pointer_fixes
-10_kernel_includes_fix
-10_gcc43_build_fix
-10_kfreebsd_build_fixes
-10_magickcore_api
-10_open_mode
-10_autoreconf_fix
-20_magick_pkgconfig
-30_no_shell_override
-40_hdfalt_support
-90_usr_local_cleanup
diff --git a/debian/patches/10-64bit-pointer-fixes.patch b/debian/patches/10-64bit-pointer-fixes.patch
new file mode 100644
index 0000000..a26821e
--- /dev/null
+++ b/debian/patches/10-64bit-pointer-fixes.patch
@@ -0,0 +1,33 @@
+From: Daniel Kobras <kobras@debian.org>
+Subject: Trying to store a pointer in an int is a bad idea on 64bit platforms
+ This patch fixes various issues all over the place due to missing
+ function declarations or coding errors.
+ Patch for hwTmesh.c thanks to dann frazier <dannf@hp.com>.
+
+---
+ include/dx/advanced.h       |    3 ++-
+ src/exec/hwrender/hwTmesh.c |    1 +
+ 2 files changed, 3 insertions(+), 1 deletion(-)
+
+--- a/include/dx/advanced.h
++++ b/include/dx/advanced.h
+@@ -42,7 +42,8 @@
+ #include <sys/mman.h>
+ typedef msemaphore lock_type;
+ #else
+-typedef volatile int lock_type;
++/* Must be large enough to hold a pointer */
++typedef volatile unsigned long lock_type;
+ #endif
+ 
+ void DXenable_locks(int enable);
+--- a/src/exec/hwrender/hwTmesh.c
++++ b/src/exec/hwrender/hwTmesh.c
+@@ -27,6 +27,7 @@
+ #include "hwTmesh.h"
+ #include "hwMemory.h"
+ #include "hwWindow.h"
++#include "hwObjectHash.h"
+ 
+ #include "hwDebug.h"
+ 
diff --git a/debian/patches/10_autoreconf_fix.dpatch b/debian/patches/10-autoreconf-fix.patch
similarity index 72%
rename from debian/patches/10_autoreconf_fix.dpatch
rename to debian/patches/10-autoreconf-fix.patch
index 4c8f420..c8cccf4 100644
--- a/debian/patches/10_autoreconf_fix.dpatch
+++ b/debian/patches/10-autoreconf-fix.patch
@@ -1,11 +1,7 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 10_autoreconf_fix.dpatch by Daniel Kobras <kobras@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Call macro AC_PROG_CXX before setting language C++ to avoid a
-## DP: circular dependency error when running aclocal/autoreconf.
+From: Daniel Kobras <kobras@debian.org>
+Subject: Call macro AC_PROG_CXX before setting language C++ to avoid a
+ circular dependency error when running aclocal/autoreconf.
 
-@DPATCH@
 diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' dx~/configure.ac dx/configure.ac
 --- dx~/configure.ac	2008-02-16 16:59:53.000000000 +0100
 +++ dx/configure.ac	2010-03-25 14:00:33.000000000 +0100
diff --git a/debian/patches/10-fix-man-section.patch b/debian/patches/10-fix-man-section.patch
new file mode 100644
index 0000000..4bae1b6
--- /dev/null
+++ b/debian/patches/10-fix-man-section.patch
@@ -0,0 +1,15 @@
+From: Daniel Kobras <kobras@debian.org>
+Subject: Change section of man page from 1V to 1.
+ From Debian diff dx_4.3.0-2, converted to dpatch format.
+
+--- dx-4.3.0.orig/man/manl/dx.l
++++ dx-4.3.0/man/manl/dx.l
+@@ -1,7 +1,7 @@
+ .de SO
+ \fB\\$1\fR \\$2
+ ..
+-.TH DX 1V "" "IBM Visualization Data Explorer" 
++.TH DX 1 "" "IBM Visualization Data Explorer" 
+ .SH NAME
+ dx \- start the Data Explorer visualization system.  Optionally
+ directly start the User Interface 
diff --git a/debian/patches/10_gcc43_build_fix.dpatch b/debian/patches/10-gcc43-build-fix.patch
similarity index 60%
rename from debian/patches/10_gcc43_build_fix.dpatch
rename to debian/patches/10-gcc43-build-fix.patch
index abade16..ea09ea6 100644
--- a/debian/patches/10_gcc43_build_fix.dpatch
+++ b/debian/patches/10-gcc43-build-fix.patch
@@ -1,13 +1,30 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 10_gcc43_build_fix.dpatch by Daniel Kobras <kobras@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: First argument to main() must be signed int with gcc 4.3.
+From: Daniel Kobras <kobras@debian.org>
+Subject: First argument to main() must be signed int with gcc 4.3.
 
-@DPATCH@
-diff -urNad dx~/src/uipp/base/Application.C dx/src/uipp/base/Application.C
---- dx~/src/uipp/base/Application.C	2006-01-27 11:29:56.000000000 +0100
-+++ dx/src/uipp/base/Application.C	2008-02-16 20:06:18.000000000 +0100
+---
+ src/uipp/base/Application.C           |   12 ++++--------
+ src/uipp/base/Application.h           |    8 ++++----
+ src/uipp/base/IBMApplication.C        |    4 ++--
+ src/uipp/base/IBMApplication.h        |    4 ++--
+ src/uipp/dxui/Main.C                  |    2 +-
+ src/uipp/dxuilib/DXApplication.C      |    2 +-
+ src/uipp/dxuilib/DXApplication.h      |    2 +-
+ src/uipp/mb/MBApplication.C           |    2 +-
+ src/uipp/mb/MBApplication.h           |    2 +-
+ src/uipp/mb/Main.C                    |    2 +-
+ src/uipp/prompter/GARApplication.C    |    2 +-
+ src/uipp/prompter/GARApplication.h    |    2 +-
+ src/uipp/prompter/Main.C              |    2 +-
+ src/uipp/startup/Main.C               |    2 +-
+ src/uipp/startup/StartupApplication.C |    2 +-
+ src/uipp/startup/StartupApplication.h |    2 +-
+ src/uipp/tutor/Main.C                 |    2 +-
+ src/uipp/tutor/TutorApplication.C     |    2 +-
+ src/uipp/tutor/TutorApplication.h     |    2 +-
+ 19 files changed, 27 insertions(+), 31 deletions(-)
+
+--- a/src/uipp/base/Application.C
++++ b/src/uipp/base/Application.C
 @@ -136,7 +136,7 @@
      //this->setDefaultResources(baseWidget, Application::DefaultResources);
  }
@@ -56,9 +73,8 @@ diff -urNad dx~/src/uipp/base/Application.C dx/src/uipp/base/Application.C
  {
      //
      // Initialize the window system if not done already.
-diff -urNad dx~/src/uipp/base/Application.h dx/src/uipp/base/Application.h
---- dx~/src/uipp/base/Application.h	2006-01-27 11:29:56.000000000 +0100
-+++ dx/src/uipp/base/Application.h	2008-02-16 20:06:49.000000000 +0100
+--- a/src/uipp/base/Application.h
++++ b/src/uipp/base/Application.h
 @@ -49,7 +49,7 @@
      //
      // The main program needs to access protected member functions.
@@ -89,9 +105,8 @@ diff -urNad dx~/src/uipp/base/Application.h dx/src/uipp/base/Application.h
  
      //
      // Allow others to access our event processing mechanism
-diff -urNad dx~/src/uipp/base/IBMApplication.C dx/src/uipp/base/IBMApplication.C
---- dx~/src/uipp/base/IBMApplication.C	2006-01-27 12:03:32.000000000 +0100
-+++ dx/src/uipp/base/IBMApplication.C	2008-02-16 20:07:19.000000000 +0100
+--- a/src/uipp/base/IBMApplication.C
++++ b/src/uipp/base/IBMApplication.C
 @@ -349,7 +349,7 @@
  }
  
@@ -110,9 +125,8 @@ diff -urNad dx~/src/uipp/base/IBMApplication.C dx/src/uipp/base/IBMApplication.C
  				   char**        argv)
  {
      if (!this->Application::initialize(argcp,argv))
-diff -urNad dx~/src/uipp/base/IBMApplication.h dx/src/uipp/base/IBMApplication.h
---- dx~/src/uipp/base/IBMApplication.h	2003-09-20 07:35:22.000000000 +0200
-+++ dx/src/uipp/base/IBMApplication.h	2008-02-16 20:06:31.000000000 +0100
+--- a/src/uipp/base/IBMApplication.h
++++ b/src/uipp/base/IBMApplication.h
 @@ -77,7 +77,7 @@
      //
      // Initialize the window system.
@@ -131,9 +145,8 @@ diff -urNad dx~/src/uipp/base/IBMApplication.h dx/src/uipp/base/IBMApplication.h
  
      //
      // Load application specific action routines
-diff -urNad dx~/src/uipp/dxui/Main.C dx/src/uipp/dxui/Main.C
---- dx~/src/uipp/dxui/Main.C	2006-01-27 11:29:57.000000000 +0100
-+++ dx/src/uipp/dxui/Main.C	2008-02-16 19:24:41.000000000 +0100
+--- a/src/uipp/dxui/Main.C
++++ b/src/uipp/dxui/Main.C
 @@ -48,7 +48,7 @@
  //
  const char *AssertMsgString = "Internal error detected at \"%s\":%d.\n";
@@ -143,9 +156,8 @@ diff -urNad dx~/src/uipp/dxui/Main.C dx/src/uipp/dxui/Main.C
  	  char**       argv)
  {
  #if defined(HAVE_HCLXMINIT)
-diff -urNad dx~/src/uipp/dxuilib/DXApplication.C dx/src/uipp/dxuilib/DXApplication.C
---- dx~/src/uipp/dxuilib/DXApplication.C	2008-02-16 16:59:56.000000000 +0100
-+++ dx/src/uipp/dxuilib/DXApplication.C	2008-02-16 20:08:33.000000000 +0100
+--- a/src/uipp/dxuilib/DXApplication.C
++++ b/src/uipp/dxuilib/DXApplication.C
 @@ -2248,7 +2248,7 @@
      this->setDefaultResources(baseWidget, _defaultDXResources);
      this->IBMApplication::installDefaultResources(baseWidget);
@@ -155,9 +167,8 @@ diff -urNad dx~/src/uipp/dxuilib/DXApplication.C dx/src/uipp/dxuilib/DXApplicati
  								  char**        argv)
  {
  	boolean wasSetBusy = FALSE;
-diff -urNad dx~/src/uipp/dxuilib/DXApplication.h dx/src/uipp/dxuilib/DXApplication.h
---- dx~/src/uipp/dxuilib/DXApplication.h	2008-02-16 16:59:56.000000000 +0100
-+++ dx/src/uipp/dxuilib/DXApplication.h	2008-02-16 20:10:15.000000000 +0100
+--- a/src/uipp/dxuilib/DXApplication.h
++++ b/src/uipp/dxuilib/DXApplication.h
 @@ -372,7 +372,7 @@
      // Overrides the Application class version:
      //   Initializes Xt Intrinsics with option list (switches).
@@ -167,9 +178,8 @@ diff -urNad dx~/src/uipp/dxuilib/DXApplication.h dx/src/uipp/dxuilib/DXApplicati
  			    char**        argv);
  
      //
-diff -urNad dx~/src/uipp/mb/MBApplication.C dx/src/uipp/mb/MBApplication.C
---- dx~/src/uipp/mb/MBApplication.C	2008-02-16 16:59:56.000000000 +0100
-+++ dx/src/uipp/mb/MBApplication.C	2008-02-16 20:10:36.000000000 +0100
+--- a/src/uipp/mb/MBApplication.C
++++ b/src/uipp/mb/MBApplication.C
 @@ -117,7 +117,7 @@
  #endif       
  }            
@@ -179,9 +189,8 @@ diff -urNad dx~/src/uipp/mb/MBApplication.C dx/src/uipp/mb/MBApplication.C
  			       char**        argv)
  {
      ASSERT(argcp);
-diff -urNad dx~/src/uipp/mb/MBApplication.h dx/src/uipp/mb/MBApplication.h
---- dx~/src/uipp/mb/MBApplication.h	1999-05-10 17:46:25.000000000 +0200
-+++ dx/src/uipp/mb/MBApplication.h	2008-02-16 20:10:26.000000000 +0100
+--- a/src/uipp/mb/MBApplication.h
++++ b/src/uipp/mb/MBApplication.h
 @@ -51,7 +51,7 @@
      // Overrides the Application class version:
      //   Initializes Xt Intrinsics with option list (switches).
@@ -191,9 +200,8 @@ diff -urNad dx~/src/uipp/mb/MBApplication.h dx/src/uipp/mb/MBApplication.h
  			    char**        argv);
  
      static MBResource	resource;
-diff -urNad dx~/src/uipp/mb/Main.C dx/src/uipp/mb/Main.C
---- dx~/src/uipp/mb/Main.C	2000-05-20 19:49:40.000000000 +0200
-+++ dx/src/uipp/mb/Main.C	2008-02-16 19:24:41.000000000 +0100
+--- a/src/uipp/mb/Main.C
++++ b/src/uipp/mb/Main.C
 @@ -22,7 +22,7 @@
  //
  const char *AssertMsgString = "Internal error detected at \"%s\":%d.\n";
@@ -203,10 +211,9 @@ diff -urNad dx~/src/uipp/mb/Main.C dx/src/uipp/mb/Main.C
  	  char**       argv)
  {
  #if defined(HAVE_HCLXMINIT)
-diff -urNad dx~/src/uipp/prompter/GARApplication.C dx/src/uipp/prompter/GARApplication.C
---- dx~/src/uipp/prompter/GARApplication.C	2008-02-16 16:59:56.000000000 +0100
-+++ dx/src/uipp/prompter/GARApplication.C	2008-02-16 20:12:09.000000000 +0100
-@@ -200,7 +200,7 @@
+--- a/src/uipp/prompter/GARApplication.C
++++ b/src/uipp/prompter/GARApplication.C
+@@ -198,7 +198,7 @@
      }
  }            
  
@@ -215,9 +222,8 @@ diff -urNad dx~/src/uipp/prompter/GARApplication.C dx/src/uipp/prompter/GARAppli
  			       char**        argv)
  {
      ASSERT(argcp);
-diff -urNad dx~/src/uipp/prompter/GARApplication.h dx/src/uipp/prompter/GARApplication.h
---- dx~/src/uipp/prompter/GARApplication.h	2003-09-20 07:33:21.000000000 +0200
-+++ dx/src/uipp/prompter/GARApplication.h	2008-02-16 20:11:38.000000000 +0100
+--- a/src/uipp/prompter/GARApplication.h
++++ b/src/uipp/prompter/GARApplication.h
 @@ -129,7 +129,7 @@
      // Overrides the Application class version:
      //   Initializes Xt Intrinsics with option list (switches).
@@ -227,10 +233,9 @@ diff -urNad dx~/src/uipp/prompter/GARApplication.h dx/src/uipp/prompter/GARAppli
  			    char**        argv);
  
      CommandScope       *commandScope;   // command scope
-diff -urNad dx~/src/uipp/prompter/Main.C dx/src/uipp/prompter/Main.C
---- dx~/src/uipp/prompter/Main.C	2002-10-04 16:17:37.000000000 +0200
-+++ dx/src/uipp/prompter/Main.C	2008-02-16 19:24:41.000000000 +0100
-@@ -18,7 +18,7 @@
+--- a/src/uipp/prompter/Main.C
++++ b/src/uipp/prompter/Main.C
+@@ -17,7 +17,7 @@
  #endif
  
  
@@ -239,9 +244,8 @@ diff -urNad dx~/src/uipp/prompter/Main.C dx/src/uipp/prompter/Main.C
  	  char**       argv)
  {
  #if defined(HAVE_HCLXMINIT)
-diff -urNad dx~/src/uipp/startup/Main.C dx/src/uipp/startup/Main.C
---- dx~/src/uipp/startup/Main.C	2000-05-16 20:53:07.000000000 +0200
-+++ dx/src/uipp/startup/Main.C	2008-02-16 19:24:41.000000000 +0100
+--- a/src/uipp/startup/Main.C
++++ b/src/uipp/startup/Main.C
 @@ -14,7 +14,7 @@
  extern "C" void HCLXmInit();
  #endif
@@ -251,9 +255,8 @@ diff -urNad dx~/src/uipp/startup/Main.C dx/src/uipp/startup/Main.C
  	  char**       argv)
  {
  #if defined(HAVE_HCLXMINIT)
-diff -urNad dx~/src/uipp/startup/StartupApplication.C dx/src/uipp/startup/StartupApplication.C
---- dx~/src/uipp/startup/StartupApplication.C	2006-01-27 11:30:00.000000000 +0100
-+++ dx/src/uipp/startup/StartupApplication.C	2008-02-16 20:07:47.000000000 +0100
+--- a/src/uipp/startup/StartupApplication.C
++++ b/src/uipp/startup/StartupApplication.C
 @@ -117,7 +117,7 @@
  #endif       
  }            
@@ -263,9 +266,8 @@ diff -urNad dx~/src/uipp/startup/StartupApplication.C dx/src/uipp/startup/Startu
  			       char**        argv)
  {
      ASSERT(argcp);
-diff -urNad dx~/src/uipp/startup/StartupApplication.h dx/src/uipp/startup/StartupApplication.h
---- dx~/src/uipp/startup/StartupApplication.h	2003-09-20 07:33:56.000000000 +0200
-+++ dx/src/uipp/startup/StartupApplication.h	2008-02-16 20:07:57.000000000 +0100
+--- a/src/uipp/startup/StartupApplication.h
++++ b/src/uipp/startup/StartupApplication.h
 @@ -84,7 +84,7 @@
      // Overrides the Application class version:
      //   Initializes Xt Intrinsics with option list (switches).
@@ -275,9 +277,8 @@ diff -urNad dx~/src/uipp/startup/StartupApplication.h dx/src/uipp/startup/Startu
  
      CommandScope       *commandScope;   // command scope
  
-diff -urNad dx~/src/uipp/tutor/Main.C dx/src/uipp/tutor/Main.C
---- dx~/src/uipp/tutor/Main.C	2000-05-16 20:53:15.000000000 +0200
-+++ dx/src/uipp/tutor/Main.C	2008-02-16 19:24:41.000000000 +0100
+--- a/src/uipp/tutor/Main.C
++++ b/src/uipp/tutor/Main.C
 @@ -31,7 +31,7 @@
  //
  const char *AssertMsgString = "Internal error detected at \"%s\":%d.\n";
@@ -287,9 +288,8 @@ diff -urNad dx~/src/uipp/tutor/Main.C dx/src/uipp/tutor/Main.C
  	  char**       argv)
  {
  #if defined(HAVE_HCLXMINIT)
-diff -urNad dx~/src/uipp/tutor/TutorApplication.C dx/src/uipp/tutor/TutorApplication.C
---- dx~/src/uipp/tutor/TutorApplication.C	2008-02-16 16:59:56.000000000 +0100
-+++ dx/src/uipp/tutor/TutorApplication.C	2008-02-16 20:11:21.000000000 +0100
+--- a/src/uipp/tutor/TutorApplication.C
++++ b/src/uipp/tutor/TutorApplication.C
 @@ -196,7 +196,7 @@
  #endif       
  }            
@@ -299,9 +299,8 @@ diff -urNad dx~/src/uipp/tutor/TutorApplication.C dx/src/uipp/tutor/TutorApplica
  			       char**        argv)
  {
      ASSERT(argcp);
-diff -urNad dx~/src/uipp/tutor/TutorApplication.h dx/src/uipp/tutor/TutorApplication.h
---- dx~/src/uipp/tutor/TutorApplication.h	1999-05-10 17:46:30.000000000 +0200
-+++ dx/src/uipp/tutor/TutorApplication.h	2008-02-16 20:11:10.000000000 +0100
+--- a/src/uipp/tutor/TutorApplication.h
++++ b/src/uipp/tutor/TutorApplication.h
 @@ -69,7 +69,7 @@
      // Overrides the Application class version:
      //   Initializes Xt Intrinsics with option list (switches).
diff --git a/debian/patches/10-invoke-man.patch b/debian/patches/10-invoke-man.patch
new file mode 100644
index 0000000..b33fc17
--- /dev/null
+++ b/debian/patches/10-invoke-man.patch
@@ -0,0 +1,24 @@
+From: Daniel Kobras <kobras@debian.org>
+Subject: dx -longhelp invokes man browser.
+From Debian diff dx_4.3.0-2, converted to dpatch format.
+
+--- dx-4.3.0.orig/bin/dx.in
++++ dx-4.3.0/bin/dx.in
+@@ -60,12 +60,12 @@
+ #
+ longhelp() {
+ 
+-if test -f "$dxroot/man/catl/dx.l" ; then
+-    more "$dxroot/man/catl/dx.l"
++manbrowser="`/usr/bin/which man`"
++if test -x "$manbrowser"; then
++    "$manbrowser" 1 dx
+ else
+-    echo "cannot find $dxroot/man/catl/dx.l"
+-    echo "set the DXROOT environment variable to the root of the"
+-    echo "dx installation tree and try again."
++    echo Failed to launch standard man browser.  Please check out man page
++    echo 'dx(1)' with a man browser of your choice.
+ fi
+ exit 1
+ 
diff --git a/debian/patches/10-kernel-includes-fix.patch b/debian/patches/10-kernel-includes-fix.patch
new file mode 100644
index 0000000..8922b96
--- /dev/null
+++ b/debian/patches/10-kernel-includes-fix.patch
@@ -0,0 +1,19 @@
+From: Daniel Kobras <kobras@debian.org>
+Subject: Include files in linux/ are kernel headers that should never be
+ pulled in directly by regular applications, and indeed they're
+ superfluous (theses days, at least). Current distributions
+ tend to ship without these files installed by default, hence
+ removing the includes avoid build failures.
+
+diff -urNad dx~/src/exec/libdx/memory.c dx/src/exec/libdx/memory.c
+--- dx~/src/exec/libdx/memory.c	2006-01-27 11:29:54.000000000 +0100
++++ dx/src/exec/libdx/memory.c	2007-06-12 20:21:32.000000000 +0200
+@@ -65,8 +65,6 @@
+ #endif
+ 
+ #if linux
+-#include <linux/kernel.h>
+-#include <linux/sys.h>
+ #include <sys/sysinfo.h>
+ #endif
+ 
diff --git a/debian/patches/10_kfreebsd_build_fixes.dpatch b/debian/patches/10-kfreebsd-build-fixes.patch
similarity index 55%
rename from debian/patches/10_kfreebsd_build_fixes.dpatch
rename to debian/patches/10-kfreebsd-build-fixes.patch
index 7cfffea..c9d1ca1 100644
--- a/debian/patches/10_kfreebsd_build_fixes.dpatch
+++ b/debian/patches/10-kfreebsd-build-fixes.patch
@@ -1,14 +1,14 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 10_kfreebsd_build_fixes.dpatch by Cyril Brulebois <cyril.brulebois@enst-bretagne.fr>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: FreeBSD kernel with GNU userland is not detected properly in all places.
+From: Cyril Brulebois <cyril.brulebois@enst-bretagne.fr>
+Subject: FreeBSD kernel with GNU userland is not detected properly in all places.
 
-@DPATCH@
-diff -urNad dx~/src/exec/libdx/memory.c dx/src/exec/libdx/memory.c
---- dx~/src/exec/libdx/memory.c	2008-02-16 16:59:55.000000000 +0100
-+++ dx/src/exec/libdx/memory.c	2008-02-16 18:20:57.000000000 +0100
-@@ -70,7 +70,7 @@
+---
+ src/exec/libdx/memory.c          |    4 ++--
+ src/uipp/startup/StartupWindow.C |    2 +-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+--- a/src/exec/libdx/memory.c
++++ b/src/exec/libdx/memory.c
+@@ -68,7 +68,7 @@
  #include <sys/sysinfo.h>
  #endif
  
@@ -17,7 +17,7 @@ diff -urNad dx~/src/exec/libdx/memory.c dx/src/exec/libdx/memory.c
  #include <sys/types.h>
  #include <sys/sysctl.h>
  #endif
-@@ -1062,7 +1062,7 @@
+@@ -1060,7 +1060,7 @@
  #define LARGE(x) ((ulong)x>=(ulong)large)
  #endif
  
@@ -26,9 +26,8 @@ diff -urNad dx~/src/exec/libdx/memory.c dx/src/exec/libdx/memory.c
  #define initvalues
  #define SMALL_BASE    0               /* use data segment */
  #define SMALL_GET     _dxfgetmem      /* expand by using DosSetMem */
-diff -urNad dx~/src/uipp/startup/StartupWindow.C dx/src/uipp/startup/StartupWindow.C
---- dx~/src/uipp/startup/StartupWindow.C	2006-01-27 11:30:00.000000000 +0100
-+++ dx/src/uipp/startup/StartupWindow.C	2008-02-16 18:21:46.000000000 +0100
+--- a/src/uipp/startup/StartupWindow.C
++++ b/src/uipp/startup/StartupWindow.C
 @@ -65,7 +65,7 @@
  // On these platforms, the pipe doesn't work that way so we'll make a
  // polling loop that runs once every few seconds and checks the child pid.
diff --git a/debian/patches/10_magickcore_api.dpatch b/debian/patches/10-magickcore-api.patch
similarity index 82%
rename from debian/patches/10_magickcore_api.dpatch
rename to debian/patches/10-magickcore-api.patch
index 27a6788..0cdb0c1 100644
--- a/debian/patches/10_magickcore_api.dpatch
+++ b/debian/patches/10-magickcore-api.patch
@@ -1,11 +1,7 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 10_magickcore_api.dpatch by Ilya Barygin <barygin@gmail.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Since MagickCore 6.5.7, DestroyConstitute() function was renamed to
-## DP: ConstituteComponentTerminus().
+From: Ilya Barygin <barygin@gmail.com>
+Subject: Since MagickCore 6.5.7, DestroyConstitute() function was renamed to
+ ConstituteComponentTerminus().
 
-@DPATCH@
 diff -urNad dx-4.4.4~/src/exec/dxmods/_im_image.c dx-4.4.4/src/exec/dxmods/_im_image.c
 --- dx-4.4.4~/src/exec/dxmods/_im_image.c	2006-01-06 01:55:43.000000000 +0300
 +++ dx-4.4.4/src/exec/dxmods/_im_image.c	2010-03-02 20:39:55.000000000 +0300
diff --git a/debian/patches/10_open_mode.dpatch b/debian/patches/10-open-mode.patch
similarity index 86%
rename from debian/patches/10_open_mode.dpatch
rename to debian/patches/10-open-mode.patch
index af76bb5..cf8962c 100644
--- a/debian/patches/10_open_mode.dpatch
+++ b/debian/patches/10-open-mode.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 10_open_mode.dpatch by James Westby <james.westby@canonical.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Add mode argument to open() calls with O_CREAT.
+From: James Westby <james.westby@canonical.com>
+Subject: Add mode argument to open() calls with O_CREAT.
 
-@DPATCH@
 diff -urNad dx-4.4.4~/src/exec/libdx/fileio.c dx-4.4.4/src/exec/libdx/fileio.c
 --- dx-4.4.4~/src/exec/libdx/fileio.c	2006-01-05 22:55:47.000000000 +0000
 +++ dx-4.4.4/src/exec/libdx/fileio.c	2009-01-17 17:06:51.000000000 +0000
diff --git a/debian/patches/10_64bit_pointer_fixes.dpatch b/debian/patches/10_64bit_pointer_fixes.dpatch
deleted file mode 100644
index f078907..0000000
--- a/debian/patches/10_64bit_pointer_fixes.dpatch
+++ /dev/null
@@ -1,37 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 10_64bit_pointer_fixes.dpatch by Daniel Kobras <kobras@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Trying to store a pointer in an int is a bad idea on 64bit platforms
-## DP: This patch fixes various issues all over the place due to missing
-## DP: function declarations or coding errors.
-## DP:
-## DP: Patch for hwTmesh.c thanks to dann frazier <dannf@hp.com>.
-## DP:
-## DP: This is still work in progress.
-
-@DPATCH@
-diff -urNad --exclude=CVS --exclude=.svn ./include/dx/advanced.h /tmp/dpep-work.peq0hu/dx/include/dx/advanced.h
---- ./include/dx/advanced.h	2003-07-17 09:51:31.000000000 +0200
-+++ /tmp/dpep-work.peq0hu/dx/include/dx/advanced.h	2005-08-09 15:21:51.000000000 +0200
-@@ -42,7 +42,8 @@
- #include <sys/mman.h>
- typedef msemaphore lock_type;
- #else
--typedef volatile int lock_type;
-+/* Must be large enough to hold a pointer */
-+typedef volatile unsigned long lock_type;
- #endif
- 
- void DXenable_locks(int enable);
-diff -urNad --exclude=CVS --exclude=.svn ./src/exec/hwrender/hwTmesh.c /tmp/dpep-work.peq0hu/dx/src/exec/hwrender/hwTmesh.c
---- ./src/exec/hwrender/hwTmesh.c	2002-03-21 03:59:12.000000000 +0100
-+++ /tmp/dpep-work.peq0hu/dx/src/exec/hwrender/hwTmesh.c	2005-08-09 15:17:36.000000000 +0200
-@@ -19,6 +19,7 @@
- #include "hwTmesh.h"
- #include "hwMemory.h"
- #include "hwWindow.h"
-+#include "hwObjectHash.h"
- 
- #include "hwDebug.h"
- 
diff --git a/debian/patches/10_fix_man_section.dpatch b/debian/patches/10_fix_man_section.dpatch
deleted file mode 100644
index 5f17941..0000000
--- a/debian/patches/10_fix_man_section.dpatch
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/sh -e
-## 10_fix_man_section by Daniel Kobras <kobras@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Change section of man page from 1V to 1.
-## DP: From Debian diff dx_4.3.0-2, converted to dpatch format.
-
-if [ $# -ne 1 ]; then
-    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-    exit 1
-fi
-
-[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
-patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
-
-case "$1" in
-       -patch) patch $patch_opts -p1 < $0;;
-       -unpatch) patch $patch_opts -p1 -R < $0;;
-        *)
-                echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-                exit 1;;
-esac
-
-exit 0
-
-@DPATCH@
---- dx-4.3.0.orig/man/manl/dx.l
-+++ dx-4.3.0/man/manl/dx.l
-@@ -1,7 +1,7 @@
- .de SO
- \fB\\$1\fR \\$2
- ..
--.TH DX 1V "" "IBM Visualization Data Explorer" 
-+.TH DX 1 "" "IBM Visualization Data Explorer" 
- .SH NAME
- dx \- start the Data Explorer visualization system.  Optionally
- directly start the User Interface 
diff --git a/debian/patches/10_invoke_man.dpatch b/debian/patches/10_invoke_man.dpatch
deleted file mode 100644
index 0d76708..0000000
--- a/debian/patches/10_invoke_man.dpatch
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/bin/sh -e
-## 10_invoke_man by Daniel Kobras <kobras@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: dx -longhelp invokes man browser.
-## DP: From Debian diff dx_4.3.0-2, converted to dpatch format.
-
-if [ $# -ne 1 ]; then
-    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-    exit 1
-fi
-
-[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
-patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
-
-case "$1" in
-       -patch) patch $patch_opts -p1 < $0;;
-       -unpatch) patch $patch_opts -p1 -R < $0;;
-        *)
-                echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-                exit 1;;
-esac
-
-exit 0
-
-@DPATCH@
---- dx-4.3.0.orig/bin/dx.in
-+++ dx-4.3.0/bin/dx.in
-@@ -60,12 +60,12 @@
- #
- longhelp() {
- 
--if test -f "$dxroot/man/catl/dx.l" ; then
--    more "$dxroot/man/catl/dx.l"
-+manbrowser="`/usr/bin/which man`"
-+if test -x "$manbrowser"; then
-+    "$manbrowser" 1 dx
- else
--    echo "cannot find $dxroot/man/catl/dx.l"
--    echo "set the DXROOT environment variable to the root of the"
--    echo "dx installation tree and try again."
-+    echo Failed to launch standard man browser.  Please check out man page
-+    echo 'dx(1)' with a man browser of your choice.
- fi
- exit 1
- 
diff --git a/debian/patches/10_kernel_includes_fix.dpatch b/debian/patches/10_kernel_includes_fix.dpatch
deleted file mode 100644
index a54454c..0000000
--- a/debian/patches/10_kernel_includes_fix.dpatch
+++ /dev/null
@@ -1,23 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 10_kernel_includes_fix.dpatch by Daniel Kobras <kobras@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Include files in linux/ are kernel headers that should never be
-## DP: pulled in directly by regular applications, and indeed they're
-## DP: superfluous (theses days, at least). Current distributions
-## DP: tend to ship without these files installed by default, hence
-## DP: removing the includes avoid build failures.
-
-@DPATCH@
-diff -urNad dx~/src/exec/libdx/memory.c dx/src/exec/libdx/memory.c
---- dx~/src/exec/libdx/memory.c	2006-01-27 11:29:54.000000000 +0100
-+++ dx/src/exec/libdx/memory.c	2007-06-12 20:21:32.000000000 +0200
-@@ -65,8 +65,6 @@
- #endif
- 
- #if linux
--#include <linux/kernel.h>
--#include <linux/sys.h>
- #include <sys/sysinfo.h>
- #endif
- 
diff --git a/debian/patches/20_magick_pkgconfig.dpatch b/debian/patches/20-magick-pkgconfig.patch
similarity index 78%
rename from debian/patches/20_magick_pkgconfig.dpatch
rename to debian/patches/20-magick-pkgconfig.patch
index ee71855..053a05e 100644
--- a/debian/patches/20_magick_pkgconfig.dpatch
+++ b/debian/patches/20-magick-pkgconfig.patch
@@ -1,12 +1,8 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 20_magick_pkgconfig.dpatch by Daniel Kobras <kobras@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Try to determine available Magick installation via pkg-config first,
-## DP: optionally fall back to previous Magick-config-based probing. The
-## DP: pkg-config-based probing supports both GraphicsMagick and ImageMagick.
+From: Daniel Kobras <kobras@debian.org>
+Subject: Try to determine available Magick installation via pkg-config first,
+ optionally fall back to previous Magick-config-based probing. The
+ pkg-config-based probing supports both GraphicsMagick and ImageMagick.
 
-@DPATCH@
 diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' dx~/configure.ac dx/configure.ac
 --- dx~/configure.ac	2010-03-25 14:12:00.000000000 +0100
 +++ dx/configure.ac	2010-03-25 14:26:25.000000000 +0100
diff --git a/debian/patches/30_no_shell_override.dpatch b/debian/patches/30-no-shell-override.patch
similarity index 53%
rename from debian/patches/30_no_shell_override.dpatch
rename to debian/patches/30-no-shell-override.patch
index 910340d..89869c6 100644
--- a/debian/patches/30_no_shell_override.dpatch
+++ b/debian/patches/30-no-shell-override.patch
@@ -1,13 +1,9 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 30_no_shell_override.dpatch by Daniel Kobras <kobras@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Don't override SHELL variable in configure.ac for no apparent reason.
-## DP: Doing so is unsupported and breaks building with /bin/sh pointing to
-## DP: dash. Cf. Debian bug #447022 on libtool/fakeroot for a discussion of
-## DP: the problem.
+From: Daniel Kobras <kobras@debian.org>
+Subject: Don't override SHELL variable in configure.ac for no apparent reason.
+ Doing so is unsupported and breaks building with /bin/sh pointing to
+ dash. Cf. Debian bug #447022 on libtool/fakeroot for a discussion of
+ the problem.
 
-@DPATCH@
 diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' dx~/configure.ac dx/configure.ac
 --- dx~/configure.ac	2010-03-25 17:10:29.000000000 +0100
 +++ dx/configure.ac	2010-03-25 17:10:57.000000000 +0100
diff --git a/debian/patches/40_hdfalt_support.dpatch b/debian/patches/40-hdfalt-support.patch
similarity index 74%
rename from debian/patches/40_hdfalt_support.dpatch
rename to debian/patches/40-hdfalt-support.patch
index 277307f..a93ad2b 100644
--- a/debian/patches/40_hdfalt_support.dpatch
+++ b/debian/patches/40-hdfalt-support.patch
@@ -1,12 +1,8 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 40_hdfalt_support.dpatch by Daniel Kobras <kobras@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Add support for Debian-specific library hdf4-alt that provides an
-## DP: alternative ABI suitable for linking both libhdf4 and netcdf into the
-## DP: same binary without namespace clashes.
+From: Daniel Kobras <kobras@debian.org>
+Subject: Add support for Debian-specific library hdf4-alt that provides an
+ alternative ABI suitable for linking both libhdf4 and netcdf into the
+ same binary without namespace clashes.
 
-@DPATCH@
 diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' dx~/configure.ac dx/configure.ac
 --- dx~/configure.ac	2010-03-25 19:27:17.000000000 +0100
 +++ dx/configure.ac	2010-03-25 19:29:17.000000000 +0100
diff --git a/debian/patches/90_usr_local_cleanup.dpatch b/debian/patches/90-usr-local-cleanup.patch
similarity index 81%
rename from debian/patches/90_usr_local_cleanup.dpatch
rename to debian/patches/90-usr-local-cleanup.patch
index 1ef6826..1be6310 100644
--- a/debian/patches/90_usr_local_cleanup.dpatch
+++ b/debian/patches/90-usr-local-cleanup.patch
@@ -1,32 +1,113 @@
-#! /bin/sh -e
-## 90_usr_local_cleanup.dpatch by Daniel Kobras <kobras@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Change references and defaults to /usr/local/dx to point to
-## DP: the Debian default /usr/lib/dx instead.
+From: Daniel Kobras <kobras@debian.org>
+Subject: Change references and defaults to /usr/local/dx to point to
+ the Debian default /usr/lib/dx instead.
 
-if [ $# -lt 1 ]; then
-    echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
-    exit 1
-fi
+---
+ html/README.htm                      |   40 ++++++++++----------
+ html/README_alphax.htm               |    2 -
+ html/README_hp700.htm                |    2 -
+ html/README_ibm6000.htm              |    2 -
+ html/README_intelnt.htm              |    4 +-
+ html/pages/insgu006.htm              |    2 -
+ html/pages/insgu011.htm              |    4 +-
+ html/pages/insgu013.htm              |    6 +--
+ html/pages/insgu014.htm              |    4 +-
+ html/pages/insgu016.htm              |    6 +--
+ html/pages/insgu017.htm              |    4 +-
+ html/pages/insgu019.htm              |    6 +--
+ html/pages/insgu020.htm              |    4 +-
+ html/pages/insgu022.htm              |    6 +--
+ html/pages/insgu023.htm              |    4 +-
+ html/pages/insgu025.htm              |    6 +--
+ html/pages/insgu026.htm              |    4 +-
+ html/pages/insgu028.htm              |    6 +--
+ html/pages/insgu029.htm              |    2 -
+ html/pages/progu009.htm              |    2 -
+ html/pages/progu011.htm              |    2 -
+ html/pages/progu012.htm              |    4 +-
+ html/pages/progu014.htm              |   32 ++++++++--------
+ html/pages/progu025.htm              |    6 +--
+ html/pages/progu026.htm              |    4 +-
+ html/pages/progu027.htm              |    4 +-
+ html/pages/progu028.htm              |    6 +--
+ html/pages/progu029.htm              |    4 +-
+ html/pages/progu030.htm              |    6 +--
+ html/pages/progu031.htm              |    2 -
+ html/pages/progu032.htm              |    2 -
+ html/pages/progu034.htm              |    8 ++--
+ html/pages/progu035.htm              |    8 ++--
+ html/pages/progu036.htm              |    8 ++--
+ html/pages/progu038.htm              |    2 -
+ html/pages/progu039.htm              |    2 -
+ html/pages/progu040.htm              |    2 -
+ html/pages/progu041.htm              |    6 +--
+ html/pages/progu042.htm              |    4 +-
+ html/pages/progu064.htm              |    2 -
+ html/pages/progu084.htm              |    4 +-
+ html/pages/progu085.htm              |    2 -
+ html/pages/progu086.htm              |    4 +-
+ html/pages/progu087.htm              |    8 ++--
+ html/pages/progu112.htm              |    2 -
+ html/pages/progu117.htm              |    4 +-
+ html/pages/progu174.htm              |    2 -
+ html/pages/progu242.htm              |    2 -
+ html/pages/qikgu014.htm              |    4 +-
+ html/pages/qikgu016.htm              |    4 +-
+ html/pages/qikgu017.htm              |    4 +-
+ html/pages/qikgu018.htm              |    4 +-
+ html/pages/qikgu023.htm              |    4 +-
+ html/pages/qikgu024.htm              |    8 ++--
+ html/pages/qikgu025.htm              |    4 +-
+ html/pages/qikgu028.htm              |   70 +++++++++++++++++------------------
+ html/pages/qikgu030.htm              |    4 +-
+ html/pages/qikgu031.htm              |    2 -
+ html/pages/refgu008.htm              |    6 +--
+ html/pages/refgu009.htm              |    2 -
+ html/pages/refgu014.htm              |    2 -
+ html/pages/refgu017.htm              |    2 -
+ html/pages/refgu033.htm              |    2 -
+ html/pages/refgu048.htm              |    4 +-
+ html/pages/refgu075.htm              |    2 -
+ html/pages/refgu082.htm              |    2 -
+ html/pages/refgu106.htm              |    2 -
+ html/pages/refgu134.htm              |    2 -
+ html/pages/refgu152.htm              |    2 -
+ html/pages/refgu153.htm              |    2 -
+ html/pages/refgu155.htm              |    2 -
+ html/pages/refgu158.htm              |    2 -
+ html/pages/refgu166.htm              |    2 -
+ html/pages/usrgu022.htm              |    2 -
+ html/pages/usrgu050.htm              |    4 +-
+ html/pages/usrgu051.htm              |    6 +--
+ html/pages/usrgu060.htm              |    6 +--
+ html/pages/usrgu062.htm              |    8 ++--
+ html/pages/usrgu063.htm              |    2 -
+ html/pages/usrgu068.htm              |   32 ++++++++--------
+ html/pages/usrgu073.htm              |   10 ++---
+ html/pages/usrgu074.htm              |    2 -
+ html/pages/usrgu076.htm              |    6 +--
+ src/exec/dpexec/config.h             |    2 -
+ src/exec/dpexec/license.c            |    2 -
+ src/exec/libdx/lbcolor.c             |    2 -
+ src/exec/libdx/lbmessage.c           |    2 -
+ src/exec/libdx/lbtext.c              |    2 -
+ src/misc/dx.c                        |    2 -
+ src/uipp/base/IBMApplication.C       |    2 -
+ src/uipp/dxl/conn.c                  |    2 -
+ src/uipp/dxuilib/DXApplication.C     |    2 -
+ src/uipp/dxuilib/EditorWindow.C      |    4 +-
+ src/uipp/dxuilib/JavaNet.C           |    2 -
+ src/uipp/dxuilib/imagemac.net        |    6 +--
+ src/uipp/java/README                 |    8 ++--
+ src/uipp/java/server/startserver.in  |    2 -
+ src/uipp/mb/MBGenerate.C             |    2 -
+ src/uipp/prompter/CommandTextPopup.C |    2 -
+ src/uipp/prompter/GARApplication.C   |    4 +-
+ src/uipp/tutor/TutorApplication.C    |    2 -
+ 101 files changed, 265 insertions(+), 265 deletions(-)
 
-[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
-patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
-
-case "$1" in
-    -patch) patch -p1 ${patch_opts} < $0;;
-    -unpatch) patch -R -p1 ${patch_opts} < $0;;
-    *)
-        echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
-        exit 1;;
-esac
-
-exit 0
-
-@DPATCH@
-diff -urNad dx~/html/README.htm dx/html/README.htm
---- dx~/html/README.htm	2006-01-27 12:03:21.000000000 +0100
-+++ dx/html/README.htm	2006-01-27 12:07:39.000000000 +0100
+--- a/html/README.htm
++++ b/html/README.htm
 @@ -21,7 +21,7 @@
  *      and IBM Visualization Data Explorer for Symmetric Multiprocessing (SMP) 
  * 
@@ -154,9 +235,8 @@ diff -urNad dx~/html/README.htm dx/html/README.htm
    
  C. Modules written for Version 1 
  In order to compile a module written for Version 1 you need to include 
-diff -urNad dx~/html/README_alphax.htm dx/html/README_alphax.htm
---- dx~/html/README_alphax.htm	2006-01-27 12:03:21.000000000 +0100
-+++ dx/html/README_alphax.htm	2006-01-27 12:07:39.000000000 +0100
+--- a/html/README_alphax.htm
++++ b/html/README_alphax.htm
 @@ -101,7 +101,7 @@
    
  A. Shared Library Support for Hardware Rendering 
@@ -166,9 +246,8 @@ diff -urNad dx~/html/README_alphax.htm dx/html/README_alphax.htm
  libraries.  If one of these is not present then hardware rendering will  
  be disabled. 
    
-diff -urNad dx~/html/README_hp700.htm dx/html/README_hp700.htm
---- dx~/html/README_hp700.htm	2006-01-27 12:03:21.000000000 +0100
-+++ dx/html/README_hp700.htm	2006-01-27 12:07:39.000000000 +0100
+--- a/html/README_hp700.htm
++++ b/html/README_hp700.htm
 @@ -120,7 +120,7 @@
    
  A. Shared Library Support for Hardware Rendering 
@@ -178,9 +257,8 @@ diff -urNad dx~/html/README_hp700.htm dx/html/README_hp700.htm
  libraries.  If one of these is not present then hardware rendering will  
  be disabled. 
    
-diff -urNad dx~/html/README_ibm6000.htm dx/html/README_ibm6000.htm
---- dx~/html/README_ibm6000.htm	2006-01-27 12:03:21.000000000 +0100
-+++ dx/html/README_ibm6000.htm	2006-01-27 12:07:39.000000000 +0100
+--- a/html/README_ibm6000.htm
++++ b/html/README_ibm6000.htm
 @@ -97,7 +97,7 @@
    
  A. Shared Library Support for Hardware Rendering 
@@ -190,9 +268,8 @@ diff -urNad dx~/html/README_ibm6000.htm dx/html/README_ibm6000.htm
  libraries.  If one of these is not present then hardware rendering will 
  be disabled. See G "OpenGL vs GL hardware renderer". 
    
-diff -urNad dx~/html/README_intelnt.htm dx/html/README_intelnt.htm
---- dx~/html/README_intelnt.htm	2006-01-27 12:03:21.000000000 +0100
-+++ dx/html/README_intelnt.htm	2006-01-27 12:07:39.000000000 +0100
+--- a/html/README_intelnt.htm
++++ b/html/README_intelnt.htm
 @@ -309,7 +309,7 @@
  <H2><A NAME="Header_10" HREF="#PToC_10">3.3 File name specification: &#47; vs. 
  &#92; and &#59; vs. &#58;</A></H2>                                              
@@ -209,9 +286,8 @@ diff -urNad dx~/html/README_intelnt.htm dx/html/README_intelnt.htm
 -</BODY></HTML>
 \ No newline at end of file
 +</BODY></HTML>
-diff -urNad dx~/html/pages/insgu006.htm dx/html/pages/insgu006.htm
---- dx~/html/pages/insgu006.htm	2006-01-27 12:03:22.000000000 +0100
-+++ dx/html/pages/insgu006.htm	2006-01-27 12:07:39.000000000 +0100
+--- a/html/pages/insgu006.htm
++++ b/html/pages/insgu006.htm
 @@ -61,7 +61,7 @@
  <P>
  To check that the installation has completed successfully, type the following:
@@ -221,9 +297,8 @@ diff -urNad dx~/html/pages/insgu006.htm dx/html/pages/insgu006.htm
  dx  -execute MappedIso.net
  </PRE>
  An Image window will then open and an image of a colored cloud will appear.
-diff -urNad dx~/html/pages/insgu011.htm dx/html/pages/insgu011.htm
---- dx~/html/pages/insgu011.htm	2006-01-27 12:03:22.000000000 +0100
-+++ dx/html/pages/insgu011.htm	2006-01-27 12:07:39.000000000 +0100
+--- a/html/pages/insgu011.htm
++++ b/html/pages/insgu011.htm
 @@ -65,7 +65,7 @@
  </TD></TR></TABLE>
  <P>
@@ -242,9 +317,8 @@ diff -urNad dx~/html/pages/insgu011.htm dx/html/pages/insgu011.htm
  environment, it is most convenient for users if all workstations have
  Data Explorer available through the same root directory. This makes it easier to
  run the User Interface on one machine and the server on another.
-diff -urNad dx~/html/pages/insgu013.htm dx/html/pages/insgu013.htm
---- dx~/html/pages/insgu013.htm	2006-01-27 12:03:22.000000000 +0100
-+++ dx/html/pages/insgu013.htm	2006-01-27 12:07:39.000000000 +0100
+--- a/html/pages/insgu013.htm
++++ b/html/pages/insgu013.htm
 @@ -56,7 +56,7 @@
  Both node-locked and floating licenses require that IBM be provided with
  a unique workstation identifier. Identifiers are generated by the NodeID
@@ -272,9 +346,8 @@ diff -urNad dx~/html/pages/insgu013.htm dx/html/pages/insgu013.htm
  Note that the NodeID information is provided after a successful
  installation of Data Explorer.
  <P><LI>Call IBM Software Registration at 1-800-446-8989 (Monday-Friday,
-diff -urNad dx~/html/pages/insgu014.htm dx/html/pages/insgu014.htm
---- dx~/html/pages/insgu014.htm	2006-01-27 12:03:22.000000000 +0100
-+++ dx/html/pages/insgu014.htm	2006-01-27 12:07:39.000000000 +0100
+--- a/html/pages/insgu014.htm
++++ b/html/pages/insgu014.htm
 @@ -63,7 +63,7 @@
  </TD></TR></TABLE>
  <P>
@@ -293,9 +366,8 @@ diff -urNad dx~/html/pages/insgu014.htm dx/html/pages/insgu014.htm
  environment, it is most convenient for users if all workstations have
  Data Explorer available through the same root directory. This makes it easier to
  run the User Interface on one machine and the server on another.
-diff -urNad dx~/html/pages/insgu016.htm dx/html/pages/insgu016.htm
---- dx~/html/pages/insgu016.htm	2006-01-27 12:03:22.000000000 +0100
-+++ dx/html/pages/insgu016.htm	2006-01-27 12:07:39.000000000 +0100
+--- a/html/pages/insgu016.htm
++++ b/html/pages/insgu016.htm
 @@ -56,7 +56,7 @@
  Both node-locked and floating licenses require that IBM be provided with
  a unique workstation identifier. Identifiers are generated by the NodeID
@@ -323,9 +395,8 @@ diff -urNad dx~/html/pages/insgu016.htm dx/html/pages/insgu016.htm
  Note that the NodeID information is provided after a successful
  installation of Data Explorer.
  <P><LI>Call IBM Software Registration at 1-800-446-8989 (Monday-Friday,
-diff -urNad dx~/html/pages/insgu017.htm dx/html/pages/insgu017.htm
---- dx~/html/pages/insgu017.htm	2006-01-27 12:03:22.000000000 +0100
-+++ dx/html/pages/insgu017.htm	2006-01-27 12:07:39.000000000 +0100
+--- a/html/pages/insgu017.htm
++++ b/html/pages/insgu017.htm
 @@ -65,7 +65,7 @@
  </TD></TR></TABLE>
  <P>
@@ -344,9 +415,8 @@ diff -urNad dx~/html/pages/insgu017.htm dx/html/pages/insgu017.htm
  environment, it is most convenient for users if all workstations have
  Data Explorer available through the same root directory. This makes it easier to
  run the User Interface on one machine and the server on another.
-diff -urNad dx~/html/pages/insgu019.htm dx/html/pages/insgu019.htm
---- dx~/html/pages/insgu019.htm	2006-01-27 12:03:22.000000000 +0100
-+++ dx/html/pages/insgu019.htm	2006-01-27 12:07:39.000000000 +0100
+--- a/html/pages/insgu019.htm
++++ b/html/pages/insgu019.htm
 @@ -56,7 +56,7 @@
  Both node-locked and floating licenses require that IBM be provided with
  a unique workstation identifier. Identifiers are generated by the NodeID
@@ -374,9 +444,8 @@ diff -urNad dx~/html/pages/insgu019.htm dx/html/pages/insgu019.htm
  Note that the NodeID information is provided after a successful
  installation of Data Explorer.
  <P><LI>Call IBM Software Registration at 1-800-446-8989 (Monday-Friday,
-diff -urNad dx~/html/pages/insgu020.htm dx/html/pages/insgu020.htm
---- dx~/html/pages/insgu020.htm	2006-01-27 12:03:22.000000000 +0100
-+++ dx/html/pages/insgu020.htm	2006-01-27 12:07:39.000000000 +0100
+--- a/html/pages/insgu020.htm
++++ b/html/pages/insgu020.htm
 @@ -65,7 +65,7 @@
  </TD></TR></TABLE>
  <P>
@@ -395,9 +464,8 @@ diff -urNad dx~/html/pages/insgu020.htm dx/html/pages/insgu020.htm
  environment, it is most convenient for users if all workstations have
  Data Explorer available through the same root directory. This makes it easier to
  run the User Interface on one machine and the server on another.
-diff -urNad dx~/html/pages/insgu022.htm dx/html/pages/insgu022.htm
---- dx~/html/pages/insgu022.htm	2006-01-27 12:03:22.000000000 +0100
-+++ dx/html/pages/insgu022.htm	2006-01-27 12:07:39.000000000 +0100
+--- a/html/pages/insgu022.htm
++++ b/html/pages/insgu022.htm
 @@ -56,7 +56,7 @@
  Both node-locked and floating licenses require that IBM be provided with
  a unique workstation identifier. Identifiers are generated by the NodeID
@@ -425,9 +493,8 @@ diff -urNad dx~/html/pages/insgu022.htm dx/html/pages/insgu022.htm
  Note that the NodeID information is provided after a successful
  installation of Data Explorer.
  <P><LI>Call IBM Software Registration at 1-800-446-8989 (Monday-Friday,
-diff -urNad dx~/html/pages/insgu023.htm dx/html/pages/insgu023.htm
---- dx~/html/pages/insgu023.htm	2006-01-27 12:03:22.000000000 +0100
-+++ dx/html/pages/insgu023.htm	2006-01-27 12:07:39.000000000 +0100
+--- a/html/pages/insgu023.htm
++++ b/html/pages/insgu023.htm
 @@ -63,7 +63,7 @@
  </TD></TR></TABLE>
  <P>
@@ -446,9 +513,8 @@ diff -urNad dx~/html/pages/insgu023.htm dx/html/pages/insgu023.htm
  environment, it is most convenient for users if all workstations have
  Data Explorer available through the same root directory. This makes it easier to
  run the User Interface on one machine and the server on another.
-diff -urNad dx~/html/pages/insgu025.htm dx/html/pages/insgu025.htm
---- dx~/html/pages/insgu025.htm	2006-01-27 12:03:22.000000000 +0100
-+++ dx/html/pages/insgu025.htm	2006-01-27 12:07:39.000000000 +0100
+--- a/html/pages/insgu025.htm
++++ b/html/pages/insgu025.htm
 @@ -56,7 +56,7 @@
  Both node-locked and floating licenses require that IBM be provided with
  a unique workstation identifier. Identifiers are generated by the NodeID
@@ -476,9 +542,8 @@ diff -urNad dx~/html/pages/insgu025.htm dx/html/pages/insgu025.htm
  Note that the NodeID information is provided after a successful
  installation of Data Explorer.
  <P><LI>Call IBM Software Registration at 1-800-446-8989 (Monday-Friday,
-diff -urNad dx~/html/pages/insgu026.htm dx/html/pages/insgu026.htm
---- dx~/html/pages/insgu026.htm	2006-01-27 12:03:22.000000000 +0100
-+++ dx/html/pages/insgu026.htm	2006-01-27 12:07:39.000000000 +0100
+--- a/html/pages/insgu026.htm
++++ b/html/pages/insgu026.htm
 @@ -63,7 +63,7 @@
  </TD></TR></TABLE>
  <P>
@@ -497,9 +562,8 @@ diff -urNad dx~/html/pages/insgu026.htm dx/html/pages/insgu026.htm
  environment, it is most convenient for users if all workstations have
  Data Explorer available through the same root directory. This makes it easier to
  run the User Interface on one machine and the server on another.
-diff -urNad dx~/html/pages/insgu028.htm dx/html/pages/insgu028.htm
---- dx~/html/pages/insgu028.htm	2006-01-27 12:03:22.000000000 +0100
-+++ dx/html/pages/insgu028.htm	2006-01-27 12:07:39.000000000 +0100
+--- a/html/pages/insgu028.htm
++++ b/html/pages/insgu028.htm
 @@ -56,7 +56,7 @@
  Both node-locked and floating licenses require that IBM be provided with
  a unique workstation identifier. Identifiers are generated by the NodeID
@@ -527,9 +591,8 @@ diff -urNad dx~/html/pages/insgu028.htm dx/html/pages/insgu028.htm
  Note that the NodeID information is provided after a successful
  installation of Data Explorer.
  <P><LI>Call IBM Software Registration at 1-800-446-8989 (Monday-Friday,
-diff -urNad dx~/html/pages/insgu029.htm dx/html/pages/insgu029.htm
---- dx~/html/pages/insgu029.htm	2006-01-27 12:03:22.000000000 +0100
-+++ dx/html/pages/insgu029.htm	2006-01-27 12:07:39.000000000 +0100
+--- a/html/pages/insgu029.htm
++++ b/html/pages/insgu029.htm
 @@ -126,7 +126,7 @@
  </TD></TR><TR VALIGN="TOP"><TD><P><B>-dxroot
  </B></TD><TD><P>indicates the root of the Data Explorer installation directory.
@@ -539,9 +602,8 @@ diff -urNad dx~/html/pages/insgu029.htm dx/html/pages/insgu029.htm
  </TD></TR><TR VALIGN="TOP"><TD><P><B>-echo
  </B></TD><TD><P>the same as -check, above.
  </TD></TR><TR VALIGN="TOP"><TD><P><B>-help
-diff -urNad dx~/html/pages/progu009.htm dx/html/pages/progu009.htm
---- dx~/html/pages/progu009.htm	2006-01-27 12:03:22.000000000 +0100
-+++ dx/html/pages/progu009.htm	2006-01-27 12:07:39.000000000 +0100
+--- a/html/pages/progu009.htm
++++ b/html/pages/progu009.htm
 @@ -79,7 +79,7 @@
  number of examples of
  modules, including import filters and various data manipulation modules.
@@ -551,9 +613,8 @@ diff -urNad dx~/html/pages/progu009.htm dx/html/pages/progu009.htm
  routines from the libDXcallm.a library, simply change the makefiles to
  link to this library instead of to libDXlite.a. All of the routines in
  libDXcallm.a are described in <A HREF="progu097.htm#HDRALLR">Appendix C. "Data
-diff -urNad dx~/html/pages/progu011.htm dx/html/pages/progu011.htm
---- dx~/html/pages/progu011.htm	2006-01-27 12:03:22.000000000 +0100
-+++ dx/html/pages/progu011.htm	2006-01-27 12:07:39.000000000 +0100
+--- a/html/pages/progu011.htm
++++ b/html/pages/progu011.htm
 @@ -47,7 +47,7 @@
  <P>
  Examples of stand-alone programs including <TT>.c</TT> files and
@@ -563,9 +624,8 @@ diff -urNad dx~/html/pages/progu011.htm dx/html/pages/progu011.htm
  represented by the lower "User Program" in <A HREF="progu009.htm#FIGARCH">Figure
  1</A>,
  which embeds Data Explorer module routines into the user's program.
-diff -urNad dx~/html/pages/progu012.htm dx/html/pages/progu012.htm
---- dx~/html/pages/progu012.htm	2006-01-27 12:03:22.000000000 +0100
-+++ dx/html/pages/progu012.htm	2006-01-27 12:07:39.000000000 +0100
+--- a/html/pages/progu012.htm
++++ b/html/pages/progu012.htm
 @@ -45,7 +45,7 @@
  provides this functionality, and is discussed in
  <A HREF="progu084.htm#HDRDXLINK">Chapter 17. "DXLink Developer's Toolkit"</A>.
@@ -584,9 +644,8 @@ diff -urNad dx~/html/pages/progu012.htm dx/html/pages/progu012.htm
  demonstrated using the Data Explorer User Interface, there is no necessity that
  they do so, as all of the modules used in these examples
  (SuperviseWindow, SuperviseState, and Display, in particular) are
-diff -urNad dx~/html/pages/progu014.htm dx/html/pages/progu014.htm
---- dx~/html/pages/progu014.htm	2006-01-27 12:03:22.000000000 +0100
-+++ dx/html/pages/progu014.htm	2006-01-27 12:07:39.000000000 +0100
+--- a/html/pages/progu014.htm
++++ b/html/pages/progu014.htm
 @@ -206,9 +206,9 @@
  <P>&nbsp;
  Copy the following files to the directory you want to work in:
@@ -675,9 +734,8 @@ diff -urNad dx~/html/pages/progu014.htm dx/html/pages/progu014.htm
  directory.
  <P><HR><B>&#91; <A HREF="#Top_Of_Page">Top of Page</A> &#124; <A
  HREF="progu013.htm">Previous Page</A> &#124; <A HREF="progu015.htm">Next
-diff -urNad dx~/html/pages/progu025.htm dx/html/pages/progu025.htm
---- dx~/html/pages/progu025.htm	2006-01-27 12:03:22.000000000 +0100
-+++ dx/html/pages/progu025.htm	2006-01-27 12:07:39.000000000 +0100
+--- a/html/pages/progu025.htm
++++ b/html/pages/progu025.htm
 @@ -85,7 +85,7 @@
  An <TT><STRONG>Open a Module Builder file...</STRONG></TT> dialog box appears.
  <P>
@@ -705,9 +763,8 @@ diff -urNad dx~/html/pages/progu025.htm dx/html/pages/progu025.htm
  <P><HR><B>&#91; <A HREF="#Top_Of_Page">Top of Page</A> &#124; <A
  HREF="progu024.htm">Previous Page</A> &#124; <A HREF="progu026.htm">Next
  Page</A> &#124; <A HREF="../proguide.htm#ToC">Table of Contents</A> &#124; <A
-diff -urNad dx~/html/pages/progu026.htm dx/html/pages/progu026.htm
---- dx~/html/pages/progu026.htm	2006-01-27 12:03:22.000000000 +0100
-+++ dx/html/pages/progu026.htm	2006-01-27 12:07:39.000000000 +0100
+--- a/html/pages/progu026.htm
++++ b/html/pages/progu026.htm
 @@ -66,7 +66,7 @@
  }
  </PRE>
@@ -726,9 +783,8 @@ diff -urNad dx~/html/pages/progu026.htm dx/html/pages/progu026.htm
  <P><HR><B>&#91; <A HREF="#Top_Of_Page">Top of Page</A> &#124; <A
  HREF="progu025.htm">Previous Page</A> &#124; <A HREF="progu027.htm">Next
  Page</A> &#124; <A HREF="../proguide.htm#ToC">Table of Contents</A> &#124; <A
-diff -urNad dx~/html/pages/progu027.htm dx/html/pages/progu027.htm
---- dx~/html/pages/progu027.htm	2006-01-27 12:03:22.000000000 +0100
-+++ dx/html/pages/progu027.htm	2006-01-27 12:07:39.000000000 +0100
+--- a/html/pages/progu027.htm
++++ b/html/pages/progu027.htm
 @@ -117,7 +117,7 @@
    float *out_ptr, *in1_ptr, *in2_ptr;
  </PRE>
@@ -747,9 +803,8 @@ diff -urNad dx~/html/pages/progu027.htm dx/html/pages/progu027.htm
  <P><HR><B>&#91; <A HREF="#Top_Of_Page">Top of Page</A> &#124; <A
  HREF="progu026.htm">Previous Page</A> &#124; <A HREF="progu028.htm">Next
  Page</A> &#124; <A HREF="../proguide.htm#ToC">Table of Contents</A> &#124; <A
-diff -urNad dx~/html/pages/progu028.htm dx/html/pages/progu028.htm
---- dx~/html/pages/progu028.htm	2006-01-27 12:03:22.000000000 +0100
-+++ dx/html/pages/progu028.htm	2006-01-27 12:07:39.000000000 +0100
+--- a/html/pages/progu028.htm
++++ b/html/pages/progu028.htm
 @@ -86,7 +86,7 @@
  dialog box appears.
  <P>
@@ -777,9 +832,8 @@ diff -urNad dx~/html/pages/progu028.htm dx/html/pages/progu028.htm
  <P><HR><B>&#91; <A HREF="#Top_Of_Page">Top of Page</A> &#124; <A
  HREF="progu027.htm">Previous Page</A> &#124; <A HREF="progu029.htm">Next
  Page</A> &#124; <A HREF="../proguide.htm#ToC">Table of Contents</A> &#124; <A
-diff -urNad dx~/html/pages/progu029.htm dx/html/pages/progu029.htm
---- dx~/html/pages/progu029.htm	2006-01-27 12:03:22.000000000 +0100
-+++ dx/html/pages/progu029.htm	2006-01-27 12:07:39.000000000 +0100
+--- a/html/pages/progu029.htm
++++ b/html/pages/progu029.htm
 @@ -118,7 +118,7 @@
    Line *conn_ptr;
  </PRE>
@@ -798,9 +852,8 @@ diff -urNad dx~/html/pages/progu029.htm dx/html/pages/progu029.htm
  <P><HR><B>&#91; <A HREF="#Top_Of_Page">Top of Page</A> &#124; <A
  HREF="progu028.htm">Previous Page</A> &#124; <A HREF="progu030.htm">Next
  Page</A> &#124; <A HREF="../proguide.htm#ToC">Table of Contents</A> &#124; <A
-diff -urNad dx~/html/pages/progu030.htm dx/html/pages/progu030.htm
---- dx~/html/pages/progu030.htm	2006-01-27 12:03:22.000000000 +0100
-+++ dx/html/pages/progu030.htm	2006-01-27 12:07:39.000000000 +0100
+--- a/html/pages/progu030.htm
++++ b/html/pages/progu030.htm
 @@ -80,7 +80,7 @@
  An <TT><STRONG>Open a Module Builder file...</STRONG></TT> dialog box appears.
  <P>
@@ -828,9 +881,8 @@ diff -urNad dx~/html/pages/progu030.htm dx/html/pages/progu030.htm
  <P><HR><B>&#91; <A HREF="#Top_Of_Page">Top of Page</A> &#124; <A
  HREF="progu029.htm">Previous Page</A> &#124; <A HREF="progu031.htm">Next
  Page</A> &#124; <A HREF="../proguide.htm#ToC">Table of Contents</A> &#124; <A
-diff -urNad dx~/html/pages/progu031.htm dx/html/pages/progu031.htm
---- dx~/html/pages/progu031.htm	2006-01-27 12:03:22.000000000 +0100
-+++ dx/html/pages/progu031.htm	2006-01-27 12:07:39.000000000 +0100
+--- a/html/pages/progu031.htm
++++ b/html/pages/progu031.htm
 @@ -79,7 +79,7 @@
  <P>
  The following C program requires the HDF file name as an argument.
@@ -840,9 +892,8 @@ diff -urNad dx~/html/pages/progu031.htm dx/html/pages/progu031.htm
  </TT>.
  <PRE>
  01
-diff -urNad dx~/html/pages/progu032.htm dx/html/pages/progu032.htm
---- dx~/html/pages/progu032.htm	2006-01-27 12:03:22.000000000 +0100
-+++ dx/html/pages/progu032.htm	2006-01-27 12:07:39.000000000 +0100
+--- a/html/pages/progu032.htm
++++ b/html/pages/progu032.htm
 @@ -44,7 +44,7 @@
  traversal of input Fields, the Module Builder is not used in
  this example.
@@ -852,9 +903,8 @@ diff -urNad dx~/html/pages/progu032.htm dx/html/pages/progu032.htm
  </TT>
  <PRE>
  01   #include &lt;dx/dx.h&gt;
-diff -urNad dx~/html/pages/progu034.htm dx/html/pages/progu034.htm
---- dx~/html/pages/progu034.htm	2006-01-27 12:03:22.000000000 +0100
-+++ dx/html/pages/progu034.htm	2006-01-27 12:07:39.000000000 +0100
+--- a/html/pages/progu034.htm
++++ b/html/pages/progu034.htm
 @@ -56,9 +56,9 @@
  To create a version of Data Explorer that includes this module, copy the
  following files to the directory where you want to work:
@@ -877,9 +927,8 @@ diff -urNad dx~/html/pages/progu034.htm dx/html/pages/progu034.htm
  directory.
  <PRE>
  01   #include &lt;dx/dx.h&gt;
-diff -urNad dx~/html/pages/progu035.htm dx/html/pages/progu035.htm
---- dx~/html/pages/progu035.htm	2006-01-27 12:03:22.000000000 +0100
-+++ dx/html/pages/progu035.htm	2006-01-27 12:07:39.000000000 +0100
+--- a/html/pages/progu035.htm
++++ b/html/pages/progu035.htm
 @@ -57,9 +57,9 @@
  To create an "addparallel" module, copy the following files to
  the directory you want to work in:
@@ -902,9 +951,8 @@ diff -urNad dx~/html/pages/progu035.htm dx/html/pages/progu035.htm
  .
  <P>
  The AddParallel module:
-diff -urNad dx~/html/pages/progu036.htm dx/html/pages/progu036.htm
---- dx~/html/pages/progu036.htm	2006-01-27 12:03:22.000000000 +0100
-+++ dx/html/pages/progu036.htm	2006-01-27 12:07:39.000000000 +0100
+--- a/html/pages/progu036.htm
++++ b/html/pages/progu036.htm
 @@ -58,9 +58,9 @@
  module, copy the following files to the directory where you
  want to work:
@@ -927,9 +975,8 @@ diff -urNad dx~/html/pages/progu036.htm dx/html/pages/progu036.htm
  <P>
  The example AverageCellParallel code follows:
  <PRE>
-diff -urNad dx~/html/pages/progu038.htm dx/html/pages/progu038.htm
---- dx~/html/pages/progu038.htm	2006-01-27 12:03:22.000000000 +0100
-+++ dx/html/pages/progu038.htm	2006-01-27 12:07:39.000000000 +0100
+--- a/html/pages/progu038.htm
++++ b/html/pages/progu038.htm
 @@ -42,7 +42,7 @@
  Then it can call the DXReadyToRun() function to request reexecution.
  (For an example of how to use this function,  see the sample
@@ -939,9 +986,8 @@ diff -urNad dx~/html/pages/progu038.htm dx/html/pages/progu038.htm
  If the module is outboard, the PERSISTENT flag must also be set, so that
  it does not exit after each execution.
  <P>
-diff -urNad dx~/html/pages/progu039.htm dx/html/pages/progu039.htm
---- dx~/html/pages/progu039.htm	2006-01-27 12:03:22.000000000 +0100
-+++ dx/html/pages/progu039.htm	2006-01-27 12:07:39.000000000 +0100
+--- a/html/pages/progu039.htm
++++ b/html/pages/progu039.htm
 @@ -46,7 +46,7 @@
  <TR VALIGN="TOP"><TD><P><B><TT><STRONG>inboard modules</STRONG></TT>
  </B></TD><TD><P>Are compiled into Data Explorer.
@@ -951,9 +997,8 @@ diff -urNad dx~/html/pages/progu039.htm dx/html/pages/progu039.htm
  with your own copy (i.e., a copy
  incorporating your module).
  </TD></TR><TR VALIGN="TOP"><TD><P><B><TT><STRONG>outboard modules</STRONG></TT>
-diff -urNad dx~/html/pages/progu040.htm dx/html/pages/progu040.htm
---- dx~/html/pages/progu040.htm	2006-01-27 12:03:22.000000000 +0100
-+++ dx/html/pages/progu040.htm	2006-01-27 12:07:39.000000000 +0100
+--- a/html/pages/progu040.htm
++++ b/html/pages/progu040.htm
 @@ -35,7 +35,7 @@
  <A NAME="IDX338"></A>
  <P>
@@ -963,9 +1008,8 @@ diff -urNad dx~/html/pages/progu040.htm dx/html/pages/progu040.htm
  <A NAME="IDX339"></A>
  <A NAME="IDX340"></A>
  <A NAME="IDX341"></A>
-diff -urNad dx~/html/pages/progu041.htm dx/html/pages/progu041.htm
---- dx~/html/pages/progu041.htm	2006-01-27 12:03:22.000000000 +0100
-+++ dx/html/pages/progu041.htm	2006-01-27 12:07:39.000000000 +0100
+--- a/html/pages/progu041.htm
++++ b/html/pages/progu041.htm
 @@ -35,7 +35,7 @@
  <A NAME="IDX351"></A>
  <P>
@@ -989,9 +1033,8 @@ diff -urNad dx~/html/pages/progu041.htm dx/html/pages/progu041.htm
  sample modules.
  <PRE>
  /*
-diff -urNad dx~/html/pages/progu042.htm dx/html/pages/progu042.htm
---- dx~/html/pages/progu042.htm	2006-01-27 12:03:22.000000000 +0100
-+++ dx/html/pages/progu042.htm	2006-01-27 12:07:39.000000000 +0100
+--- a/html/pages/progu042.htm
++++ b/html/pages/progu042.htm
 @@ -35,7 +35,7 @@
  <A NAME="IDX376"></A>
  <P>
@@ -1010,9 +1053,8 @@ diff -urNad dx~/html/pages/progu042.htm dx/html/pages/progu042.htm
  <LI>Connect the user interface to the debugging session by selecting
  <TT><STRONG>Connect to already running server</STRONG></TT> in the
  <TT><STRONG>Options</STRONG></TT> dialog box of the
-diff -urNad dx~/html/pages/progu064.htm dx/html/pages/progu064.htm
---- dx~/html/pages/progu064.htm	2006-01-27 12:03:22.000000000 +0100
-+++ dx/html/pages/progu064.htm	2006-01-27 12:07:39.000000000 +0100
+--- a/html/pages/progu064.htm
++++ b/html/pages/progu064.htm
 @@ -141,7 +141,7 @@
  Data Explorer modules can be called by inboard, outboard, and runtime-loadable
  modules linked to Data Explorer.
@@ -1022,9 +1064,8 @@ diff -urNad dx~/html/pages/progu064.htm dx/html/pages/progu064.htm
  <P><B>Note: </B>Use of DXCallModule in a stand-alone program or outboard module
  requires linking to the library libDXcallm.a.
  <TABLE CELLPADDING="3">
-diff -urNad dx~/html/pages/progu084.htm dx/html/pages/progu084.htm
---- dx~/html/pages/progu084.htm	2006-01-27 12:03:22.000000000 +0100
-+++ dx/html/pages/progu084.htm	2006-01-27 12:07:39.000000000 +0100
+--- a/html/pages/progu084.htm
++++ b/html/pages/progu084.htm
 @@ -115,10 +115,10 @@
  <TT>dxl.h</TT>, which should be included in any C file that uses them.
  The following sections describe three simple DXLink programs. All
@@ -1038,9 +1079,8 @@ diff -urNad dx~/html/pages/progu084.htm dx/html/pages/progu084.htm
  for instructions on how to create them.
  
  <TABLE BORDER WIDTH="100%"><TR><TH ALIGN="LEFT">Stand-alone
-diff -urNad dx~/html/pages/progu085.htm dx/html/pages/progu085.htm
---- dx~/html/pages/progu085.htm	2006-01-27 12:03:23.000000000 +0100
-+++ dx/html/pages/progu085.htm	2006-01-27 12:07:39.000000000 +0100
+--- a/html/pages/progu085.htm
++++ b/html/pages/progu085.htm
 @@ -47,7 +47,7 @@
  #include &lt;stdio.h&gt;
  #include "dx/dxl.h"
@@ -1050,9 +1090,8 @@ diff -urNad dx~/html/pages/progu085.htm dx/html/pages/progu085.htm
  #endif
  /*
   * define an error handler
-diff -urNad dx~/html/pages/progu086.htm dx/html/pages/progu086.htm
---- dx~/html/pages/progu086.htm	2006-01-27 12:03:23.000000000 +0100
-+++ dx/html/pages/progu086.htm	2006-01-27 12:07:39.000000000 +0100
+--- a/html/pages/progu086.htm
++++ b/html/pages/progu086.htm
 @@ -55,7 +55,7 @@
  #include &lt;stdio.h&gt;
  #include "dx/dxl.h"
@@ -1071,9 +1110,8 @@ diff -urNad dx~/html/pages/progu086.htm dx/html/pages/progu086.htm
      DXLSetValue(conn, "maptoplane_point", "&#91;0 5000 5000&#93;");
      /*
       * Execute the visual program and check for input from maptoplane_max.
-diff -urNad dx~/html/pages/progu087.htm dx/html/pages/progu087.htm
---- dx~/html/pages/progu087.htm	2006-01-27 12:03:23.000000000 +0100
-+++ dx/html/pages/progu087.htm	2006-01-27 12:07:39.000000000 +0100
+--- a/html/pages/progu087.htm
++++ b/html/pages/progu087.htm
 @@ -229,28 +229,28 @@
  void radio_cloudCB(Widget w, XtPointer xp1, XtPointer xp2)
  {
@@ -1107,9 +1145,8 @@ diff -urNad dx~/html/pages/progu087.htm dx/html/pages/progu087.htm
     DXLSend(conn, "mean,sd,var,min,max = Statistics(g);");
     DXLSend(conn, "DXLOutput(\"windmax\", max);");
  }
-diff -urNad dx~/html/pages/progu112.htm dx/html/pages/progu112.htm
---- dx~/html/pages/progu112.htm	2006-01-27 12:03:23.000000000 +0100
-+++ dx/html/pages/progu112.htm	2006-01-27 12:07:39.000000000 +0100
+--- a/html/pages/progu112.htm
++++ b/html/pages/progu112.htm
 @@ -154,7 +154,7 @@
  <A HREF="progu064.htm#HDRMODACSS">13.10 , "Module Access"</A>.
  <P>
@@ -1119,9 +1156,8 @@ diff -urNad dx~/html/pages/progu112.htm dx/html/pages/progu112.htm
  
  <P><HR><B>&#91; <A HREF="#Top_Of_Page">Top of Page</A> &#124; <A
  HREF="progu111.htm">Previous Page</A> &#124; <A HREF="progu113.htm">Next
-diff -urNad dx~/html/pages/progu117.htm dx/html/pages/progu117.htm
---- dx~/html/pages/progu117.htm	2006-01-27 12:03:23.000000000 +0100
-+++ dx/html/pages/progu117.htm	2006-01-27 12:07:39.000000000 +0100
+--- a/html/pages/progu117.htm
++++ b/html/pages/progu117.htm
 @@ -54,10 +54,10 @@
  path.
  It will append <TT>/lib/colors.txt</TT> to this path and try to open
@@ -1135,9 +1171,8 @@ diff -urNad dx~/html/pages/progu117.htm dx/html/pages/progu117.htm
  </UL>
  <P><STRONG>Return Value</STRONG>
  <P>
-diff -urNad dx~/html/pages/progu174.htm dx/html/pages/progu174.htm
---- dx~/html/pages/progu174.htm	2006-01-27 12:03:23.000000000 +0100
-+++ dx/html/pages/progu174.htm	2006-01-27 12:07:39.000000000 +0100
+--- a/html/pages/progu174.htm
++++ b/html/pages/progu174.htm
 @@ -58,7 +58,7 @@
  <P>
  This routine checks the environment variables DXFONTS, DXEXECROOT,
@@ -1147,9 +1182,8 @@ diff -urNad dx~/html/pages/progu174.htm dx/html/pages/progu174.htm
  subdirectory <TT><STRONG>fonts</STRONG></TT> of each of these
  directories.
  <P><STRONG>Return Value</STRONG>
-diff -urNad dx~/html/pages/progu242.htm dx/html/pages/progu242.htm
---- dx~/html/pages/progu242.htm	2006-01-27 12:03:23.000000000 +0100
-+++ dx/html/pages/progu242.htm	2006-01-27 12:07:39.000000000 +0100
+--- a/html/pages/progu242.htm
++++ b/html/pages/progu242.htm
 @@ -53,7 +53,7 @@
  &quot;#number&quot;
  </PRE>
@@ -1159,9 +1193,8 @@ diff -urNad dx~/html/pages/progu242.htm dx/html/pages/progu242.htm
  Note that many of the messages require one or more arguments.
  <P><B>Note: </B>In combination with two other library routines,
  <TT><STRONG>DXMessage</STRONG></TT> can be used to form
-diff -urNad dx~/html/pages/qikgu014.htm dx/html/pages/qikgu014.htm
---- dx~/html/pages/qikgu014.htm	2006-01-27 12:03:24.000000000 +0100
-+++ dx/html/pages/qikgu014.htm	2006-01-27 12:07:39.000000000 +0100
+--- a/html/pages/qikgu014.htm
++++ b/html/pages/qikgu014.htm
 @@ -71,7 +71,7 @@
  highlight bar.
  <P><LI>Type
@@ -1180,9 +1213,8 @@ diff -urNad dx~/html/pages/qikgu014.htm dx/html/pages/qikgu014.htm
  <B><BR><CENTER><IMG SRC="../images/imagwin.gif" ALT="Figure imagwin not
  displayed."></CENTER><BR></B><BR>
  <A NAME="IDX44"></A>
-diff -urNad dx~/html/pages/qikgu016.htm dx/html/pages/qikgu016.htm
---- dx~/html/pages/qikgu016.htm	2006-01-27 12:03:24.000000000 +0100
-+++ dx/html/pages/qikgu016.htm	2006-01-27 12:07:39.000000000 +0100
+--- a/html/pages/qikgu016.htm
++++ b/html/pages/qikgu016.htm
 @@ -123,7 +123,7 @@
  extension (i.e., <TT>.../filename.ext</TT>), the full
  path name is easily derived if needed:
@@ -1199,9 +1231,8 @@ diff -urNad dx~/html/pages/qikgu016.htm dx/html/pages/qikgu016.htm
 -	</BODY></HTML>
 \ No newline at end of file
 +	</BODY></HTML>
-diff -urNad dx~/html/pages/qikgu017.htm dx/html/pages/qikgu017.htm
---- dx~/html/pages/qikgu017.htm	2006-01-27 12:03:24.000000000 +0100
-+++ dx/html/pages/qikgu017.htm	2006-01-27 12:07:39.000000000 +0100
+--- a/html/pages/qikgu017.htm
++++ b/html/pages/qikgu017.htm
 @@ -68,7 +68,7 @@
  This is the file name of the data file to import.
  <P>
@@ -1220,9 +1251,8 @@ diff -urNad dx~/html/pages/qikgu017.htm dx/html/pages/qikgu017.htm
  <P>
  Execute. You will see an isosurface (constant value surface)
  of the cloudwater density.
-diff -urNad dx~/html/pages/qikgu018.htm dx/html/pages/qikgu018.htm
---- dx~/html/pages/qikgu018.htm	2006-01-27 12:03:24.000000000 +0100
-+++ dx/html/pages/qikgu018.htm	2006-01-27 12:07:39.000000000 +0100
+--- a/html/pages/qikgu018.htm
++++ b/html/pages/qikgu018.htm
 @@ -75,7 +75,7 @@
  15</A>),
  
@@ -1241,9 +1271,8 @@ diff -urNad dx~/html/pages/qikgu018.htm dx/html/pages/qikgu018.htm
  <P>
  You can view the file by choosing <TT><STRONG>Browser</STRONG></TT> (as in
  Example 1).
-diff -urNad dx~/html/pages/qikgu023.htm dx/html/pages/qikgu023.htm
---- dx~/html/pages/qikgu023.htm	2006-01-27 12:03:24.000000000 +0100
-+++ dx/html/pages/qikgu023.htm	2006-01-27 12:07:39.000000000 +0100
+--- a/html/pages/qikgu023.htm
++++ b/html/pages/qikgu023.htm
 @@ -596,7 +596,7 @@
  <OL COMPACT>
  <LI>Select <TT><STRONG>Load Macro</STRONG></TT> in the
@@ -1260,9 +1289,8 @@ diff -urNad dx~/html/pages/qikgu023.htm dx/html/pages/qikgu023.htm
 -	</BODY></HTML>
 \ No newline at end of file
 +	</BODY></HTML>
-diff -urNad dx~/html/pages/qikgu024.htm dx/html/pages/qikgu024.htm
---- dx~/html/pages/qikgu024.htm	2006-01-27 12:03:24.000000000 +0100
-+++ dx/html/pages/qikgu024.htm	2006-01-27 12:07:39.000000000 +0100
+--- a/html/pages/qikgu024.htm
++++ b/html/pages/qikgu024.htm
 @@ -45,11 +45,11 @@
  next day.
  <P>
@@ -1295,9 +1323,8 @@ diff -urNad dx~/html/pages/qikgu024.htm dx/html/pages/qikgu024.htm
  <P>
  <P><B>Note: </B>Visual programs are also scripts.
  However, if a visual program uses a macro, you must include that
-diff -urNad dx~/html/pages/qikgu025.htm dx/html/pages/qikgu025.htm
---- dx~/html/pages/qikgu025.htm	2006-01-27 12:03:24.000000000 +0100
-+++ dx/html/pages/qikgu025.htm	2006-01-27 12:07:39.000000000 +0100
+--- a/html/pages/qikgu025.htm
++++ b/html/pages/qikgu025.htm
 @@ -38,7 +38,7 @@
  		<H2>Chapter 4. Sample Visual Programs and Sample Macros</H2>
  		<A NAME="IDX187"></A><A NAME="IDX188"></A>
@@ -1316,9 +1343,8 @@ diff -urNad dx~/html/pages/qikgu025.htm dx/html/pages/qikgu025.htm
  in the <TT><STRONG>Filter</STRONG></TT> field (of the
  <TT><STRONG>Open...</STRONG></TT> dialog box)
  and press <TT><STRONG>Enter</STRONG></TT>.
-diff -urNad dx~/html/pages/qikgu028.htm dx/html/pages/qikgu028.htm
---- dx~/html/pages/qikgu028.htm	2006-01-27 12:03:24.000000000 +0100
-+++ dx/html/pages/qikgu028.htm	2006-01-27 12:07:39.000000000 +0100
+--- a/html/pages/qikgu028.htm
++++ b/html/pages/qikgu028.htm
 @@ -103,7 +103,7 @@
  <LI>Enter the path name of the data file in the
  <TT><STRONG>Data file</STRONG></TT> field:
@@ -1631,9 +1657,8 @@ diff -urNad dx~/html/pages/qikgu028.htm dx/html/pages/qikgu028.htm
 -	</BODY></HTML>
 \ No newline at end of file
 +	</BODY></HTML>
-diff -urNad dx~/html/pages/qikgu030.htm dx/html/pages/qikgu030.htm
---- dx~/html/pages/qikgu030.htm	2006-01-27 12:03:24.000000000 +0100
-+++ dx/html/pages/qikgu030.htm	2006-01-27 12:07:39.000000000 +0100
+--- a/html/pages/qikgu030.htm
++++ b/html/pages/qikgu030.htm
 @@ -55,7 +55,7 @@
  <H3><A NAME="Header_168" ></A>For Future Reference
  </H3>
@@ -1650,9 +1675,8 @@ diff -urNad dx~/html/pages/qikgu030.htm dx/html/pages/qikgu030.htm
 -	</BODY></HTML>
 \ No newline at end of file
 +	</BODY></HTML>
-diff -urNad dx~/html/pages/qikgu031.htm dx/html/pages/qikgu031.htm
---- dx~/html/pages/qikgu031.htm	2006-01-27 12:03:24.000000000 +0100
-+++ dx/html/pages/qikgu031.htm	2006-01-27 12:07:39.000000000 +0100
+--- a/html/pages/qikgu031.htm
++++ b/html/pages/qikgu031.htm
 @@ -71,7 +71,7 @@
  Window</A></B>. This window has just been opened and the cursor has not been
  moved from its initial position at the beginning of the file. No numbers will
@@ -1662,9 +1686,8 @@ diff -urNad dx~/html/pages/qikgu031.htm dx/html/pages/qikgu031.htm
  <A HREF="qikgu028.htm#HDRMVARDAT">"Record Style: Multivariable Data"</A>).<BR>
  <B><BR><CENTER><IMG SRC="../images/brwswin.gif" ALT="Figure brwswin not
  displayed."></CENTER><BR></B><BR>
-diff -urNad dx~/html/pages/refgu008.htm dx/html/pages/refgu008.htm
---- dx~/html/pages/refgu008.htm	2006-01-27 12:03:24.000000000 +0100
-+++ dx/html/pages/refgu008.htm	2006-01-27 12:07:39.000000000 +0100
+--- a/html/pages/refgu008.htm
++++ b/html/pages/refgu008.htm
 @@ -93,7 +93,7 @@
  <LI>&#123;ALL&#125; (an alphabetic listing of all the tools).
  </UL>
@@ -1690,9 +1713,8 @@ diff -urNad dx~/html/pages/refgu008.htm dx/html/pages/refgu008.htm
 -	</BODY></HTML>
 \ No newline at end of file
 +	</BODY></HTML>
-diff -urNad dx~/html/pages/refgu009.htm dx/html/pages/refgu009.htm
---- dx~/html/pages/refgu009.htm	2006-01-27 12:03:24.000000000 +0100
-+++ dx/html/pages/refgu009.htm	2006-01-27 12:07:39.000000000 +0100
+--- a/html/pages/refgu009.htm
++++ b/html/pages/refgu009.htm
 @@ -231,7 +231,7 @@
  <P><LI>This subsection is omitted if the module does not produce a Field
  as output.
@@ -1702,9 +1724,8 @@ diff -urNad dx~/html/pages/refgu009.htm dx/html/pages/refgu009.htm
  ...<TT><STRONG>programs/SIMPLE</STRONG></TT>.
  </OL>
  		<P>
-diff -urNad dx~/html/pages/refgu014.htm dx/html/pages/refgu014.htm
---- dx~/html/pages/refgu014.htm	2006-01-27 12:03:24.000000000 +0100
-+++ dx/html/pages/refgu014.htm	2006-01-27 12:07:39.000000000 +0100
+--- a/html/pages/refgu014.htm
++++ b/html/pages/refgu014.htm
 @@ -335,7 +335,7 @@
  disregard the transformations of the Translate or
  Rotate module.
@@ -1714,9 +1735,8 @@ diff -urNad dx~/html/pages/refgu014.htm dx/html/pages/refgu014.htm
  can be used just before Image or AutoAxes to scale the object.
  See also <A HREF="refgu017.htm#SPTAVOID">How to Avoid Stretching or Squashing
  Glyphs</A>.)
-diff -urNad dx~/html/pages/refgu017.htm dx/html/pages/refgu017.htm
---- dx~/html/pages/refgu017.htm	2006-01-27 12:03:24.000000000 +0100
-+++ dx/html/pages/refgu017.htm	2006-01-27 12:07:39.000000000 +0100
+--- a/html/pages/refgu017.htm
++++ b/html/pages/refgu017.htm
 @@ -461,7 +461,7 @@
  won&#39;t be squashed anymore.
  
@@ -1726,9 +1746,8 @@ diff -urNad dx~/html/pages/refgu017.htm dx/html/pages/refgu017.htm
  technique) works only for scalar data.
  
  </UL>
-diff -urNad dx~/html/pages/refgu033.htm dx/html/pages/refgu033.htm
---- dx~/html/pages/refgu033.htm	2006-01-27 12:03:24.000000000 +0100
-+++ dx/html/pages/refgu033.htm	2006-01-27 12:07:39.000000000 +0100
+--- a/html/pages/refgu033.htm
++++ b/html/pages/refgu033.htm
 @@ -128,7 +128,7 @@
  of the following:
  <OL COMPACT>
@@ -1738,9 +1757,8 @@ diff -urNad dx~/html/pages/refgu033.htm dx/html/pages/refgu033.htm
  not the setting for DXROOT).
  Note that the colors in this file correspond to the X Window System**
  color list, except that the Data Explorer colors are squared first (see
-diff -urNad dx~/html/pages/refgu048.htm dx/html/pages/refgu048.htm
---- dx~/html/pages/refgu048.htm	2006-01-27 12:03:24.000000000 +0100
-+++ dx/html/pages/refgu048.htm	2006-01-27 12:07:39.000000000 +0100
+--- a/html/pages/refgu048.htm
++++ b/html/pages/refgu048.htm
 @@ -468,7 +468,7 @@
  			<P></P>
  			<LI>This example renders two views of the object and displays them in two separate windows, as specified by the <TT><STRONG>where</STRONG></TT> parameter.
@@ -1759,9 +1777,8 @@ diff -urNad dx~/html/pages/refgu048.htm dx/html/pages/refgu048.htm
  isosurface = Isosurface(electrondensity, 0.3);
  from = Direction(65, 5, 10);
  camera = AutoCamera(isosurface, from);
-diff -urNad dx~/html/pages/refgu075.htm dx/html/pages/refgu075.htm
---- dx~/html/pages/refgu075.htm	2006-01-27 12:03:24.000000000 +0100
-+++ dx/html/pages/refgu075.htm	2006-01-27 12:07:39.000000000 +0100
+--- a/html/pages/refgu075.htm
++++ b/html/pages/refgu075.htm
 @@ -220,7 +220,7 @@
  The Include module removes all points whose data values are greater
  than 1.5.
@@ -1771,9 +1788,8 @@ diff -urNad dx~/html/pages/refgu075.htm dx/html/pages/refgu075.htm
  electrondensity = Partition(electrondensity);
  gradientdensity = Gradient(electrondensity);
  maggradient = Compute("mag($0)", gradientdensity);
-diff -urNad dx~/html/pages/refgu082.htm dx/html/pages/refgu082.htm
---- dx~/html/pages/refgu082.htm	2006-01-27 12:03:24.000000000 +0100
-+++ dx/html/pages/refgu082.htm	2006-01-27 12:07:39.000000000 +0100
+--- a/html/pages/refgu082.htm
++++ b/html/pages/refgu082.htm
 @@ -77,7 +77,7 @@
  The second image is computed, but Data Explorer does not display it until you
  type the return character.
@@ -1783,9 +1799,8 @@ diff -urNad dx~/html/pages/refgu082.htm dx/html/pages/refgu082.htm
  electrondensity = Partition(electrondensity);
  isosurface = Isosurface(electrondensity, 0.3);
  camera = AutoCamera(isosurface);
-diff -urNad dx~/html/pages/refgu106.htm dx/html/pages/refgu106.htm
---- dx~/html/pages/refgu106.htm	2006-01-27 12:03:24.000000000 +0100
-+++ dx/html/pages/refgu106.htm	2006-01-27 12:07:39.000000000 +0100
+--- a/html/pages/refgu106.htm
++++ b/html/pages/refgu106.htm
 @@ -117,7 +117,7 @@
  The final call prints out all of the items in both the
  "positions" and "box" components.
@@ -1795,9 +1810,8 @@ diff -urNad dx~/html/pages/refgu106.htm dx/html/pages/refgu106.htm
  electrondensity = Partition(electrondensity);
  iso1 = Isosurface(electrondensity,0.1);
  iso2 = Isosurface(electrondensity,0.3);
-diff -urNad dx~/html/pages/refgu134.htm dx/html/pages/refgu134.htm
---- dx~/html/pages/refgu134.htm	2006-01-27 12:03:25.000000000 +0100
-+++ dx/html/pages/refgu134.htm	2006-01-27 12:07:39.000000000 +0100
+--- a/html/pages/refgu134.htm
++++ b/html/pages/refgu134.htm
 @@ -155,7 +155,7 @@
     isosurface = Isosurface(data,isovalue);
     Display(isosurface,camera);
@@ -1807,9 +1821,8 @@ diff -urNad dx~/html/pages/refgu134.htm dx/html/pages/refgu134.htm
  camera = AutoCamera(data);
  @startframe = 1;
  @endframe = 5;
-diff -urNad dx~/html/pages/refgu152.htm dx/html/pages/refgu152.htm
---- dx~/html/pages/refgu152.htm	2006-01-27 12:03:25.000000000 +0100
-+++ dx/html/pages/refgu152.htm	2006-01-27 12:07:39.000000000 +0100
+--- a/html/pages/refgu152.htm
++++ b/html/pages/refgu152.htm
 @@ -334,7 +334,7 @@
  InsetImage.net
  </PRE>
@@ -1819,9 +1832,8 @@ diff -urNad dx~/html/pages/refgu152.htm dx/html/pages/refgu152.htm
  <P><STRONG>See Also</STRONG>
  <P>
  <A HREF="refgu153.htm#HDRSUPWIND">SuperviseWindow</A>,
-diff -urNad dx~/html/pages/refgu153.htm dx/html/pages/refgu153.htm
---- dx~/html/pages/refgu153.htm	2006-01-27 12:03:25.000000000 +0100
-+++ dx/html/pages/refgu153.htm	2006-01-27 12:07:39.000000000 +0100
+--- a/html/pages/refgu153.htm
++++ b/html/pages/refgu153.htm
 @@ -289,7 +289,7 @@
  InsetImage.net
  </PRE>
@@ -1831,9 +1843,8 @@ diff -urNad dx~/html/pages/refgu153.htm dx/html/pages/refgu153.htm
  <P><STRONG>See Also</STRONG>
  <P>
  <A HREF="refgu152.htm#HDRSUPSTAT">SuperviseState</A>,
-diff -urNad dx~/html/pages/refgu155.htm dx/html/pages/refgu155.htm
---- dx~/html/pages/refgu155.htm	2006-01-27 12:03:25.000000000 +0100
-+++ dx/html/pages/refgu155.htm	2006-01-27 12:07:39.000000000 +0100
+--- a/html/pages/refgu155.htm
++++ b/html/pages/refgu155.htm
 @@ -88,7 +88,7 @@
  The System module executes the compress function to minimize the amount
  of disk space used.
@@ -1843,9 +1854,8 @@ diff -urNad dx~/html/pages/refgu155.htm dx/html/pages/refgu155.htm
  electrondensity = Partition(electrondensity);
  camera = AutoCamera(electrondensity,resolution=300,aspect=1,width=2.5);
  macro makeiso(isoval)
-diff -urNad dx~/html/pages/refgu158.htm dx/html/pages/refgu158.htm
---- dx~/html/pages/refgu158.htm	2006-01-27 12:03:25.000000000 +0100
-+++ dx/html/pages/refgu158.htm	2006-01-27 12:07:39.000000000 +0100
+--- a/html/pages/refgu158.htm
++++ b/html/pages/refgu158.htm
 @@ -110,7 +110,7 @@
  <P>
  In this example, the module traces the use of time by Isosurface.
@@ -1855,9 +1865,8 @@ diff -urNad dx~/html/pages/refgu158.htm dx/html/pages/refgu158.htm
  electrondensity = Partition(electrondensity);
  camera = AutoCamera(electrondensity, width=5);
  Trace("time", 1);
-diff -urNad dx~/html/pages/refgu166.htm dx/html/pages/refgu166.htm
---- dx~/html/pages/refgu166.htm	2006-01-27 12:03:25.000000000 +0100
-+++ dx/html/pages/refgu166.htm	2006-01-27 12:07:39.000000000 +0100
+--- a/html/pages/refgu166.htm
++++ b/html/pages/refgu166.htm
 @@ -153,7 +153,7 @@
  (For this example, Data Explorer should be started with the <TT>-readahead
  off</TT> option.)
@@ -1867,9 +1876,8 @@ diff -urNad dx~/html/pages/refgu166.htm dx/html/pages/refgu166.htm
  camera = AutoCamera(electrondensity,width=5);
  Usage("memory", 1);
  isosurface = Isosurface(electrondensity,0.3);
-diff -urNad dx~/html/pages/usrgu022.htm dx/html/pages/usrgu022.htm
---- dx~/html/pages/usrgu022.htm	2006-01-27 12:03:25.000000000 +0100
-+++ dx/html/pages/usrgu022.htm	2006-01-27 12:07:39.000000000 +0100
+--- a/html/pages/usrgu022.htm
++++ b/html/pages/usrgu022.htm
 @@ -64,7 +64,7 @@
  <LI>Start using Data Explorer.
  A good place to begin is the set of example "networks" (or
@@ -1879,9 +1887,8 @@ diff -urNad dx~/html/pages/usrgu022.htm dx/html/pages/usrgu022.htm
  You can open up any visual program file and study how the different modules are
  interconnected and then run the visual programs to observe the visual
  output.
-diff -urNad dx~/html/pages/usrgu050.htm dx/html/pages/usrgu050.htm
---- dx~/html/pages/usrgu050.htm	2006-01-27 12:03:25.000000000 +0100
-+++ dx/html/pages/usrgu050.htm	2006-01-27 12:07:39.000000000 +0100
+--- a/html/pages/usrgu050.htm
++++ b/html/pages/usrgu050.htm
 @@ -160,10 +160,10 @@
  Data Explorer will terminate automatically when it has executed the script.
  For example, type:
@@ -1895,9 +1902,8 @@ diff -urNad dx~/html/pages/usrgu050.htm dx/html/pages/usrgu050.htm
  examples for many modules.
  You may find it helpful to experiment with them to learn how they
  function.
-diff -urNad dx~/html/pages/usrgu051.htm dx/html/pages/usrgu051.htm
---- dx~/html/pages/usrgu051.htm	2006-01-27 12:03:25.000000000 +0100
-+++ dx/html/pages/usrgu051.htm	2006-01-27 12:07:39.000000000 +0100
+--- a/html/pages/usrgu051.htm
++++ b/html/pages/usrgu051.htm
 @@ -42,7 +42,7 @@
  characteristics of scripts;
  a detailed description of each of the elements follows.
@@ -1925,9 +1931,8 @@ diff -urNad dx~/html/pages/usrgu051.htm dx/html/pages/usrgu051.htm
  iso = Isosurface(data);
  camera = Autocamera(iso);
  image= Render(iso, camera);
-diff -urNad dx~/html/pages/usrgu060.htm dx/html/pages/usrgu060.htm
---- dx~/html/pages/usrgu060.htm	2006-01-27 12:03:25.000000000 +0100
-+++ dx/html/pages/usrgu060.htm	2006-01-27 12:14:31.000000000 +0100
+--- a/html/pages/usrgu060.htm
++++ b/html/pages/usrgu060.htm
 @@ -42,7 +42,7 @@
  		<P>The web pages generated using Java Explorer use applets which detect the ip address of the machine from which they were loaded and attempt to contact a DXServer using that ip address.</P>
  		<P>If you are browsing web pages using a URL beginning with file:/, then the applets will be able to use only a DXServer running on the same machine as your browser.</P>
@@ -1955,9 +1960,8 @@ diff -urNad dx~/html/pages/usrgu060.htm dx/html/pages/usrgu060.htm
  		<P>httpd should point to the directory structure such that &quot;htmlpages&quot; and &quot;output&quot; are accessible via the same prefixed url (e.g.for a given whatever, whatever/htmlpages and whatever/output should work). various additions for mime.types and or httpd.conf may be required. For example, to add the text/html mime type for .htm files, the line should read:</P>
  		<BLOCKQUOTE>
  			<PRE>text/html html htm</PRE>
-diff -urNad dx~/html/pages/usrgu062.htm dx/html/pages/usrgu062.htm
---- dx~/html/pages/usrgu062.htm	2006-01-27 12:03:25.000000000 +0100
-+++ dx/html/pages/usrgu062.htm	2006-01-27 12:07:39.000000000 +0100
+--- a/html/pages/usrgu062.htm
++++ b/html/pages/usrgu062.htm
 @@ -219,9 +219,9 @@
  </UL>
  <LI>Samples:
@@ -1986,9 +1990,8 @@ diff -urNad dx~/html/pages/usrgu062.htm dx/html/pages/usrgu062.htm
 -	</BODY></HTML>
 \ No newline at end of file
 +	</BODY></HTML>
-diff -urNad dx~/html/pages/usrgu063.htm dx/html/pages/usrgu063.htm
---- dx~/html/pages/usrgu063.htm	2006-01-27 12:03:25.000000000 +0100
-+++ dx/html/pages/usrgu063.htm	2006-01-27 12:07:39.000000000 +0100
+--- a/html/pages/usrgu063.htm
++++ b/html/pages/usrgu063.htm
 @@ -570,7 +570,7 @@
  always maps from the data component).
  An example visual program that performs each of these mapping
@@ -1998,9 +2001,8 @@ diff -urNad dx~/html/pages/usrgu063.htm dx/html/pages/usrgu063.htm
  <P>
  Note that we changed the order of the modules slightly in the third
  example.
-diff -urNad dx~/html/pages/usrgu068.htm dx/html/pages/usrgu068.htm
---- dx~/html/pages/usrgu068.htm	2006-01-27 12:03:25.000000000 +0100
-+++ dx/html/pages/usrgu068.htm	2006-01-27 12:07:39.000000000 +0100
+--- a/html/pages/usrgu068.htm
++++ b/html/pages/usrgu068.htm
 @@ -164,7 +164,7 @@
  and shows how to imbed data as text in the header section.
  The Objects and data describe a regular grid.
@@ -2129,16 +2131,15 @@ diff -urNad dx~/html/pages/usrgu068.htm dx/html/pages/usrgu068.htm
  <TABLE><TR><TD ALIGN="LEFT" VALIGN="TOP"><B>Note:</B></TD><TD ALIGN="LEFT"
  VALIGN="TOP">It is easier to import a file in the RGB format by using the
  ReadImage module.
-@@ -2126,4 +2126,4 @@
+@@ -2125,4 +2125,4 @@
  			<P><FONT size="-1">[ <A href="http://www.research.ibm.com/dx">OpenDX Home at IBM</A>&nbsp;|&nbsp;<A href="http://www.opendx.org/">OpenDX.org</A>&nbsp;] </FONT></P>
  			<P></P>
  		</DIV>
 -	</BODY></HTML>
 \ No newline at end of file
 +	</BODY></HTML>
-diff -urNad dx~/html/pages/usrgu073.htm dx/html/pages/usrgu073.htm
---- dx~/html/pages/usrgu073.htm	2006-01-27 12:03:25.000000000 +0100
-+++ dx/html/pages/usrgu073.htm	2006-01-27 12:07:39.000000000 +0100
+--- a/html/pages/usrgu073.htm
++++ b/html/pages/usrgu073.htm
 @@ -144,7 +144,7 @@
  		
  specifies a file name containing
@@ -2184,9 +2185,8 @@ diff -urNad dx~/html/pages/usrgu073.htm dx/html/pages/usrgu073.htm
  root to increase the maximum allowed size of a shared memory segment. If
  the maximum is not reset or if it is already set to a different limit,
  then you can use <TT>DXSHMEMSEGMAX</TT> to tell Data Explorer what the current
-diff -urNad dx~/html/pages/usrgu074.htm dx/html/pages/usrgu074.htm
---- dx~/html/pages/usrgu074.htm	2006-01-27 12:03:25.000000000 +0100
-+++ dx/html/pages/usrgu074.htm	2006-01-27 12:07:39.000000000 +0100
+--- a/html/pages/usrgu074.htm
++++ b/html/pages/usrgu074.htm
 @@ -117,7 +117,7 @@
  <BR></TD><TD ALIGN="LEFT" VALIGN="TOP" WIDTH="31%">
  -dxroot <I>dirname</I>
@@ -2196,9 +2196,8 @@ diff -urNad dx~/html/pages/usrgu074.htm dx/html/pages/usrgu074.htm
  </TD></TR><TR>
  <TD ALIGN="LEFT" VALIGN="TOP" WIDTH="8%">
  <BR></TD><TD ALIGN="LEFT" VALIGN="TOP" WIDTH="31%">
-diff -urNad dx~/html/pages/usrgu076.htm dx/html/pages/usrgu076.htm
---- dx~/html/pages/usrgu076.htm	2006-01-27 12:03:25.000000000 +0100
-+++ dx/html/pages/usrgu076.htm	2006-01-27 12:07:39.000000000 +0100
+--- a/html/pages/usrgu076.htm
++++ b/html/pages/usrgu076.htm
 @@ -39,7 +39,7 @@
  </H2>
  		<P>
@@ -2226,9 +2225,8 @@ diff -urNad dx~/html/pages/usrgu076.htm dx/html/pages/usrgu076.htm
  For user-added fonts, the DXFONTS variable can contain a colon-separated
  list of directories to search for fonts before searching the default
  directory.
-diff -urNad dx~/src/exec/dpexec/config.h dx/src/exec/dpexec/config.h
---- dx~/src/exec/dpexec/config.h	2006-01-27 12:03:26.000000000 +0100
-+++ dx/src/exec/dpexec/config.h	2006-01-27 12:07:39.000000000 +0100
+--- a/src/exec/dpexec/config.h
++++ b/src/exec/dpexec/config.h
 @@ -37,7 +37,7 @@
  /* buffer size for sending/receiving parse trees */
  #define PTBUFSIZE               1024
@@ -2238,9 +2236,8 @@ diff -urNad dx~/src/exec/dpexec/config.h dx/src/exec/dpexec/config.h
  #define DXRC                    ".dxrc"
  #define SYSDXRC                 "dxrc"
  
-diff -urNad dx~/src/exec/dpexec/license.c dx/src/exec/dpexec/license.c
---- dx~/src/exec/dpexec/license.c	2006-01-27 12:03:27.000000000 +0100
-+++ dx/src/exec/dpexec/license.c	2006-01-27 12:07:39.000000000 +0100
+--- a/src/exec/dpexec/license.c
++++ b/src/exec/dpexec/license.c
 @@ -157,7 +157,7 @@
      if (root == NULL) 
  	root = getenv ("DXROOT");
@@ -2250,9 +2247,8 @@ diff -urNad dx~/src/exec/dpexec/license.c dx/src/exec/dpexec/license.c
  
      if (ltype == MPLIC) {
  	MPlic_tried = TRUE;
-diff -urNad dx~/src/exec/libdx/lbcolor.c dx/src/exec/libdx/lbcolor.c
---- dx~/src/exec/libdx/lbcolor.c	2006-01-27 12:03:31.000000000 +0100
-+++ dx/src/exec/libdx/lbcolor.c	2006-01-27 12:07:39.000000000 +0100
+--- a/src/exec/libdx/lbcolor.c
++++ b/src/exec/libdx/lbcolor.c
 @@ -166,7 +166,7 @@
  	    if (in) goto got_colorfile;
  	}
@@ -2262,9 +2258,8 @@ diff -urNad dx~/src/exec/libdx/lbcolor.c dx/src/exec/libdx/lbcolor.c
  	if (in) goto got_colorfile;
  	
  	/* all has failed; use our old table */
-diff -urNad dx~/src/exec/libdx/lbmessage.c dx/src/exec/libdx/lbmessage.c
---- dx~/src/exec/libdx/lbmessage.c	2006-01-27 12:03:31.000000000 +0100
-+++ dx/src/exec/libdx/lbmessage.c	2006-01-27 12:07:39.000000000 +0100
+--- a/src/exec/libdx/lbmessage.c
++++ b/src/exec/libdx/lbmessage.c
 @@ -85,7 +85,7 @@
      else {
  	char *root = getenv("DXEXECROOT");
@@ -2274,9 +2269,8 @@ diff -urNad dx~/src/exec/libdx/lbmessage.c dx/src/exec/libdx/lbmessage.c
  	sprintf(name, "%s/lib/messages", root);
      }
      fd = open(name, O_RDONLY);
-diff -urNad dx~/src/exec/libdx/lbtext.c dx/src/exec/libdx/lbtext.c
---- dx~/src/exec/libdx/lbtext.c	2006-01-27 12:03:31.000000000 +0100
-+++ dx/src/exec/libdx/lbtext.c	2006-01-27 12:12:09.000000000 +0100
+--- a/src/exec/libdx/lbtext.c
++++ b/src/exec/libdx/lbtext.c
 @@ -71,7 +71,7 @@
          dir = ( char * ) getenv( "DXROOT" );
  
@@ -2286,10 +2280,9 @@ diff -urNad dx~/src/exec/libdx/lbtext.c dx/src/exec/libdx/lbtext.c
  
  #define XTRA 32  /* enough extra room for "../fonts/.. .dx" */
  
-diff -urNad dx~/src/misc/dx.c dx/src/misc/dx.c
---- dx~/src/misc/dx.c	2006-01-27 12:03:31.000000000 +0100
-+++ dx/src/misc/dx.c	2006-01-27 12:07:39.000000000 +0100
-@@ -404,7 +404,7 @@
+--- a/src/misc/dx.c
++++ b/src/misc/dx.c
+@@ -417,7 +417,7 @@
      /* If all else fails, set some defaults for OpenSource Unix layout */
      if (!*dxroot) {
  #if defined(cygwin)
@@ -2298,9 +2291,8 @@ diff -urNad dx~/src/misc/dx.c dx/src/misc/dx.c
  #else
      	strcpy(dxroot, "\\usr\\local\\dx\\");
  #endif
-diff -urNad dx~/src/uipp/base/IBMApplication.C dx/src/uipp/base/IBMApplication.C
---- dx~/src/uipp/base/IBMApplication.C	2006-01-27 12:03:32.000000000 +0100
-+++ dx/src/uipp/base/IBMApplication.C	2006-01-27 12:07:39.000000000 +0100
+--- a/src/uipp/base/IBMApplication.C
++++ b/src/uipp/base/IBMApplication.C
 @@ -397,7 +397,7 @@
  	    // This will show up as a memory leak, not worth worrying about
  	    IBMApplication::resource.UIRoot = DuplicateString(s); 
@@ -2310,10 +2302,9 @@ diff -urNad dx~/src/uipp/base/IBMApplication.C dx/src/uipp/base/IBMApplication.C
      }
  
      this->initIcon();
-diff -urNad dx~/src/uipp/dxl/conn.c dx/src/uipp/dxl/conn.c
---- dx~/src/uipp/dxl/conn.c	2006-01-27 12:03:32.000000000 +0100
-+++ dx/src/uipp/dxl/conn.c	2006-01-27 12:07:39.000000000 +0100
-@@ -619,7 +619,7 @@
+--- a/src/uipp/dxl/conn.c
++++ b/src/uipp/dxl/conn.c
+@@ -623,7 +623,7 @@
      struct hostent *he;
      int findx;
      char *pathEnv;
@@ -2322,10 +2313,9 @@ diff -urNad dx~/src/uipp/dxl/conn.c dx/src/uipp/dxl/conn.c
      int  j;
  #ifdef hp700
      int  width = MAXFUPLIM;
-diff -urNad dx~/src/uipp/dxuilib/DXApplication.C dx/src/uipp/dxuilib/DXApplication.C
---- dx~/src/uipp/dxuilib/DXApplication.C	2006-01-27 12:03:34.000000000 +0100
-+++ dx/src/uipp/dxuilib/DXApplication.C	2006-01-27 12:07:39.000000000 +0100
-@@ -5171,7 +5171,7 @@
+--- a/src/uipp/dxuilib/DXApplication.C
++++ b/src/uipp/dxuilib/DXApplication.C
+@@ -5173,7 +5173,7 @@
      // Make the DATEMSK environment variable point to the format file
      // which we'll store in the dx tree.
      const char *cp = /*this->getUIRoot();*/getenv("DXROOT");
@@ -2334,9 +2324,8 @@ diff -urNad dx~/src/uipp/dxuilib/DXApplication.C dx/src/uipp/dxuilib/DXApplicati
  
      char *dx = DuplicateString(cp); 
      strcpy (dx, cp);
-diff -urNad dx~/src/uipp/dxuilib/EditorWindow.C dx/src/uipp/dxuilib/EditorWindow.C
---- dx~/src/uipp/dxuilib/EditorWindow.C	2006-01-27 12:03:34.000000000 +0100
-+++ dx/src/uipp/dxuilib/EditorWindow.C	2006-01-27 12:07:39.000000000 +0100
+--- a/src/uipp/dxuilib/EditorWindow.C
++++ b/src/uipp/dxuilib/EditorWindow.C
 @@ -7173,7 +7173,7 @@
  	fprintf(stderr, "WebOptions macro not in DXMACROS path\n");
  	fprintf(stderr, "attempting to load from configure-time parameters\n");
@@ -2355,9 +2344,8 @@ diff -urNad dx~/src/uipp/dxuilib/EditorWindow.C dx/src/uipp/dxuilib/EditorWindow
  	    "Otherwise, this visual program will not function properly\n"
  	    "under control of DXServer.\n");
  	return FALSE;
-diff -urNad dx~/src/uipp/dxuilib/JavaNet.C dx/src/uipp/dxuilib/JavaNet.C
---- dx~/src/uipp/dxuilib/JavaNet.C	2006-01-27 12:03:34.000000000 +0100
-+++ dx/src/uipp/dxuilib/JavaNet.C	2006-01-27 12:07:39.000000000 +0100
+--- a/src/uipp/dxuilib/JavaNet.C
++++ b/src/uipp/dxuilib/JavaNet.C
 @@ -560,7 +560,7 @@
      );
      uiroot = theDXApplication->getUIRoot();
@@ -2367,9 +2355,8 @@ diff -urNad dx~/src/uipp/dxuilib/JavaNet.C dx/src/uipp/dxuilib/JavaNet.C
  
      fprintf(this->make_f, "SHELL = /bin/sh\n\n");
      fprintf(this->make_f, "BASE = %s\n",uiroot);
-diff -urNad dx~/src/uipp/dxuilib/imagemac.net dx/src/uipp/dxuilib/imagemac.net
---- dx~/src/uipp/dxuilib/imagemac.net	2006-01-27 12:03:35.000000000 +0100
-+++ dx/src/uipp/dxuilib/imagemac.net	2006-01-27 12:07:39.000000000 +0100
+--- a/src/uipp/dxuilib/imagemac.net
++++ b/src/uipp/dxuilib/imagemac.net
 @@ -5,13 +5,13 @@
  //
  //
@@ -2387,9 +2374,8 @@ diff -urNad dx~/src/uipp/dxuilib/imagemac.net dx/src/uipp/dxuilib/imagemac.net
  include "vrmlmac.net"
  //
  // Begin MDF
-diff -urNad dx~/src/uipp/java/README dx/src/uipp/java/README
---- dx~/src/uipp/java/README	2006-01-27 12:03:35.000000000 +0100
-+++ dx/src/uipp/java/README	2006-01-27 12:07:39.000000000 +0100
+--- a/src/uipp/java/README
++++ b/src/uipp/java/README
 @@ -33,7 +33,7 @@
  
  Once both dx and the samples have been "configure... make... make install"ed,
@@ -2420,8 +2406,8 @@ diff -urNad dx~/src/uipp/java/README dx/src/uipp/java/README
  as will PASS instructions in httpd.conf.
  The httpd.conf file is usually in /etc/ or a subdirectory thereof.
  RedHat left .htm out of /etc/mime.types, you'll need to add htm to the html
---- dx~/src/uipp/java/server/startserver.in	2006-01-27 12:03:35.000000000 +0100
-+++ dx/src/uipp/java/server/startserver.in	2006-01-27 12:07:39.000000000 +0100
+--- a/src/uipp/java/server/startserver.in
++++ b/src/uipp/java/server/startserver.in
 @@ -339,7 +339,7 @@
  ##
  ## Where is the DXServer directory?  The .class files
@@ -2431,9 +2417,8 @@ diff -urNad dx~/src/uipp/java/README dx/src/uipp/java/README
  ## tells java to use an arch specific method of loading shared
  ## objects where the complete file name including path must be
  ## specified.
-diff -urNad dx~/src/uipp/mb/MBGenerate.C dx/src/uipp/mb/MBGenerate.C
---- dx~/src/uipp/mb/MBGenerate.C	2006-01-27 12:03:36.000000000 +0100
-+++ dx/src/uipp/mb/MBGenerate.C	2006-01-27 12:07:39.000000000 +0100
+--- a/src/uipp/mb/MBGenerate.C
++++ b/src/uipp/mb/MBGenerate.C
 @@ -169,7 +169,7 @@
      // This should not be necessary, but we'll be very
      // careful just before the 3.1 release
@@ -2443,9 +2428,8 @@ diff -urNad dx~/src/uipp/mb/MBGenerate.C dx/src/uipp/mb/MBGenerate.C
  
      fprintf(fd, "SHELL = /bin/sh%s", NEWLINE);
      fprintf(fd, "BASE = %s%s%s",uiroot, NEWLINE, NEWLINE);
-diff -urNad dx~/src/uipp/prompter/CommandTextPopup.C dx/src/uipp/prompter/CommandTextPopup.C
---- dx~/src/uipp/prompter/CommandTextPopup.C	2006-01-27 12:03:36.000000000 +0100
-+++ dx/src/uipp/prompter/CommandTextPopup.C	2006-01-27 12:07:39.000000000 +0100
+--- a/src/uipp/prompter/CommandTextPopup.C
++++ b/src/uipp/prompter/CommandTextPopup.C
 @@ -107,7 +107,7 @@
      if ((!uiroot) || (!uiroot[0]))
  	uiroot = (char *)getenv("DXROOT");
@@ -2455,10 +2439,9 @@ diff -urNad dx~/src/uipp/prompter/CommandTextPopup.C dx/src/uipp/prompter/Comman
  
      char *sampDat = new char[strlen(uiroot) + strlen("samples/data") + 16];
      strcpy(sampDat, uiroot);
-diff -urNad dx~/src/uipp/prompter/GARApplication.C dx/src/uipp/prompter/GARApplication.C
---- dx~/src/uipp/prompter/GARApplication.C	2006-01-27 12:03:36.000000000 +0100
-+++ dx/src/uipp/prompter/GARApplication.C	2006-01-27 12:07:39.000000000 +0100
-@@ -319,7 +319,7 @@
+--- a/src/uipp/prompter/GARApplication.C
++++ b/src/uipp/prompter/GARApplication.C
+@@ -316,7 +316,7 @@
  	printf ("\t-port <port>  :   connect to a running exec on <port>\n");
  	printf ("\t-exec <cmd>   :   use <cmd> to start data explorer (default: dx -image)\n");
  	printf ("\t-data <file>  :   use <file> as a data file\n");
@@ -2467,7 +2450,7 @@ diff -urNad dx~/src/uipp/prompter/GARApplication.C dx/src/uipp/prompter/GARAppli
  	exit(0);
      }
      
-@@ -699,7 +699,7 @@
+@@ -696,7 +696,7 @@
  	return this->getUIRoot();
      if (getenv("DXROOT"))
  	return getenv("DXROOT");
@@ -2476,10 +2459,9 @@ diff -urNad dx~/src/uipp/prompter/GARApplication.C dx/src/uipp/prompter/GARAppli
  }
  
  
-diff -urNad dx~/src/uipp/tutor/TutorApplication.C dx/src/uipp/tutor/TutorApplication.C
---- dx~/src/uipp/tutor/TutorApplication.C	2006-01-27 12:03:36.000000000 +0100
-+++ dx/src/uipp/tutor/TutorApplication.C	2006-01-27 12:07:39.000000000 +0100
-@@ -270,7 +270,7 @@
+--- a/src/uipp/tutor/TutorApplication.C
++++ b/src/uipp/tutor/TutorApplication.C
+@@ -269,7 +269,7 @@
              // This will show up as a memory leak, not worth worrying about
              TutorApplication::resource.UIRoot = DuplicateString(s);
          else
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..77ad450
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,13 @@
+10-fix-man-section.patch
+10-invoke-man.patch
+10-64bit-pointer-fixes.patch
+10-kernel-includes-fix.patch
+10-gcc43-build-fix.patch
+10-kfreebsd-build-fixes.patch
+10-magickcore-api.patch
+10-open-mode.patch
+10-autoreconf-fix.patch
+20-magick-pkgconfig.patch
+30-no-shell-override.patch
+40-hdfalt-support.patch
+90-usr-local-cleanup.patch
diff --git a/debian/rules b/debian/rules
index 80dcdff..c0f05cd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,7 +8,6 @@
 #export DH_VERBOSE=1
 
 PACKAGE= dx
-include /usr/share/dpatch/dpatch.make
 
 RSH=/usr/bin/ssh
 
@@ -49,8 +48,12 @@ configure-stamp:
 
 	touch configure-stamp
 
+
+build-arch: build
+build-indep: build
+
 build: build-stamp
-build-stamp: patch-stamp configure-stamp
+build-stamp: configure-stamp
 	dh_testdir
 
 	# Compiling displayx.c with -O2 or higher is broken on mips.
@@ -81,7 +84,7 @@ build-stamp: patch-stamp configure-stamp
 
 	touch build-stamp
 
-clean: clean-me-first unpatch
+clean: clean-me-first
 clean-me-first:
 	dh_testdir
 	dh_testroot
@@ -109,7 +112,7 @@ install: install-stamp
 install-stamp: build-stamp
 	dh_testdir
 	dh_testroot
-	dh_clean -k
+	dh_prep
 	dh_installdirs
 
 	# Install everything into single directory first...
@@ -189,4 +192,4 @@ source diff:
 	@echo >&2 'source and diff are obsolete - use dpkg-source -b'; false
 
 binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary patch unpatch clean-me-first
+.PHONY: build clean binary-indep binary-arch binary clean-me-first
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
-- 
1.7.10

