- Change default build to Etch.

- Remove all Sarge specific content and make Etch specific content default.
- Delete some obsolete entities.

7 files changed, 7 insertions, 92 deletions

diff --git a/build/build.sh b/build/build.sh
index c14b852ae..c46032cdd 100755
--- a/build/build.sh
+++ b/build/build.sh
@@ -68,11 +68,9 @@ for lang in $languages; do
     [ -n "$USES_PO" ] && rm -r ../$lang || true
 done
 
-if [ "$manual_release" != "sarge" ] ; then
-    PRESEED="../en/appendix/preseed.xml"
-    if [ -f $PRESEED ] && [ -f preseed.pl ] ; then
-	./preseed.pl -r $manual_release $PRESEED >$destination/example-preseed.txt
-    fi
+PRESEED="../en/appendix/preseed.xml"
+if [ -f $PRESEED ] && [ -f preseed.pl ] ; then
+    ./preseed.pl -r $manual_release $PRESEED >$destination/example-preseed.txt
 fi
 
 clear_po
diff --git a/build/buildone.sh b/build/buildone.sh
index 48982cfd8..a1d3d0ea3 100755
--- a/build/buildone.sh
+++ b/build/buildone.sh
@@ -53,7 +53,7 @@ create_profiled () {
     fi
 
     if [ -z "$manual_release" ]; then
-        manual_release="sarge"
+        manual_release="etch"
     fi
     if [ -z "$manual_target" ]; then
         manual_target="for_cd"
diff --git a/build/buildweb.sh b/build/buildweb.sh
index 5426b59ed..43ec4dfae 100755
--- a/build/buildweb.sh
+++ b/build/buildweb.sh
@@ -66,15 +66,9 @@ for lang in $languages; do
     [ -n "$USES_PO" ] && rm -r ../$lang || true
 done
 
-if [ "$manual_release" = "etch" ] ; then
-    PRESEED="../en/appendix/example-preseed-etch.xml"
-    LCKEEP="-v lckeep=1"
-else
-    PRESEED="../en/appendix/example-preseed-sarge.xml"
-    LCKEEP=""
-fi
-if [ -f $PRESEED ] && [ -f preseed.awk ] ; then
-    gawk -f preseed.awk $LCKEEP $PRESEED >$destination/example-preseed.txt
+PRESEED="../en/appendix/preseed.xml"
+if [ -f $PRESEED ] && [ -f preseed.pl ] ; then
+    ./preseed.pl -r $manual_release $PRESEED >$destination/example-preseed.txt
 fi
 
 clear_po
diff --git a/build/entities/install-docs.ent b/build/entities/install-docs.ent
index e0e490778..7ccd4431e 100644
--- a/build/entities/install-docs.ent
+++ b/build/entities/install-docs.ent
@@ -28,10 +28,6 @@
 </para></listitem>
   '>
 
-<!-- base-contents not used anymore, but still defined for legacy -->
-<!-- <!ENTITY list-base-contents-file 'no longer exists'> -->
-
-
 <!--  -->
 <!--  Miscellaneous files -->
 <!--  A catch-all, so that every file in -->
diff --git a/build/entities/urls.ent b/build/entities/urls.ent
index 65930bd7d..25965b849 100644
--- a/build/entities/urls.ent
+++ b/build/entities/urls.ent
@@ -48,10 +48,6 @@
 <!-- where to get the current debian-installer -->
 <!ENTITY url-debian-installer "&disturl;main/installer-&architecture;/current/">
 
-<!-- debian-installer CVSweb - OBSOLETED: should be removed when no longer used -->
-<!-- <!ENTITY url-d-i-cvsweb "http://svn.debian.org/viewcvs/d-i/"> -->
-<!ENTITY url-d-i-cvsweb "http://svn.debian.org/wsvn/d-i/">
-
 <!-- debian-installer WebSVN  -->
 <!ENTITY url-d-i-websvn "http://svn.debian.org/wsvn/d-i/">
 
@@ -253,9 +249,6 @@
 
 <!-- this link is bad and not sure how to replace it! -->
 <!ENTITY url-linux-mca "http://www.dgmicro.com/mca/general-goods.html">
-<!-- Archives are dead; link below is no longer used -->
-<!ENTITY url-linux-mca-discussion
-  "http://www.dgmicro.com/linux_frm.htm">
 
 <!-- "the link is valid but information is stale. The archive has been
 removed and text documention at link directs one to a URL that is broken." -->
@@ -271,9 +264,6 @@ removed and text documention at link directs one to a URL that is broken." -->
      http://metalab.unc.edu/LDP/HOWTO/Multiboot-with-LILO.html
   -->     
 
-<!-- Link no longer exists, should be removed -->
-<!ENTITY url-windows-refund "http://www.windowsrefund.net/">
-
 <!ENTITY url-xfree86 "http://www.xfree86.org/">
 <!ENTITY url-xfree "&url-xfree86;">
 
diff --git a/build/preseed.awk b/build/preseed.awk
deleted file mode 100644
index 1619865fe..000000000
--- a/build/preseed.awk
+++ /dev/null
@@ -1,61 +0,0 @@
-# Extract the preseeding example from appendix/example-preseed-*.xml.
-# During extraction "line continuations" - that were added for improved
-# readability - will be removed, rejoining the split lines.
-
-# If variable lckeep is passed with value "1", line continuations are
-# ignored, i.e. the lines in the example are not reformatted.
-
-BEGIN {
-    inexample="0"
-    inseq="0"
-    totline=""
-}
-
-# Ignore everything before the line opening the example
-# Note: this assumes that <informalexample><screen> is on one line
-/<informalexample.*><screen>/ {
-    inexample="1"
-    getline
-}
-
-# Ignore everything after the line closing the example
-# Note: this assumes that </screen></informalexample> is on one line
-/<\/screen><\/informalexample>/ {
-    inexample="0"
-}
-
-# Handling of lines not ending with a line continuation character
-! /\\[[:space:]]*$/ {
-    if ( inexample == "1" ) {
-        if ( lckeep == "1" ) {
-            print $0
-        } else {
-            if ( inseq == "1" ) {
-                sub(/^[[:space:]]*/, "")
-                sub(/^#[[:space:]]*/, "")
-            }
-            totline = totline $0
-
-            print totline
-            totline=""
-            inseq="0"
-        }
-    }
-}
-
-# Handling of lines ending with a line continuation character
-/\\[[:space:]]*$/ {
-    if ( inexample == "1" ) {
-        if ( lckeep == "1" ) {
-            print $0
-        } else {
-            if ( inseq == "1" ) {
-                sub(/^[[:space:]]*/, "")
-                sub(/^#[[:space:]]*/, "")
-            }
-            inseq="1"
-            gsub(/[[:space:]]*\\[[:space:]]*$/, " ")
-            totline = totline $0
-        }
-    }
-}
diff --git a/build/templates/docstruct.ent b/build/templates/docstruct.ent
index 915e362e5..2c3a726eb 100644
--- a/build/templates/docstruct.ent
+++ b/build/templates/docstruct.ent
@@ -96,8 +96,6 @@
  <!ENTITY using-d-i.xml                  SYSTEM "##SRCPATH##/using-d-i/using-d-i.xml">
   <!ENTITY using-d-i-components.xml      SYSTEM "##SRCPATH##/using-d-i/components.xml">
 
-  <!ENTITY module-languagechooser.xml    SYSTEM "##SRCPATH##/using-d-i/modules/languagechooser.xml">
-  <!ENTITY module-countrychooser.xml     SYSTEM "##SRCPATH##/using-d-i/modules/countrychooser.xml">
   <!ENTITY module-localechooser.xml      SYSTEM "##SRCPATH##/using-d-i/modules/localechooser.xml">
   <!ENTITY module-s390-netdevice.xml     SYSTEM "##SRCPATH##/using-d-i/modules/s390/netdevice.xml">
   <!ENTITY module-s390-dasd.xml          SYSTEM "##SRCPATH##/using-d-i/modules/s390/dasd.xml">