From ed61744912b351235aa59490ac5cf3f2aea328b7 Mon Sep 17 00:00:00 2001
From: freesource <freesource>
Date: Sun, 14 Oct 2001 20:24:28 +0000
Subject: [PATCH] Made the directions in the script a little clearer.

---
 add-ons/yard/make-debian-X11/make_debian-X11 | 80 +++++++++++---------
 1 file changed, 43 insertions(+), 37 deletions(-)

diff --git a/add-ons/yard/make-debian-X11/make_debian-X11 b/add-ons/yard/make-debian-X11/make_debian-X11
index 4d63897..b5343bc 100755
--- a/add-ons/yard/make-debian-X11/make_debian-X11
+++ b/add-ons/yard/make-debian-X11/make_debian-X11
@@ -36,19 +36,21 @@ my (%alternatives, @alternatives); # for checking for alternatives
 my %inetd; # checks for inetd binaries.
 my $version  = "1.0";
 
-# You need file-rc, and you may add other extra stuff.  These packages were
-# chosen for woody, so you may need something different.  If you add stuff, 
-# check for dependencies, empty directories and special configuration files
+# You need file-rc, and you may add other extra stuff (@extra_packages).  
+# These packages were chosen for woody, so you may need something different.  
+# If you add stuff, check for dependencies, empty directories and special 
+# configuration files
 # created by the package scripts.
 #
 # You may have to edit the text below STUFF.
 #
-# Swim provides excellent information for this task.  swim -qT packagename(s) &
-# swim -ql --df packagename(s) & swim -qc packagename(s) (not all conf files 
+# Dswim provides excellent information for this task.  swim -qT packagename(s)
+# & swim -ql --df packagename(s) & swim -qc packagename(s) (not all conf files 
 # can  be found this way .. read above) so you will want to use 
 # swim -q --scripts packagename(s) or 
 # swim -q --preinst --postinst packagenames(s).
 
+# EDIT HERE
 my @extra_packages = qw(file-rc swim apt apt-utils debconf nvi sysklogd
 klogd netbase tcpd net-tools portmap netkit-ping netkit-inetd ifupdown less 
 perl perl-modules libwrap0 ipchains whiptail libnewt0 libpopt0 debconf-utils
@@ -56,39 +58,8 @@ binutils bzip2 file libbz2-1.0 libfreetype6 libglib1.2 libgtk-perl
 libgtk1.2 make xfonts-base xfree86-common xlibmesa3 xlibs 
 xserver-common xterm xutils zlib1g libgdbmg1 libxaw7 gbootroot
 flwm libfltk1 xnest make-debian-x11 ash); 
+# NEXT EDIT TEMPLATE 
 
-# --------------------------------------------------------------------
-# DIRECTIONS
-# This creates a X11 filesystem.
-# These replacements are unique and not found in CVS:
-# add sources.list to this, too.
-
-#/usr/X11R6/bin/startx <= Replacements/usr/X11R6/bin/startx-debian-X11 
-#/root/README <= Replacements/root/README-debian-X11
-#/root/make_swapfile <= Replacements/root/make_swapfile
-#/root/umlnet <= Replacements/root/umlnet .. won't use.
-#/etc/apt/sources.list  <= Replacements/etc/sources.list .. for adm.
-
-# setup script does this
-# 0. run dpkg-reconfigure for xfree86-common and xserver-common.
-#    This catches mistakes.
-# 1. dpkg-reconfigure for xfonts-base
-# 2. make permissions correct for directory /home/user and all files * & .*.
-# 3. run swim --initdb .. this is done by make-debian-x11.
-# 4. run /etc/cron.daily/find
-# ...................................................................
-# debian_x11 sourceforge release preparation
-# 5.  Other packages may be installed with apt-get.
-# 6.  If any of these things were used: Clean out sources.list, 
-#     /var/cache/archives /var/lib/apt/lists, /etc/network/interface 
-#     should be commented in again. 
-# 7.  remove linux uml_* or just leave them. 
-# 8.  run /etc/cron.daily/sysklogd & /etc/cron.weekly/sysklogd
-#     and clean out *.0, and dmesg if it needs it.
-# 9.  halt and mount filesystem on loop and remove .bash_history if you 
-#     want to.
-# 10. test again.
-# --------------------------------------------------------------------
 
 # Before starting make sure swim and file-rc are present.
 start_up();
@@ -303,6 +274,7 @@ STUFF
 
 return $stuff;
 } # end sub stuff
+# STOP EDITING
 #################################################################
 #################################################################
 
@@ -685,6 +657,40 @@ sub inetd_out {
 
 }
 
+# --------------------------------------------------------------------
+# Jonathan's personal directions
+# This creates a X11 filesystem.
+# These replacements are unique and not found in CVS:
+# add sources.list to this, too.
+
+#/usr/X11R6/bin/startx <= Replacements/usr/X11R6/bin/startx-debian-X11 
+#/root/README <= Replacements/root/README-debian-X11
+#/root/make_swapfile <= Replacements/root/make_swapfile
+#/root/umlnet <= Replacements/root/umlnet .. won't use.
+#/etc/apt/sources.list  <= Replacements/etc/sources.list .. for adm.
+
+# setup script does this
+# 0. run dpkg-reconfigure for xfree86-common and xserver-common.
+#    This catches mistakes.
+# 1. dpkg-reconfigure for xfonts-base
+# 2. make permissions correct for directory /home/user and all files * & .*.
+# 3. run swim --initdb .. this is done by make-debian-x11.
+# 4. run /etc/cron.daily/find
+# ...................................................................
+# debian_x11 sourceforge release preparation
+# 5.  Other packages may be installed with apt-get.
+# 6.  If any of these things were used: Clean out sources.list, 
+#     /var/cache/archives /var/lib/apt/lists, /etc/network/interface 
+#     should be commented in again. 
+# 7.  remove linux uml_* or just leave them. 
+# 8.  run /etc/cron.daily/sysklogd & /etc/cron.weekly/sysklogd
+#     and clean out *.0, and dmesg if it needs it.
+# 9.  halt and mount filesystem on loop and remove .bash_history if you 
+#     want to.
+# 10. test again.
+# --------------------------------------------------------------------
+
+
 sub home_builder {
 
     my ($home_builder) = @_;