X-Git-Url: https://git.donarmstrong.com/?p=bugscan.git;a=blobdiff_plain;f=dohtml;h=39b7889f22000c2f26c55b5afe771b1872a9ed5f;hp=0c7b87ae115a067ea4f84a9b480e2d10f2239d19;hb=4d0d41b06d39a6aeabe72882633fd3bb5f8ba27c;hpb=422b855a8e5404520d38492d16166a442bc41906

diff --git a/dohtml b/dohtml
index 0c7b87a..39b7889 100755
--- a/dohtml
+++ b/dohtml
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-htmldir=/home/sesse/bugscan/www
+htmldir=/org/bugs.debian.org/www/bugscan
 
 realmakepage() {
 	local	filter="$1"	# Distributions to list
@@ -39,17 +39,6 @@ EOF
 	./bugreport -H -s $filter
 	
 	cat <<EOF
-<p>
-Explanation for comment tags:
-<ul>
-   <li><strong>[FIX]</strong>: describes a simple method to deal with
-       the bug.
-   <li><strong>[STRATEGY]</strong>: describes a possible approach for
-       fixing the bug.
-   <li><strong>[HELP]</strong>: help is needed to fix this bug.
-   <li><strong>[REMOVE]</strong>: package will be removed if bug is not fixed
-</ul>
-
 <p>
 Explanation for <a href="http://www.debian.org/Bugs/Developer#tags">bug
 tags</a>:
@@ -62,14 +51,13 @@ tags</a>:
    <li><strong>R</strong>: unreproducible</li>
    <li><strong>S</strong>: security</li>
    <li><strong>U</strong>: upstream</li>
-   <li><strong>I</strong>: etch-ignore</li>
+   <li><strong>I</strong>: wheezy-ignore or jessie-ignore</li>
 </ul>
 
 <p>
-Some bugs have an additional set of tags indicating they only apply
-to a particular release: O for oldstable (woody), S for stable (sarge),
-T for testing (etch), U for unstable (sid) or E for experimental. X
-indicates that the package is not in testing.
+The second set of tags indicate what releases a bug applies to:
+O for oldstable (squeeze), S for stable (wheezy), T for testing (jessie),
+U for unstable (sid) or E for experimental.
 
 <p>
 
@@ -107,13 +95,21 @@ EOF
 	cat <<EOF
 </p>
 
-<div align="center"><img src="graph.png" alt="Graph of RC bugs"></div>
+<div align="center"><img src="graph-release.png" alt="Graph of RC bugs"></div>
+
+<p>Other graphs:
+  <ul>
+    <li><a href="graph-month.png">Graph for the last month</a></li>
+    <li><a href="graph.png">Graph with all the history</a></li>
+  </ul>
+</p>
 
 <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 and/or versioning information indicate that they don't apply to
-testing).</p>
+testing), and the blue line graphs the number of bugs that are a concern
+for the <em>current</em> stable release.</p>
 
 <h2>Recent changes</h2>
 EOF
@@ -126,25 +122,17 @@ 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/stable.html">Only bugs relevant to stable</a>
+    <br>
+     + <a href="other/testing.html">Only bugs relevant to testing</a>
 </ul>
 <p clear=both>
 <hr>
@@ -164,8 +152,8 @@ makepage() {
 	mv -f $3.new $3
 }
 
-time=$(date -u --date="$(ls -Ll status | awk '{print $6, $7}'):00 $(date +%z)")
-oldtime=$(date -u --date="$(ls -Ll status-old | awk '{print $6, $7}'):00 $(date +%z)")
+time=$(date -u -d '@'$(($(stat -c '%Y' status) / 3600 * 3600)))
+oldtime=$(date -u -d '@'$(($(stat -c '%Y' status-old) / 3600 * 3600)))
 title="Release-critical bugs status"
 
 makepage "debian" "$title" "$htmldir/debian/all.html" "$time"
@@ -174,17 +162,9 @@ 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/stable.html" "$time" "-b"
+makepage "" "$title" "$htmldir/other/testing.html" "$time" "-t"
 
 makemainpage > $htmldir/index.html.new
 mv -f $htmldir/index.html.new $htmldir/index.html