Kill the comments stuff; it hasn't been used for ages.

diff --git a/bugcounts b/bugcounts
index b0337fc01d7f68a7c88f605e54cafc3de4f3d7f6..1920a5b617b2a5905335c1e3f199dc542ffe6bdc 100755 (executable)
--- a/bugcounts
+++ b/bugcounts
@@ -43,7 +43,6 @@ scanlib::readstatus($statusfile);
 scanlib::readcomments($commentsfile);
 
 my $total=0;           # total number of bugs
 scanlib::readcomments($commentsfile);
 
 my $total=0;           # total number of bugs

-my $removecount=0;     # Number of bugs that will disappear if packages are removed

 my $patchcount=0;      # Number of bugs that have a fix proposed
 my $pendingcount=0;    # Number of bugs that will have a fix uploaded RSN
 my $ignorecount=0;      # Number of bugs being ignored
 my $patchcount=0;      # Number of bugs that have a fix proposed
 my $pendingcount=0;    # Number of bugs that will have a fix uploaded RSN
 my $ignorecount=0;      # Number of bugs being ignored


@@ -66,10 +65,6 @@ for my $p (keys %scanlib::packagelist) {
                }
                $worrycount++ if (scanlib::check_worry($scanlib::bugs{$nr}));
        }
                }
                $worrycount++ if (scanlib::check_worry($scanlib::bugs{$nr}));
        }

-
-       if (defined($scanlib::comments{$p}) && $scanlib::comments{$p} =~ m/^\[REMOVE\]/) {
-               $removecount += scalar @{$scanlib::packagelist{$p}};
-       }

 }
 
 }
 

-printf("%d %d %d %d %d %d %d\n", $total, $pendingcount, $patchcount, $removecount, $ignorecount, $nottestingcount, $worrycount);
+printf("%d %d %d 0 %d %d %d\n", $total, $pendingcount, $patchcount, $ignorecount, $nottestingcount, $worrycount);

