From: Joerg Jaspert <joerg@debian.org>
Date: Sat, 26 Jul 2008 10:10:49 +0000 (+0200)
Subject: Add patch by luk from #438899
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=d64bd82aee05794a61351cee4d450b021638eea0;p=dak.git

Add patch by luk from #438899
---

diff --git a/ChangeLog b/ChangeLog
index 29315e9f..dd27ec63 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2008-07-26  Joerg Jaspert  <joerg@debian.org>
 
+	* templates/reject-proposed-updates.rejected,dak/reject_proposed_updates.py:
+	applied a patch by luk modifying the stable rejection mails to fit
+	reality a bit more
+
 	* config/debian/dak.conf: no m68k in testing, so no m68k in t-p-u
 	r4 now
 
diff --git a/config/debian/dak.conf b/config/debian/dak.conf
index 2eb45d24..7b7f5e8e 100644
--- a/config/debian/dak.conf
+++ b/config/debian/dak.conf
@@ -173,8 +173,9 @@ Import-Archive
 
 Reject-Proposed-Updates
 {
-   StableRejector "Andreas Barth and Martin Zobel-Helas";
-   MoreInfoURL "http://release.debian.org/stable/4.0/4.0r4/";
+   StableRejector "the Stable Release Team";
+   StableMail "debian-release@lists.debian.org";
+   MoreInfoURL "http://release.debian.org/stable/4.0/4.0r5/";
 };
 
 Import-LDAP-Fingerprints
diff --git a/dak/reject_proposed_updates.py b/dak/reject_proposed_updates.py
old mode 100644
new mode 100755
index ba6dc226..a61db174
--- a/dak/reject_proposed_updates.py
+++ b/dak/reject_proposed_updates.py
@@ -168,6 +168,7 @@ def reject (reject_message = ""):
     Upload.Subst["__REJECTOR_ADDRESS__"] = user_email_address
     Upload.Subst["__MANUAL_REJECT_MESSAGE__"] = reject_message
     Upload.Subst["__STABLE_REJECTOR__"] = Cnf["Reject-Proposed-Updates::StableRejector"]
+    Upload.Subst["__STABLE_MAIL__"] = Cnf["Reject-Proposed-Updates::StableMail"]
     Upload.Subst["__MORE_INFO_URL__"] = Cnf["Reject-Proposed-Updates::MoreInfoURL"]
     Upload.Subst["__CC__"] = "Cc: " + Cnf["Dinstall::MyEmailAddress"]
     reject_mail_message = utils.TemplateSubst(Upload.Subst,Cnf["Dir::Templates"]+"/reject-proposed-updates.rejected")
diff --git a/templates/reject-proposed-updates.rejected b/templates/reject-proposed-updates.rejected
index 9fc567f1..8b86cb5b 100644
--- a/templates/reject-proposed-updates.rejected
+++ b/templates/reject-proposed-updates.rejected
@@ -2,6 +2,7 @@ From: __DAK_ADDRESS__
 To: __MAINTAINER_TO__
 __CC__
 __BCC__
+Reply-To: __STABLE_MAIL__
 X-Debian: DAK
 X-Debian-Package: __SOURCE__
 Precedence: bulk
@@ -12,8 +13,8 @@ Subject: __CHANGES_FILENAME__ REJECTED from proposed-updates
 
 Your package was rejected by an ftp master on behalf of
 __STABLE_REJECTOR__, if you have any questions or
-comments regarding this rejection, please address them to him as we
-can't help you.
+comments regarding this rejection, please address them to 
+__STABLE_REJECTOR__ by replying to this mail.
 
 The reason given for rejection was: