1999-03-17 Gordon Matzigkeit <gord@trick.fig.org>

	* servers.boot: Clarify the default-pager description, and
          add a default `$(default-pager)' line.

	* Makefile: New file.

5 files changed, 59 insertions, 14 deletions

diff --git a/debian/ChangeLog b/debian/ChangeLog
new file mode 100644
index 00000000..8d94aa55
--- /dev/null
+++ b/debian/ChangeLog
@@ -0,0 +1,6 @@
+1999-03-17  Gordon Matzigkeit  <gord@trick.fig.org>
+
+	* servers.boot: Clarify the default-pager description, and
+          add a default `$(default-pager)' line.
+
+	* Makefile: New file.
diff --git a/debian/Makefile b/debian/Makefile
new file mode 100644
index 00000000..7afd6dc7
--- /dev/null
+++ b/debian/Makefile
@@ -0,0 +1,28 @@
+# Makefile for Debian Hurd packaging directory
+#   Copyright (C) 1999 Free Software Foundation, Inc.
+#   Gordon Matzigkeit <gord@fig.org>, 1999-03-17
+#
+#   This file is part of the GNU Hurd.
+#
+#   The GNU Hurd is free software; you can redistribute it and/or
+#   modify it under the terms of the GNU General Public License as
+#   published by the Free Software Foundation; either version 2, or (at
+#   your option) any later version.
+#
+#   The GNU Hurd is distributed in the hope that it will be useful, but
+#   WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+#   General Public License for more details.
+#
+#   You should have received a copy of the GNU General Public License
+#   along with this program; if not, write to the Free Software
+#   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+
+dir := debian
+makemode := misc
+
+# Just distribute the files we need.
+DIST_FILES = README.Debian TODO changelog conffiles control copyright \
+	rules servers.boot
+
+include ../Makeconf
diff --git a/debian/TODO b/debian/TODO
index f6e20d74..6ee9d28b 100644
--- a/debian/TODO
+++ b/debian/TODO
@@ -1,5 +1,11 @@
 * daemons/rc
-* splitting in multiple packages
-* postinst script for translators
 
-shlibdeps!
+* Split into multiple packages, so that we can provide virtual
+  packages that correspond closer to the existing Debian GNU/Linux
+  ones.
+
+* A postinstallation script which sets up translators correctly.
+
+* Library dependencies.
+
+* Do something with the Texinfo documentation.
diff --git a/debian/changelog b/debian/changelog
index 02112bda..f96c9388 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,7 @@
-hurd (19990221-1) unstable; urgency=low
+hurd (19990317) unstable; urgency=low
 
-  * New version from CVS.
   * Put shared library symlinks into the hurd-dev package.
+  * Clarify instructions in provided servers.boot.
 
  --
 
diff --git a/debian/servers.boot b/debian/servers.boot
index d25129d8..163389de 100644
--- a/debian/servers.boot
+++ b/debian/servers.boot
@@ -1,16 +1,21 @@
-# Boot script file for booting Debian GNU/Hurd.  Each line specifies a file to
-# be loaded by the boot loader (the first word), and actions to be done with it.
+# GNU Mach boot script for Debian GNU/Hurd.  Each line specifies a
+# file for serverboot to load (the first word), and actions to be done
+# with it.
 
 # First, the bootstrap filesystem.  It needs several ports as arguments,
 # as well as the user flags from the boot loader.
 /hurd/ext2fs.static --bootflags=${boot-args} --host-priv-port=${host-port} --device-master-port=${device-port} --exec-server-task=${exec-task} -Tdevice ${root-device} $(task-create) $(task-resume)
 
-# Now the exec server; to load the dynamically-linked exec server program,
-# we have the boot loader in fact load and run ld.so, which in turn
-# loads and runs /hurd/exec.  This task is created, and its task port saved
-# in ${exec-task} to be passed to the fs above, but it is left suspended; 
-# the fs will resume the exec task once it is ready.
+# Now the exec server; to load the dynamically-linked exec server
+# program, we have serverboot in fact load and run ld.so, which in
+# turn loads and runs /hurd/exec.  This task is created, and its task
+# port saved in ${exec-task} to be passed to the fs above, but it is
+# left suspended; the fs will resume the exec task once it is ready.
 /lib/ld.so.1 /hurd/exec $(exec-task=task-create)
 
-# default pager
-#/dev/hd0s2 $(add-paging-file) $(default-pager)
+# Have serverboot act as our default pager.
+$(default-pager)
+
+# To swap to a Linux swap partition, use something like the following
+# instead of the above $(default-pager) line:
+#/dev/hd0s2 $(add-linux-paging-file) $(default-pager)