non-US is no more, really; remove it.

[bugscan.git] / dohtml

diff --git a/dohtml b/dohtml
index 8a393031e4136ea34e9cb1ca5e519d5e541bf5b2..e06f9bb609fd473525c3fe29fe8d97bb01beb8f3 100755 (executable)
--- a/dohtml
+++ b/dohtml
@@ -126,25 +126,15 @@ EOF
 
 <ul>
   <li> <a href="debian/all.html">All</a>
-    <br>
-     + <a href="debian/testing.html">Only bugs relevant to testing</a>
-    <br>
-     + <a href="debian-non-US/all.html">All non-US</a>
   <li> <a href="debian/main.html">main</a>
-    <br>
-     + <a href="debian-non-US/main.html">main non-US</a>
   <li> <a href="debian/source.html">source</a> 
-    <br>
-     + <a href="debian-non-US/source.html">source non-US</a> 
   <li> <a href="debian/contrib.html">contrib</a>
-    <br>
-     + <a href="debian-non-US/contrib.html">contrib non-US</a>
   <li> <a href="debian/non-free.html">non-free</a>
-    <br>
-     + <a href="debian-non-US/non-free.html">non-free non-US</a>
   <li><a href="other/pseudo.html">pseudo-packages</a>
        <a href="http://www.debian.org/Bugs/pseudo-packages">(?)</a>
   <li><a href="other/all.html">Everything in one page</a>
+    <br>
+     + <a href="other/testing.html">Only bugs relevant to testing</a>
 </ul>
 <p clear=both>
 <hr>
@@ -174,17 +164,8 @@ makepage "debian/contrib" "$title" $htmldir/debian/contrib.html "$time"
 makepage "debian/non-free" "$title" $htmldir/debian/non-free.html "$time"
 makepage "debian/source" "$title" $htmldir/debian/source.html "$time"
 
-makepage "" "$title" "$htmldir/debian/testing.html" "$time" "-t"
-
-makepage "non-US" "$title" "$htmldir/debian-non-US/all.html" "$time"
-makepage "non-US/main" "$title" $htmldir/debian-non-US/main.html "$time"
-makepage "non-US/contrib" "$title" $htmldir/debian-non-US/contrib.html "$time"
-makepage "non-US/non-free" "$title" $htmldir/debian-non-US/non-free.html "$time"
-makepage "non-US/source" "$title" $htmldir/debian-non-US/source.html "$time"
-
-makepage "other/pseudo" "$title" $htmldir/other/pseudo.html "$time"
-
 makepage "" "$title" $htmldir/other/all.html "$time"
+makepage "" "$title" "$htmldir/other/testing.html" "$time" "-t"
 
 makemainpage > $htmldir/index.html.new
 mv -f $htmldir/index.html.new $htmldir/index.html