diff --git a/bugreport b/bugreport
index dbe1bcf602e03c63d9c475092753177bb3f10515..85c77168d2af8b44c48d5c0c0f523129fa4cc08f 100755 (executable)
--- a/bugreport
+++ b/bugreport
@@ -80,19 +80,11 @@ sub MakeBuglist() {
        my $nr;                 # Current bugnumber
        my $sect;                       # BTS-subsection for bugnumber
        my $header;             # Flag if packagename has already been printed
        my $nr;                 # Current bugnumber
        my $sect;                       # BTS-subsection for bugnumber
        my $header;             # Flag if packagename has already been printed

-       my $fontset;            # Did we change the font?

 
        for my $p (sort {$a cmp $b} keys %scanlib::packagelist) {
                next if (defined $bugcfg::exclude{$p});
                $header = 0;
 
        for my $p (sort {$a cmp $b} keys %scanlib::packagelist) {
                next if (defined $bugcfg::exclude{$p});
                $header = 0;

-               $fontset = 0;

                if (defined $scanlib::comments{$p}) {
                if (defined $scanlib::comments{$p}) {

-                       if ($html && defined($scanlib::comments{$p})) {
-                               if ($scanlib::comments{$p} =~ m/^\[REMOVE\]/) {
-                                       $fontset=1;
-                                       print "<span style=\"color: red\">";
-                               }
-                       }

                        $header=1;
                        &PrintPackageHeader($p);
                        print $scanlib::comments{$p};
                        $header=1;
                        &PrintPackageHeader($p);
                        print $scanlib::comments{$p};


@@ -131,7 +123,6 @@ sub MakeBuglist() {
                        print "</span>" if ($html && ($scanlib::bugs{$nr} =~ m/^\[[^]]*[H+P]/ ||
                                                      $scanlib::bugs{$nr} =~ m/ \[[^]]*X/));
                }
                        print "</span>" if ($html && ($scanlib::bugs{$nr} =~ m/^\[[^]]*[H+P]/ ||
                                                      $scanlib::bugs{$nr} =~ m/ \[[^]]*X/));
                }

-               print "</span>" if ($fontset);

                if ($header) {
                        &PrintPackageFooter($p);
                }
                if ($header) {
                        &PrintPackageFooter($p);
                }


@@ -141,7 +132,6 @@ sub MakeBuglist() {
 
 sub MakeStatistics() {
        my $bugcount=0;         # Total number of bugs so far
 
 sub MakeStatistics() {
        my $bugcount=0;         # Total number of bugs so far

-       my $remtotal=0;         # Total number of bugs for packages marked REMOVE

        my $patchtotal=0;       # Total number of bugs marked patch
        my $pendingtotal=0;     # Total number of bugs marked pending
        my $ignoretotal=0;      # Total number of bugs marked ignore
        my $patchtotal=0;       # Total number of bugs marked patch
        my $pendingtotal=0;     # Total number of bugs marked pending
        my $ignoretotal=0;      # Total number of bugs marked ignore


@@ -165,12 +155,10 @@ sub MakeStatistics() {
                                $count++;
                        } 
                }
                                $count++;
                        } 
                }

-               $remtotal+=$count if (defined($scanlib::comments{$p}) && $scanlib::comments{$p} =~ m/^\[REMOVE\]/);

        }
 
        if ($html) {
                print "<strong>Total number of release-critical bugs:</strong> $bugcount<BR>\n";
        }
 
        if ($html) {
                print "<strong>Total number of release-critical bugs:</strong> $bugcount<BR>\n";

-               printf("<strong>Number that will disappear after removing packages marked [REMOVE]:</strong> %d<BR>\n", $remtotal);

                printf("<strong>Number that have a patch:</strong> %d<BR>\n", $patchtotal);
                printf("<strong>Number that have a fix prepared and waiting to upload:</strong> %d<BR>\n", $pendingtotal);
                printf("<strong>Number that are being ignored:</strong> %d<BR>\n", $ignoretotal);
                printf("<strong>Number that have a patch:</strong> %d<BR>\n", $patchtotal);
                printf("<strong>Number that have a fix prepared and waiting to upload:</strong> %d<BR>\n", $pendingtotal);
                printf("<strong>Number that are being ignored:</strong> %d<BR>\n", $ignoretotal);


@@ -178,7 +166,6 @@ sub MakeStatistics() {
                printf("<strong>Number concerning the next release (excluding ignored and not-in-testing):</strong> %d<P>\n", $worrytotal);
        } else {
                print "Total number of release-critical bugs: $bugcount\n";
                printf("<strong>Number concerning the next release (excluding ignored and not-in-testing):</strong> %d<P>\n", $worrytotal);
        } else {
                print "Total number of release-critical bugs: $bugcount\n";

-               printf("Number that will disappear after removing packages marked [REMOVE]: %d\n", $remtotal);

                printf("Number that have a patch: %d\n", $patchtotal);
                printf("Number that have a fix prepared and waiting to upload: %d\n", $pendingtotal);
                printf("Number that are being ignored: %d\n", $ignoretotal);
                printf("Number that have a patch: %d\n", $patchtotal);
                printf("Number that have a fix prepared and waiting to upload: %d\n", $pendingtotal);
                printf("Number that are being ignored: %d\n", $ignoretotal);

diff --git a/comments b/comments
deleted file mode 100644 (file)
index fb82baf..0000000
--- a/comments
+++ /dev/null
@@ -1,16 +0,0 @@
-
-no-such-package
-[REMOVE]
-
-cl-imho
-[REMOVE]
-
-cl-uncommonsql
-[REMOVE]
-
-libapache-mod-webapp
-[REMOVE]
-
-onshore-timesheet
-[REMOVE]
-

diff --git a/dohtml b/dohtml
index e06f9bb609fd473525c3fe29fe8d97bb01beb8f3..d3b3e1bcbad754d0052080c792871c1f277a8e74 100755 (executable)
--- a/dohtml
+++ b/dohtml
@@ -39,17 +39,6 @@ EOF
        ./bugreport -H -s $filter
        
        cat <<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>:
 <p>
 Explanation for <a href="http://www.debian.org/Bugs/Developer#tags">bug
 tags</a>: