[project @ 1999-11-22 01:35:09 by gecko]

Patches 001, 002, 004 from Netgod -- sorta

diff --git a/README b/README
index 526f8d3637b337eb3bc9b8b52fa46384cb2d2853..7289bf4df30f13b1425e31acef7468c98a282548 100644 (file)
--- a/README
+++ b/README
@@ -9,10 +9,9 @@ employee of nCipher.
 =============================================================================
 SYSTEM REQUIREMENTS
 =============================================================================
- - GNU m4
  - GNU date
  - GNU gzip
- - Perl 5 (5.004 is known to work)
+ - Perl 5 (5.005 is known to work)
  - Mailtools perl module to manipulate email
  - Lynx 2.7 or later
  - The bug system requires its own mail domain.  It comes with code
@@ -40,12 +39,17 @@ you wish to change some of the text as it gets displayed.
 
 5. Set up the mail arrangements to deliver mail to the right place, and to
 set up a blackhole mail alias if you need one.  Ensure that owner@bugs, if
-that's what you're using, is handled by the MTA.
+that's what you're using, is handled by the MTA.  All other email should be
+piped into the receive script.
 
-6. Test things a bit, by sending mail messages to the bug system and
+6. Set up http to point people looking for bug reports to
+/var/lib/debbugs/www and set /var/lib/debbugs/www/cgi as a valid cgi
+directory.
+
+7. Test things a bit, by sending mail messages to the bug system and
 running .../scripts/processall and/or .../scripts/update-html.
 
-7. If all seems well then install the crontab in `misc/crontab.out'.
+8. If all seems well then install the crontab in `misc/crontab.out'.
 
 =============================================================================
 FURTHER INFORMATION
@@ -132,4 +136,4 @@ with this program, or one should be available above; if not, write to the
 Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 02111-1307, USA.
 
- - gecko 14 Oct, 1999
+ - Darren Benham 14 Oct, 1999

diff --git a/debian/changelog b/debian/changelog
index c304dcade86f95e7981a25d037e713d623931547..bfdfc7a4615cf9954ba0f9d5b482cabf706d6cfb 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,9 @@
 debbugs (2.3-2) unstable; urgency=low
 
   * Tweeks to the [pkg|bug]report.cgi scripts
