[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#293277: here's the attachment



I was a dumbass and forgot the attachment.

-- 
G. Branden Robinson                |
Debian GNU/Linux                   |           //     // //  /     /
branden@debian.org                 |           EI 'AANIIGOO 'AHOOT'E
http://people.debian.org/~branden/ |
diff -urN debbugs-2.4.1/debian/changelog debbugs-2.4.1.1.branden.1/debian/changelog
--- debbugs-2.4.1/debian/changelog	2003-06-06 03:28:51.000000000 -0500
+++ debbugs-2.4.1.1.branden.1/debian/changelog	2005-02-02 01:56:35.000000000 -0500
@@ -1,3 +1,42 @@
+debbugs (2.4.1.1.branden.1) unstable; urgency=low
+
+  * Local version (not an NMU) for testing purposes.
+  * (scripts/service.in): Fix several cosmetic problems:
+    + Clarify message as being due to administrative prohibition when a user
+      is refused access thanks to being in @gFuckheads.  Also report the
+      reply-to address so affected so that such prohibitions can be more
+      easily debugged by the BTS administrators, and accidents more readily
+      detected (shock, horror!).
+    + Clarify that the "close" command is deprecated for most, but not all
+      purposes.
+    + State the address of the person who requested a submitter change
+      literally instead of using the ambiguous and possibly incorrect term
+      "them" (the requestor might be a "he" or "she").
+    + Always report a bug's previous state when changing it; this makes it
+      easier to revert mistaken changes:
+      - If a bug is being reassigned but was not assigned to any package,
+        report that fact.
+      - Indicate old severity when changing to a new severity.
+      - Indicate other bugs a report was merged with when unmerging it.
+      - Indicate the specific other bugs a bug is merged with when refusing to
+        clone it.
+    + Use double-quotes (") instead of grave accents and apostrophes as
+      quotation marks.
+    + Fix a couple of other very minor instances of non-idiomatic punctuation
+      orthography to be consistent with standard usage.
+    + Consistently put periods at the ends of sentences and fragments
+      otherwise treated as sentences.
+    + Fix some awkward back-indentation that appears to have been intended to
+      force lines to fit within 80 columns, a convention which is generally
+      disregarded throughout the file anyway.  (These lines were changed to
+      wrap and use the string-concatenation operator as necessary.)
+  * (debian/control): Rewrite short and extended package description.
+  * (debian/control): Don't recommend a pure virtual package (httpd);
+    instead recommend apache with httpd as an alternative -- quiets Lintian
+    warning.
+
+ -- Branden Robinson <branden@debian.org>  Sat, 29 Jan 2005 20:55:15 -0500
+
 debbugs (2.4.1) unstable; urgency=low
 
   * Colin Watson:
diff -urN debbugs-2.4.1/debian/control debbugs-2.4.1.1.branden.1/debian/control
--- debbugs-2.4.1/debian/control	2003-06-05 21:26:20.000000000 -0500
+++ debbugs-2.4.1.1.branden.1/debian/control	2005-01-29 21:13:45.000000000 -0500
@@ -9,14 +9,17 @@
 Package: debbugs
 Architecture: all
 Depends: perl5 | perl, exim | mail-transport-agent, libmailtools-perl, ed, libmime-perl, libio-stringy-perl
-Recommends: httpd, links | lynx
-Description: The bug tracking system based on the active Debian BTS
+Recommends: apache | httpd, links | lynx
+Description: bug tracking system used by the Debian Project
  Debian has a bug tracking system which files details of bugs reported by
- users and developers. Each bug is given a number, and is kept on file until
- it is marked as having been dealt with. The system is mainly controlled by
- e-mail, but the bug reports can be viewed using the WWW.
+ users and developers.  Each bug is given a number, and is kept on file until
+ it is marked as having been dealt with.  The system is mainly controlled by
+ e-mail, but the bug reports can be viewed via the WWW.
  .
  This version is fully functional, but it does not automatically configure.
  See /usr/share/doc/debbugs/README.Debian after installation.
  .
- Note: there might be various issues with this package, caveat emptor.
+ Note: This package does not necessarily correspond to the exact version of
+ debbugs used by the Debian Bug Tracking System (BTS); this version may
+ therefore have problems that are not evident at the Debian BTS web site --
+ caveat emptor!
diff -urN debbugs-2.4.1/scripts/service.in debbugs-2.4.1.1.branden.1/scripts/service.in
--- debbugs-2.4.1/scripts/service.in	2003-06-05 03:26:59.000000000 -0500
+++ debbugs-2.4.1.1.branden.1/scripts/service.in	2005-01-29 20:54:59.000000000 -0500
@@ -131,7 +131,8 @@
 
 my $fuckheads = "(" . join("|", @gFuckheads) . ")";
 if (@gFuckheads and $replyto =~ m/$fuckheads/) {
-	&transcript("This service is unavailable.\n\n");
+        &transcript("This service is unavailable due to an administrative ".
+                    "prohibition affecting\n\"$replyto\".\n\n");
 	$quickabort = 1;
 }
 
@@ -180,7 +181,7 @@
     } elsif (m/^index(\s+|-)maint\s+(\S+)$/i) {
 	$maint = $2;
 	&sendlynxdoc("pkgreport.cgi?maint=" . urlsanit($maint),
-		     "$gBug list for maintainer \`$maint'");
+		     "$gBug list for maintainer \"$maint\"");
         $ok++;
     } elsif (m/^index(\s+|-)pack(age)?s?\s+(\S.*\S)$/i) {
 	$package = $+;
@@ -242,7 +243,12 @@
 	$ok++;
 	$ref= $1;
 	if (&setbug) {
-	    &transcript("'close' is deprecated; see http://$gWebDomain/Developer$gHTMLSuffix#closing.\n";);
+	    &transcript(<<END);
+The "close" command is deprecated for most purposes; please see
+<URL: http://$gWebDomain/Developer$gHTMLSuffix#closing > for further
+information.
+
+END
 	    if (length($data->{done})) {
 		&transcript("$gBug is already closed, cannot re-close.\n\n");
                 &nochangebug;
@@ -287,10 +293,11 @@
     	$newpackage =~ y/A-Z/a-z/;
         if (&setbug) {
             if (length($data->{package})) {
-                $action= "$gBug reassigned from package \`$data->{package}'".
-                         " to \`$newpackage'.";
+                $action= "$gBug reassigned from package \"$data->{package}\"".
+                         " to \"$newpackage\".";
             } else {
-                $action= "$gBug assigned to package \`$newpackage'.";
+                $action= "$gBug was not assigned to a package.\n".
+                         "$gBug now assigned to package \"$newpackage\".";
             }
             do {
                 &addmaintainers($data->{package});
@@ -357,7 +364,7 @@
 
 This change was made by
 $replyto.
-If it was incorrect, please contact them directly.
+If it was incorrect, please contact $replyto directly.
 
 $gMaintainer
 (administrator, $gProject $gBugs database)
@@ -372,9 +379,11 @@
         $ref= $1; $whereto= $2;
         if (&setbug) {
             if (length($data->{forwarded})) {
-    $action= "Forwarded-to-address changed from $data->{forwarded} to $whereto.";
+                $action= "Forwarded-to-address changed from ".
+                         "$data->{forwarded} to $whereto.";
             } else {
-    $action= "Noted your statement that $gBug has been forwarded to $whereto.";
+                $action= "Noted your statement that $gBug has been forwarded ".
+                         "to $whereto.";
             }
             if (length($data->{done})) {
                 $extramessage= "(By the way, this $gBug is currently marked as done.)\n";
@@ -395,7 +404,8 @@
                 &transcript("$gBug is not marked as having been forwarded.\n\n");
                 &nochangebug;
             } else {
-    $action= "Removed annotation that $gBug had been forwarded to $data->{forwarded}.";
+                $action= "Removed annotation that $gBug has been forwarded to ".
+                         "$data->{forwarded}.";
                 do {
                     &addmaintainers($data->{package});
                     $data->{forwarded}= '';
@@ -408,15 +418,16 @@
         $ref= $1;
         $newseverity= $2;
         if (!grep($_ eq $newseverity, @gSeverityList, "$gDefaultSeverity")) {
-            &transcript("Severity level \`$newseverity' is not known.\n".
+            &transcript("Severity level \"$newseverity\" is not known.\n".
  			"Recognized are: $gShowSeverities.\n\n");
         } elsif (exists $gObsoleteSeverities{$newseverity}) {
-            &transcript("Severity level \`$newseverity' is obsolete. " .
+            &transcript("Severity level \"$newseverity\" is obsolete. " .
                         "$gObsoleteSeverities{$newseverity}\n\n");
         } elsif (&setbug) {
             $printseverity= $data->{severity};
             $printseverity= "$gDefaultSeverity" if $printseverity eq '';
-	    $action= "Severity set to \`$newseverity'.";
+            $action= "Severity was \"$data->{severity}\".\n".
+                     "Severity set to \"$newseverity\".";
 	    do {
                 &addmaintainers($data->{package});
                 $data->{severity}= $newseverity;
@@ -448,7 +459,7 @@
 	    if ($data->{keywords} eq '') {
 		&transcript("There were no tags set.\n");
 	    } else {
-		&transcript("Tags were: $data->{keywords}\n");
+		&transcript("Tags were: $data->{keywords}.\n");
 	    }
 	    if ($addsub eq "set") {
 		$action= "Tags set to: " . join(", ", @okaytags);
@@ -503,7 +514,8 @@
 		&nochangebug;
 	    } else {
                 $mergelowstate eq 'locked' || die "$mergelowstate ?";
-		$action= "Disconnected #$ref from all other report(s).";
+                $action= "$gBug was merged with bug(s) $data->{mergedwith}.\n".
+                         "Disconnected #$ref from all other report(s).";
 		@newmergelist= split(/ /,$data->{mergedwith});
                 $discref= $ref;
                 do {
@@ -537,8 +549,8 @@
 	    &checkmatch('done mark','m_done',length($data->{done}) ? 'done' : 'open');
 	    foreach my $t (split /\s+/, $data->{keywords}) { $tags{$t} = 1; }
 	    if (length($mismatch)) {
-	        &transcript("Mismatch - only $gBugs in same state can be merged:\n".
-                            $mismatch."\n");
+	        &transcript("Mismatch -- only $gBugs in same state can be ".
+                            "merged:\n".$mismatch."\n");
 		&cancelbug; @newmergelist=(); last;
 	    }
             push(@newmergelist,$ref);
@@ -549,7 +561,7 @@
             @newmergelist= sort { $a <=> $b } @newmergelist;
             $action= "Merged @newmergelist.";
 	    for $ref (@newmergelist) {
-		&getbug || die "huh ?  $gBug $ref disappeared during merge";
+		&getbug || die "huh?  $gBug $ref disappeared during merge";
                 &addmaintainers($data->{package});
 		$data->{mergedwith}= join(' ',grep($_ ne $ref,@newmergelist));
 		$data->{keywords}= join(' ', keys %tags);
@@ -568,7 +580,8 @@
 	$ref = $origref;
 	if (&setbug) {
 	    if (length($data->{mergedwith})) {
-		&transcript("$gBug is marked as being merged with others.\n\n");
+                &transcript("$gBug is marked as being merged with bug(s) ".
+                            "$data->{mergedwith}.\n\n");
 		&nochangebug;
 	    } else {
         	&filelock("nextnumber.lock");
@@ -721,15 +734,15 @@
     local ($mvarvalue);
     if (@newmergelist) {
         eval "\$mvarvalue= \$$mvarname";
-        &transcript("D| checkmatch \`$string' /$mvarname/$mvarvalue/$svarvalue/\n")
+        &transcript("D| checkmatch \"$string\" /$mvarname/$mvarvalue/$svarvalue/\n")
             if $dl;
         $mismatch .=
-            "Values for \`$string' don't match:\n".
-            " #$newmergelist[0] has \`$mvarvalue';\n".
-            " #$ref has \`$svarvalue'\n"
+            "Values for \"$string\" don't match:\n".
+            " #$newmergelist[0] has \"$mvarvalue\";\n".
+            " #$ref has \"$svarvalue\"\n"
             if $mvarvalue ne $svarvalue;
     } else {
-        &transcript("D| setupmatch \`$string' /$mvarname/$svarvalue/\n")
+        &transcript("D| setupmatch \"$string\" /$mvarname/$svarvalue/\n")
             if $dl;
         eval "\$$mvarname= \$svarvalue";
     }
@@ -1025,7 +1038,7 @@
     while (<MAINT>) {
 	m/^\n$/ && next;
 	m/^\s*$/ && next;
-        m/^(\S+)\s+(\S.*\S)\s*\n$/ || &quit("maintainers bogus \`$_'");
+        m/^(\S+)\s+(\S.*\S)\s*\n$/ || &quit("maintainers bogus \"$_\"");
         $a= $1; $b= $2; $a =~ y/A-Z/a-z/;
         $maintainerof{$1}= $2;
     }
@@ -1034,7 +1047,8 @@
     while (<MAINT>) {
         m/^\n$/ && next;
         m/^\s*$/ && next;
-        m/^(\S+)\s+(\S.*\S)\s*\n$/ || &quit("maintainers.override bogus \`$_'");
+        m/^(\S+)\s+(\S.*\S)\s*\n$/ || &quit("maintainers.override bogus ".
+                                            "\"$_\"");
         $a= $1; $b= $2; $a =~ y/A-Z/a-z/;
         $maintainerof{$1}= $2;
     }

Attachment: signature.asc
Description: Digital signature


Reply to: