Add X-Debian: DAK headers to mails

diff --git a/ChangeLog b/ChangeLog
index b6a48bc3c8dfa7013d37c3ba732a16b3dfb3e4d1..6f476a7f60ea75517e59862bed92b767cc8c3182 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,35 @@
+2008-05-08  Joerg Jaspert  <joerg@debian.org>
+
+       * templates/rm.bug-close: dito
+
+       * templates/reject-proposed-updates.rejected: dito
+
+       * templates/queue.rejected: dito
+
+       * templates/process-unchecked.override-disparity: dito, but also
+       mention that people should include the package lists with the
+       override disparities.
+
+       * templates/process-unchecked.new: dito
+
+       * templates/process-unchecked.bug-nmu-fixed: dito
+
+       * templates/process-unchecked.bug-experimental-fixed: dito
+
+       * templates/process-unchecked.bug-close: dito
+
+       * templates/process-unchecked.announce: dito
+
+       * templates/process-unchecked.accepted: dito
+
+       * templates/process-new.prod: dito
+
+       * templates/process-accepted.unaccept: dito
+
+       * templates/process-accepted.install: dito
+
+       * templates/override.bug-close: Add X-Debian header
+
 2008-05-06  Joerg Jaspert  <joerg@debian.org>
 
        * config/debian/cron.dinstall: Put the timestamp stuff into an own

diff --git a/dak/override.py b/dak/override.py
index 89bac5b90f8a665afcf058e6220dc37a3a23904b..108d01999babceae0844fd65f92c5cd30b2ab619 100755 (executable)
--- a/dak/override.py
+++ b/dak/override.py
@@ -247,7 +247,7 @@ def main ():
             Subst["__BCC__"] = "Bcc: " + ", ".join(bcc)
         else:
             Subst["__BCC__"] = "X-Filler: 42"
-        Subst["__CC__"] = "X-DAK: dak override\nX-Katie: alicia $Revision: 1.6$"
+        Subst["__CC__"] = "X-DAK: dak override\nX-Katie: alicia"
         Subst["__ADMIN_ADDRESS__"] = Cnf["Dinstall::MyAdminAddress"]
         Subst["__DISTRO__"] = Cnf["Dinstall::MyDistribution"]
         Subst["__WHOAMI__"] = utils.whoami()

diff --git a/dak/rm.py b/dak/rm.py
index 7bc6cceb42fc0c72aee4191a87df649061cd6795..7535562a46cda282e84bc0da90b0699ae15c4246 100755 (executable)
--- a/dak/rm.py
+++ b/dak/rm.py
@@ -511,7 +511,7 @@ def main ():
             Subst["__BCC__"] = "Bcc: " + ", ".join(bcc)
         else:
             Subst["__BCC__"] = "X-Filler: 42"
-        Subst["__CC__"] = "X-DAK: dak rm\nX-Katie: melanie $Revision: 1.44 $"
+        Subst["__CC__"] = "X-DAK: dak rm\nX-Katie: melanie"
         if carbon_copy:
             Subst["__CC__"] += "\nCc: " + ", ".join(carbon_copy)
         Subst["__SUITE_LIST__"] = suites_list

diff --git a/templates/override.bug-close b/templates/override.bug-close
index 95599f4313c2cff6cc51453d14356718c1f12326..6efff8b076e01417232d57d0217c93e6914132ad 100644 (file)
--- a/templates/override.bug-close
+++ b/templates/override.bug-close
@@ -2,6 +2,7 @@ From: __OVERRIDE_ADDRESS__
 To: __BUG_NUMBER__-close@__BUG_SERVER__
 __CC__ 
 __BCC__
+X-Debian: DAK
 MIME-Version: 1.0
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit

diff --git a/templates/process-accepted.install b/templates/process-accepted.install
index bf0c20e57397c7f5eff2d6c7deb05e7f1d1f83e2..533b84d366de443ace1a60eed62d706b87d2cee5 100644 (file)
--- a/templates/process-accepted.install
+++ b/templates/process-accepted.install
@@ -1,6 +1,7 @@
 From: __DAK_ADDRESS__
 To: __MAINTAINER_TO__
 __BCC__
+X-Debian: DAK
 Precedence: bulk
 MIME-Version: 1.0
 Content-Type: text/plain; charset="utf-8"

diff --git a/templates/process-accepted.unaccept b/templates/process-accepted.unaccept
index 0d77be1f4b62abaa3f50552149a48baec5715b14..c07d4869f0ad8eb84ecf29a9b87375e2756e106f 100644 (file)
--- a/templates/process-accepted.unaccept
+++ b/templates/process-accepted.unaccept
@@ -2,6 +2,7 @@ From: __REJECTOR_ADDRESS__
 To: __MAINTAINER_TO__
 __CC__
 __BCC__
