+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+@DPATCH@
+diff -urNad wulfware-2.6.0~/wulf2html/cluster_header.html wulfware-2.6.0/wulf2html/cluster_header.html
+--- wulfware-2.6.0~/wulf2html/cluster_header.html 2007-07-11 23:58:25.000000000 +0200
++++ wulfware-2.6.0/wulf2html/cluster_header.html 2007-08-26 21:18:39.000000000 +0200
+@@ -1,9 +1,9 @@
+ Localhost Statistics
+
+ To create a display for a cluster or LAN, edit
+-/etc/wulfware/wulf2html.sh, /etc/wulfware/wulfhosts, and
++/etc/defaults/wulf2html, /etc/wulfware/wulfhosts, and
+ /etc/wulfware/cluster_header.html (this file) to create a web-browseable
+-view of various performance metrics.
++view of various performance metrics.
+
+
+ - Load/Performance
--- wulfware-2.6.0.orig/debian/patches/globals.c.dpatch
+++ wulfware-2.6.0/debian/patches/globals.c.dpatch
@@ -0,0 +1,35 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## globals.c.dpatch by Morten Kjeldgaard
+##
+## DP: Patch for the globals problem
+
+@DPATCH@
+
+diff --git a/libwulf/globals.c b/libwulf/globals.c
+new file mode 100644
+index 0000000..a726830
+--- /dev/null
++++ b/libwulf/globals.c
+@@ -0,0 +1,22 @@
++/*
++ *========================================================================
++ * $Id: init.c 88 2004-09-28 22:49:38Z rgb $
++ *
++ * See copyright in copyright.h and the accompanying file COPYING
++ *========================================================================
++ */
++
++#include "wulfware/libwulf.h"
++
++/* define library globals here */
++
++ char init_buf[K64];
++ char tmp_buf[K];
++ char update_buf[K64];
++ List *hostlist;
++ List *hostrangelist;
++ List *hosttaglist;
++ List *iprangelist;
++ List *tasklist;
++ List *userlist;
++ int localhosts_only;
--- wulfware-2.6.0.orig/debian/patches/xmlsysd.h.dpatch
+++ wulfware-2.6.0/debian/patches/xmlsysd.h.dpatch
@@ -0,0 +1,37 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## xmlsysd.h.dpatch by Morten Kjeldgaard
+##
+## DP: Patch xmlsysd.h so the daemon at least _compiles_ on the Mac.
+
+@DPATCH@
+
+
+diff --git a/xmlsysd/xmlsysd.h b/xmlsysd/xmlsysd.h
+index 64bcef2..d8b5960 100644
+--- a/xmlsysd/xmlsysd.h
++++ b/xmlsysd/xmlsysd.h
+@@ -25,11 +25,21 @@
+ #include
+ #include
+ #include
+-#include
+-#include
++#ifdef __APPLE__
++# ifdef __ppc__
++# define HZ 60
++# include
++# include
++# include
++# endif
++#endif
++#ifdef __linux__
++# include
++# include
++# include
++#endif
+ #include
+ #include
+-#include
+ #include
+ #include "copyright.h"
+
--- wulfware-2.6.0.orig/debian/patches/00list
+++ wulfware-2.6.0/debian/patches/00list
@@ -0,0 +1,6 @@
+autotools.dpatch
+get_system_users.c.dpatch
+globals.c.dpatch
+libwulf_headers.dpatch
+xmlsysd.h.dpatch
+cluster_header.html.dpatch
--- wulfware-2.6.0.orig/debian/patches/libwulf_headers.dpatch
+++ wulfware-2.6.0/debian/patches/libwulf_headers.dpatch
@@ -0,0 +1,87 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## libwulf_headers.dpatch by Morten Kjeldgaard
+##
+## DP: Patch some libwulf header files to reflect the change
+## DP: made to the globals. Also get rid of version.h, which
+## DP: is not needed since we use autotools to define the version.
+
+@DPATCH@
+
+diff --git a/include/wulfware/libwulf.h b/include/wulfware/libwulf.h
+index a61e76c..093e65f 100644
+--- a/include/wulfware/libwulf.h
++++ b/include/wulfware/libwulf.h
+@@ -141,9 +141,9 @@
+ * connection/initialization thread and the update thread, as eventually
+ * they are bound to collide with unpredictable results.
+ */
+- char init_buf[K64];
+- char update_buf[K64];
++ extern char init_buf[K64];
++ extern char update_buf[K64];
+ /*
+ * For parsing attributes etc.
+ */
+- char tmp_buf[K];
++ extern char tmp_buf[K];
+diff --git a/include/wulfware/libwulf_wulfhost.h b/include/wulfware/libwulf_wulfhost.h
+index 7b228df..3df2e27 100644
+--- a/include/wulfware/libwulf_wulfhost.h
++++ b/include/wulfware/libwulf_wulfhost.h
+@@ -65,7 +65,7 @@
+ } Dctl;
+
+ /*
+- * This struct contains all per-host state information:
++ * This struct contains all per-host State information:
+ * hostname
+ * host IP number (character and binary)
+ * port number
+@@ -111,4 +111,4 @@
+ * so that we can freely add or delete them. This means that we
+ * have to walk the list whenever we loop over all hosts.
+ */
+- List *hostlist;
++extern List *hostlist;
+diff --git a/include/wulfware/libwulf_wulfhosts.h b/include/wulfware/libwulf_wulfhosts.h
+index 1c1d853..3abe704 100644
+--- a/include/wulfware/libwulf_wulfhosts.h
++++ b/include/wulfware/libwulf_wulfhosts.h
+@@ -20,7 +20,7 @@
+ * This flag says "connect to localhost only" and skips parsing
+ * of wulfhosts files in any location.
+ */
+- int localhosts_only;
++extern int localhosts_only;
+
+ /*
+ * The following structs exist only to allow and
+@@ -50,16 +50,16 @@
+ * We keep linked lists of host tags and host ranges and ip ranges
+ * for parsing wulfhosts.
+ */
+- List *hosttaglist;
+- List *hostrangelist;
+- List *iprangelist;
++extern List *hosttaglist;
++extern List *hostrangelist;
++extern List *iprangelist;
+
+ /*
+ * We'll also want a couple of linked lists for users and tasks to be
+ * monitored.
+ */
+- List *userlist;
+- List *tasklist;
++extern List *userlist;
++extern List *tasklist;
+
+ /*
+ * Needed by connect_to_hosts() since it is always a threaded routine
+diff --git a/include/wulfware/wulfware_version.h b/include/wulfware/wulfware_version.h
+deleted file mode 100644
+index afa5a94..0000000
+--- a/include/wulfware/wulfware_version.h
++++ /dev/null
+@@ -1 +0,0 @@
+-#define WULFWARE_VERSION "2.6.0"