X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=dohtml;h=e06f9bb609fd473525c3fe29fe8d97bb01beb8f3;hb=65cf261c15c35f62bde5f234b5e92df8e8c98a07;hp=5e93730e581511787a8ac4a01ea1a7e9e3279f6d;hpb=a00cbd2ed63bad10e639c9b2d58d9a933b976e6e;p=bugscan.git

diff --git a/dohtml b/dohtml
index 5e93730..e06f9bb 100755
--- a/dohtml
+++ b/dohtml
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-htmldir=/org/bugs.debian.org/www/bugscan
+htmldir=/home/sesse/bugscan/www
 
 realmakepage() {
 	local	filter="$1"	# Distributions to list
@@ -34,10 +34,6 @@ realmakepage() {
 
 <hr>
 
-<p>Check out Steinar H. Gunderson's beta <a href="http://people.debian.org/~sesse/bugscan/">version-tracking aware release critical bug page</a>.
-
-<hr>
-
 <p>
 EOF
 	./bugreport -H -s $filter
@@ -116,7 +112,8 @@ EOF
 <p>The red line graphs all bugs with release-critical severities; the green
 line graphs the number of bugs that are actually a concern for the next
 release (excluding ignored bugs, bugs on packages not in testing, and bugs
-whose tags indicate that they don't apply to testing).</p>
+whose tags and/or versioning information indicate that they don't apply to
+testing).</p>
 
 <h2>Recent changes</h2>
 EOF
@@ -129,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>
@@ -177,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 "debian" "$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