+X-Debian: DAK
 MIME-Version: 1.0
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit

diff --git a/templates/process-new.bxa_notification b/templates/process-new.bxa_notification
index 438e843e7a3c412c0eabcf35f80c901547289982..8fafaa9cb04d0aa52d30ebacd9fb957e91ec7c71 100644 (file)
--- a/templates/process-new.bxa_notification
+++ b/templates/process-new.bxa_notification
@@ -2,6 +2,7 @@ From: Ben Collins <bxa@ftp-master.debian.org>
 X-Not-Really-To: crypt@bis.doc.gov, enc@nsa.gov, web_site@bis.doc.gov
 To: bxa@ftp-master.debian.org
 __BCC__
+X-Debian: DAK
 Precedence: junk
 MIME-Version: 1.0
 Content-Type: text/plain; charset="utf-8"

diff --git a/templates/process-new.prod b/templates/process-new.prod
index 78276b7c6f2e3969bb888f72ab1b669c4fb92345..23d67a4dd99bf5b5fe69919a4fe4926a89552fa7 100644 (file)
--- a/templates/process-new.prod
+++ b/templates/process-new.prod
@@ -1,6 +1,7 @@
 From: __FROM_ADDRESS__
 To: __MAINTAINER_TO__
 __CC__
+X-Debian: DAK
 MIME-Version: 1.0
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit

diff --git a/templates/process-unchecked.accepted b/templates/process-unchecked.accepted
index c8b62d24243baaade3c6085c0e75433aef3111cd..d5f5160079ac868711842f8ee3e0b29e0ef8ddbb 100644 (file)
--- a/templates/process-unchecked.accepted
+++ b/templates/process-unchecked.accepted
@@ -1,6 +1,7 @@
 From: __DAK_ADDRESS__
 To: __MAINTAINER_TO__
 __BCC__
+X-Debian: DAK
 Precedence: bulk
 MIME-Version: 1.0
 Content-Type: text/plain; charset="utf-8"

diff --git a/templates/process-unchecked.announce b/templates/process-unchecked.announce
index 421495b9fb1458160c90721217d2f893c2c332be..91b4f1e9e73099d407c0edcdff4e677fcfea9d3e 100644 (file)
--- a/templates/process-unchecked.announce
+++ b/templates/process-unchecked.announce
@@ -1,6 +1,7 @@
 From: __MAINTAINER_FROM__
 To: __ANNOUNCE_LIST_ADDRESS__
 __BCC__
+X-Debian: DAK
 MIME-Version: 1.0
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit

diff --git a/templates/process-unchecked.bug-close b/templates/process-unchecked.bug-close
index 0bb9ed0e21c0e00e0b8fa8c57b72ef4d055ba65c..2d0dd40752dd037e68e081f2740ed122bd4e4c57 100644 (file)
--- a/templates/process-unchecked.bug-close
+++ b/templates/process-unchecked.bug-close
@@ -1,6 +1,7 @@
 From: __MAINTAINER_FROM__
 To: __BUG_NUMBER__-close@__BUG_SERVER__
 __BCC__
+X-Debian: DAK
 MIME-Version: 1.0
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit

diff --git a/templates/process-unchecked.bug-experimental-fixed b/templates/process-unchecked.bug-experimental-fixed
index af52958d89218da6da46027313711f23a2cedfe7..6596322a434630b86db5306df24a971862c27052 100644 (file)
--- a/templates/process-unchecked.bug-experimental-fixed
+++ b/templates/process-unchecked.bug-experimental-fixed
@@ -2,6 +2,7 @@ From: __MAINTAINER_FROM__
 To: control@__BUG_SERVER__
 Cc: __MAINTAINER_TO__
 __BCC__
+X-Debian: DAK
 MIME-Version: 1.0
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit

diff --git a/templates/process-unchecked.bug-nmu-fixed b/templates/process-unchecked.bug-nmu-fixed
index 8ff215e4f0e3aefca5d5dc2e4f70efb0effee469..d13d72b53ad09258306d2d99edfe7639f10b3da2 100644 (file)
--- a/templates/process-unchecked.bug-nmu-fixed
+++ b/templates/process-unchecked.bug-nmu-fixed
@@ -2,6 +2,7 @@ From: __MAINTAINER_FROM__
 To: control@__BUG_SERVER__
 Cc: __MAINTAINER_TO__
 __BCC__
+X-Debian: DAK
 MIME-Version: 1.0
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit

diff --git a/templates/process-unchecked.new b/templates/process-unchecked.new
index d5cd67756b76811f7d603d08f3e5e1bf16b11532..5b02e67ebcd14da15f0116d719e5a80a733fc14c 100644 (file)
--- a/templates/process-unchecked.new
+++ b/templates/process-unchecked.new
@@ -1,6 +1,7 @@
 From: __DAK_ADDRESS__
 To: __MAINTAINER_TO__
 __BCC__
+X-Debian: DAK
 Precedence: bulk
 MIME-Version: 1.0
 Content-Type: text/plain; charset="utf-8"

diff --git a/templates/process-unchecked.override-disparity b/templates/process-unchecked.override-disparity
index 5259080377bb7e42cf172cde633d06328dd37ef4..aee1bb8d2cfac0fe7977937448b6fde6337c8c1c 100644 (file)
--- a/templates/process-unchecked.override-disparity
+++ b/templates/process-unchecked.override-disparity
@@ -1,6 +1,7 @@
 From: __DAK_ADDRESS__
 To: __MAINTAINER_TO__
 __BCC__
+X-Debian: DAK
 Precedence: junk
 MIME-Version: 1.0
 Content-Type: text/plain; charset="utf-8"
@@ -15,6 +16,8 @@ Either the package or the override file is incorrect.  If you think
 the override is correct and the package wrong please fix the package
 so that this disparity is fixed in the next upload.  If you feel the
 override is incorrect then please reply to this mail and explain why.
+Please INCLUDE the list of packages as seen above, or we won't be able
+to deal with your mail due to missing information.
 
 [NB: this is an automatically generated mail; if you replied to one
 like it before and have not received a response yet, please ignore

diff --git a/templates/queue.rejected b/templates/queue.rejected
index 35a6ede3ed9775f4d2461742a2811cece7e4a514..140401adf461efca1b29b8a66252a4bcc99259d4 100644 (file)
--- a/templates/queue.rejected
+++ b/templates/queue.rejected
@@ -2,6 +2,7 @@ From: __REJECTOR_ADDRESS__
 To: __MAINTAINER_TO__
 __BCC__
 __CC__
+X-Debian: DAK
 Precedence: bulk
 MIME-Version: 1.0
 Content-Type: text/plain; charset="utf-8"

diff --git a/templates/reject-proposed-updates.rejected b/templates/reject-proposed-updates.rejected
index fb32f03c4f397c4c10cd6f900fa12d72d6bb18f1..cac2f45050f3f8ad73b83029d3671223d15e050e 100644 (file)
--- a/templates/reject-proposed-updates.rejected
+++ b/templates/reject-proposed-updates.rejected
@@ -2,6 +2,7 @@ From: __DAK_ADDRESS__
 To: __MAINTAINER_TO__
 __CC__
 __BCC__
+X-Debian: DAK
 Precedence: bulk
 MIME-Version: 1.0
 Content-Type: text/plain; charset="utf-8"

diff --git a/templates/rm.bug-close b/templates/rm.bug-close
index 6b29c0c29a571689f7768cac71383c0ab695744c..353d3ccb31104c426817c4f58d11dae640f3c850 100644 (file)
--- a/templates/rm.bug-close
+++ b/templates/rm.bug-close
@@ -2,6 +2,7 @@ From: __RM_ADDRESS__
 To: __BUG_NUMBER__-close@__BUG_SERVER__
 __CC__ 
 __BCC__
+X-Debian: DAK
 MIME-Version: 1.0
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit

diff --git a/tools/debianqueued-0.9/ChangeLog b/tools/debianqueued-0.9/ChangeLog
index 8bd3cf9955514aef47984509404833876671925b..d979a501133cca422b37c2552a336f7f284c4461 100644 (file)
--- a/tools/debianqueued-0.9/ChangeLog
+++ b/tools/debianqueued-0.9/ChangeLog
@@ -1,3 +1,6 @@
+2008-05-08  Joerg Jaspert  <joerg@debian.org>
+
+       * debianqueued: added header X-Debian: DAK
 
 -- Version 0.9 released
 

diff --git a/tools/debianqueued-0.9/debianqueued b/tools/debianqueued-0.9/debianqueued
index d6f2afdc7970c7ef13d662ecff2ec92e9bcc0ef8..72b718a9440460e748e5519cfaf180f6c8ec888e 100755 (executable)
--- a/tools/debianqueued-0.9/debianqueued
+++ b/tools/debianqueued-0.9/debianqueued
@@ -2077,7 +2077,7 @@ sub init_mail(;$) {
        my $file = shift;
 
        $main::mail_addr = "";
-       $main::mail_text = "";
+       $main::mail_text = "X-Debian: DAK\n";
        $main::mail_subject = $file ? "Processing of $file" : "";
 }