From: don <>
Date: Sun, 17 Jul 2005 04:13:17 +0000 (-0800)
Subject: [project @ 2005-07-16 21:13:16 by don]
X-Git-Tag: release/2.6.0~720
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=33174d08602adaea7f103221b82d180c8424971c;p=debbugs.git

[project @ 2005-07-16 21:13:16 by don]
* Add Makefile rule to actually install apache.conf in examples
 * Don't remove the maintainer address if the message was sent by the
   maintainer and we're submitting to maintonly (closes: #140061)
 * Update changelog for the changes that I've made.
---

diff --git a/Makefile b/Makefile
index bdbe4c80..3eccbd7c 100644
--- a/Makefile
+++ b/Makefile
@@ -45,6 +45,7 @@ $(var_dir)/spool/db-h $(scripts_dir) $(perl_dir) $(examples_dir) $(man8_dir); \
 	$(install_data) debian/crontab misc/nextnumber misc/Maintainers \
 	  misc/Maintainers.override misc/pseudo-packages.description \
 	  misc/sources $(examples_dir)
+	$(install_data) examples/apache.conf $(examples_dir)
 
 	# install the HTML pages etc
 	$(foreach html, $(htmls_in), $(install_data) $(html) $(etc_dir)/html;)
diff --git a/debian/changelog b/debian/changelog
index 02ddaed4..123b29c5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -40,6 +40,19 @@ debbugs (2.4.2) UNRELEASED; urgency=low
       however.
     - Add options show_list_(head|foot)er.
 
+  * Don Armstrong:
+
+    - Don't remove the maintainer address if the message was sent by the
+      maintainer and we're submitting to maintonly (closes: #140061)
+    - Use uri_escape to escape URI's before sending them back out so the
+      name of the file doesn't munge the query string. [#301606 pt. 1]
+    - call decode_rfc1522 on the filename returned so that encoded
+      filenames get decoded to something "reasonable." (closes: #301606)
+    - We now require URI::Escape
+    - Added apache.conf to examples, which is a sample apache
+      configuration file which implements the rewrite rules that are
+      currently used on bugs.debian.org. (closes: #222264)
+  
  -- Colin Watson <cjwatson@debian.org>  Fri, 20 Jun 2003 18:57:25 +0100
 
 debbugs (2.4.1) unstable; urgency=low
diff --git a/scripts/process.in b/scripts/process.in
index e014ef7b..b6415562 100755
--- a/scripts/process.in
+++ b/scripts/process.in
@@ -1,5 +1,5 @@
 #!/usr/bin/perl
-# $Id: process.in,v 1.91 2005/04/20 04:40:18 cjwatson Exp $
+# $Id: process.in,v 1.92 2005/07/16 21:13:16 don Exp $
 #
 # Usage: process nn
 # Temps:  incoming/Pnn
@@ -1114,7 +1114,8 @@ sub checkmaintainers {
 	    print DEBUG "maintainer add >$p|$maintainerof{$p}<\n";
             $addmaint= $maintainerof{$p};
             push(@maintaddrs,$addmaint) unless
-                $addmaint eq $replyto || grep($_ eq $addmaint, @maintaddrs);
+                ($addmaint eq $replyto and $codeletter ne 'M') || 
+		     grep($_ eq $addmaint, @maintaddrs);
             $anymaintfound++;
         } else {
 	    print DEBUG "maintainer none >$p<\n";