+  * Merged README and README.Debian
+  * Sundry of patchs from netgod.. see list archives for details :)
+    (#36147, #39540
 
  -- Darren Benham <gecko@debian.org>  Tue, 24 Oct 1999 23:16:14 -0700
 

diff --git a/debian/copyright b/debian/copyright
index 304edeeb1d22709c1bbd0fd48c2c2b3f743c83ad..7d1fa62ac7f25d43babf5f07d60dfae83432f324 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -27,5 +27,5 @@ with this program, or one should be available above; if not, write to the
 Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 02111-1307, USA.
 
-On Debian/GNU Linux systems, the text of the GPL can be found in
-/usr/doc/copyright/GPL.
+On Debian GNU/Linux systems, the text of the GPL can be found in
+/usr/share/common-licenses/GPL.

diff --git a/debian/debbugsconfig b/debian/debbugsconfig
index f65ee1044387f61f6708066b6293e15206e9ee3b..4165878c1736a3881f0d871507cb91808ee53072 100755 (executable)
--- a/debian/debbugsconfig
+++ b/debian/debbugsconfig
@@ -3,21 +3,21 @@
 @file_flag = stat( '/etc/debbugs/config');
 if ( !@file_flag ) 
 {
-       system( '/bin/cp', '/usr/doc/debbugs/examples/config', '/etc/debbugs/config' );
+       system( '/bin/cp', '/usr/share/doc/debbugs/examples/config', '/etc/debbugs/config' );
        print( "copying config file" );
 } else { print( "skipping config file" ); }
 
 @file_flag = stat( '/etc/debbugs/text');
 if ( !@file_flag ) 
 {
-       system( '/bin/cp', '/usr/doc/debbugs/examples/text', '/etc/debbugs/text' );
+       system( '/bin/cp', '/usr/share/doc/debbugs/examples/text', '/etc/debbugs/text' );
        print( "copying text file" );
 } else { print( "skipping text file" ); }
 
 @file_flag = stat( '/var/lib/debbugs/spool/nextnumber');
 if ( !@file_flag ) 
 {
-       system( '/bin/cp', '/usr/doc/debbugs/examples/nextnumber', '/var/lib/debbugs/spool/nextnumber' );
+       system( '/bin/cp', '/usr/share/doc/debbugs/examples/nextnumber', '/var/lib/debbugs/spool/nextnumber' );
        print( "copying next file" );
 } else { print( "skipping next file" ); }
 

diff --git a/html/Reporting.html.in b/html/Reporting.html.in
index b4f76f224b85839cc5a49583dc7a47abd635b747..5e394e35c060eb4cbabb7b8ee1980472cafa7e64 100644 (file)
--- a/html/Reporting.html.in
+++ b/html/Reporting.html.in
@@ -42,8 +42,7 @@ A $gBug report, with mail header, looks something like this:
   To: submit\@$gEmailDomain
   From: diligent\@testing.linux.org
   Subject: Hello says `goodbye'
-<A name="psuedoheader">
-  Package: hello</A>
+<A name="psuedoheader">Package: hello</A>
   Version: 1.3-2
 
   When I invoke `hello' without arguments from an ordinary shell

diff --git a/scripts/config.in b/scripts/config.in
index 852e90840fa373f02bb1c68011b5880fb0238552..ef4eaaa34ee7b693f716b21abff1a9830c3a95a3 100644 (file)
--- a/scripts/config.in
+++ b/scripts/config.in
@@ -1,4 +1,4 @@
-# $Id: config.in,v 1.4 1999/09/14 22:33:48 gecko Exp $
+# $Id: config.in,v 1.5 1999/11/22 01:35:10 gecko Exp $
 #domains
 $gEmailDomain = "bugs.benham";         #bugs.debian.org
 $gListDomain = "lists.benham";         #lists.debian.org
@@ -52,7 +52,7 @@ $gDefaultSeverity = 'normal';
 %gSeverityDisplay=('critical',"Critical $gBugs",
                                        'grave',"Grave $gBugs",
                                        'normal',"Normal $gBugs",
-                                      'fixed',"NMU Fixed $gBugs",
+                                                                      'fixed',"Fixed $gBugs",
                                        'wishlist','Wishlist items');
 
 $gTextInstructions = "Instructions are available from ftp.debian.org 

diff --git a/scripts/text.in b/scripts/text.in
index 5e1d5aee20ec21b7d3a08ae1dfa48bf8bd35d28d..12edecf0c249219bd9877ab21b56e96491ffa152 100644 (file)
--- a/scripts/text.in
+++ b/scripts/text.in
@@ -1,4 +1,4 @@
-# $Id: text.in,v 1.6 1999/09/16 19:42:50 gecko Exp $
+# $Id: text.in,v 1.7 1999/11/22 01:35:10 gecko Exp $
 
 ############################################################################
 #  Here is a blurb to point people to ftp archive of directions.  It is
@@ -115,11 +115,11 @@ $gHTMLSeverityDesc = "<DT><CODE>critical</CODE>
 
        <DT><CODE>wishlist</CODE>
        <DD>for any feature request, and also for any $gBugs that are very 
-       difficult to fix due to major design considerations.";
+       difficult to fix due to major design considerations.
 
        <DT><CODE>fixed</CODE>
        <DD>fixed in the current version in the unstable archive but the fix has
-       not been fixed by the person responsible.
+       not been fixed by the person responsible.";
 
 ############################################################################
 # shows up at the end of (most) html pages.  You shouldn't have
@@ -203,7 +203,7 @@ $gJunkIndex = "<HTML><HEAD><TITLE>$gProject $gBug reports - Junk</TITLE>
        $gBug report.
        <P>
        For other kinds of indices or for other information about $gProject and
-       the $gBug system, see <A HREF=\"../../\"> $gBug system top-level contents WWW
+       the $gBug system, see <A HREF=\"../../\">$gBug system top-level contents WWW
        page</A>.