Works well, had to rearrage the CVS stuff a little so it wouldn't overwrite and

fail relative to gbootroots CVS replacement versioning.

add-ons/yard/make-debian-X11/Makefile

@@ -4,8 +4,10 @@ all: install
 install:
 	install -d /usr/bin
 	cp -fa make_debian-X11 /usr/bin/make_debian-X11 
-	install -d /usr/share/gbootroot/yard/Replacements
+	install -d /usr/share/gbootroot/yard/Replacements/root
-	cp -fa replacements/* /usr/share/gbootroot/yard/Replacements
+	cp -fa replacements/root/*debian-X11 /usr/share/gbootroot/yard/Replacements/root
+	install -d /usr/share/gbootroot/yard/Replacements/usr/X11R6/bin
+	cp -fa replacements/usr/X11R6/bin/* /usr/share/gbootroot/yard/Replacements/usr/X11R6/bin
 
 
 

add-ons/yard/make-debian-X11/Makefile.pkg

@@ -4,8 +4,11 @@ all: install
 install:
 	install -d $(DESTDIR)/usr/bin
 	cp -fa make_debian-X11 $(DESTDIR)/usr/bin/make_debian-X11 
-	install -d $(DESTDIR)/usr/share/gbootroot/yard/Replacements
+	install -d $(DESTDIR)/usr/share/gbootroot/yard/Replacements/root
-	cp -fa replacements/* $(DESTDIR)/usr/share/gbootroot/yard/Replacements
+	cp -fa replacements/root/*debian-X11 $(DESTDIR)/usr/share/gbootroot/yard/Replacements/root
+	install -d $(DESTDIR)/usr/share/gbootroot/yard/Replacements/usr/X11R6/bin
+	cp -fa replacements/usr/X11R6/bin/* $(DESTDIR)/usr/share/gbootroot/yard/Replacements/usr/X11R6/bin
+
 
 
 

add-ons/yard/make-debian-X11/make_debian-X11

@@ -29,7 +29,7 @@ my $nodename = `uname -n`; chomp $nodename;
 my $debian_yard = "Debian-X11.yard";
 my $status = "/var/lib/dpkg/status";
 my $info = "/var/lib/dpkg/info";
-my $version  = "1.1";
+my $version  = "1.2";
 
 # 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.  
@@ -254,7 +254,7 @@ return $stuff;
 use strict;
 use File::Basename;
 my $rm = "\$";
-$main::Id = "# \$Id: make_debian-X11,v 1.33 2001/11/07 18:48:15 freesource Exp $rm"; 
+$main::Id = "# \$Id: make_debian-X11,v 1.34 2001/11/09 20:02:53 freesource Exp $rm"; 
 my $sbin = grep(/\/usr\/sbin/,$ENV{'PATH'});
 if ($sbin == 0) {
     $ENV{'PATH'} = "/usr/sbin:" . $ENV{'PATH'};

add-ons/yard/make-debian-X11/pkg/dpkg/changelog

@@ -1,3 +1,16 @@
+make-debian-x11 (1.2-1) unstable; urgency=low
+
+  * setup-debian-X11 script improved slightly.
+  * The majority of replacements except for passwd*, shadow, and
+    ld.so.conf have Id and made by make_debian.  Since non-root users
+    can't edit global replacements, the basic idea is that root won't
+    edit replacements either,  because usually root will be using an
+    editor like Emacs which respects  that CVS versioned files outside
+    of the repository are read-only.  Users should make copies of
+    versioned replacements which they want to edit: fstab.debian-1000
+
+ -- Jonathan Rosenbaum <freesource@users.sourceforge.net>  Sun,  9 Dec 2001 03:19:26 -0500
+
 make-debian-x11 (1.1-1) unstable; urgency=low
 
   * The author of swim came out with a new version he now calls dswim.  This