Also set X-Debian-Package: header

diff --git a/ChangeLog b/ChangeLog
index 6f476a7f60ea75517e59862bed92b767cc8c3182..2aaa4a21b258f1d201ca591d01434467c669000e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,34 +1,40 @@
-2008-05-08  Joerg Jaspert  <joerg@debian.org>
+2008-05-09  Joerg Jaspert  <joerg@debian.org>
 
-       * templates/rm.bug-close: dito
+       * dak/override.py (main): substitute value in X-Debian-Package
+       header
 
+       * templates/override.bug-close: Add X-Debian-Package header
        * 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/process-unchecked.override-disparity: dito
+
+2008-05-08  Joerg Jaspert  <joerg@debian.org>
 
        * templates/override.bug-close: Add X-Debian header
+       * templates/rm.bug-close: dito
+       * templates/reject-proposed-updates.rejected: dito
+       * templates/queue.rejected: dito
+       * 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/process-unchecked.override-disparity: dito, but also
+       mention that people should include the package lists with the
+       override disparities.
 
 2008-05-06  Joerg Jaspert  <joerg@debian.org>
 

diff --git a/dak/override.py b/dak/override.py
index 108d01999babceae0844fd65f92c5cd30b2ab619..ca3cb41d6a77d2245c25afd56454a51d59805ebb 100755 (executable)
--- a/dak/override.py
+++ b/dak/override.py
@@ -251,6 +251,7 @@ def main ():
         Subst["__ADMIN_ADDRESS__"] = Cnf["Dinstall::MyAdminAddress"]
         Subst["__DISTRO__"] = Cnf["Dinstall::MyDistribution"]
         Subst["__WHOAMI__"] = utils.whoami()
+        Subst["__SOURCE__"] = package
 
         summary = "Concerning package %s...\n" % (package)
         summary += "Operating on the %s suite\n" % (suite)

diff --git a/templates/override.bug-close b/templates/override.bug-close
index 6efff8b076e01417232d57d0217c93e6914132ad..5865651e2f5ee1d6eeb75ee55f88b9327939d764 100644 (file)
--- a/templates/override.bug-close
+++ b/templates/override.bug-close
@@ -3,6 +3,7 @@ To: __BUG_NUMBER__-close@__BUG_SERVER__
 __CC__ 
 __BCC__
 X-Debian: DAK
+X-Debian-Package: __SOURCE__
 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 533b84d366de443ace1a60eed62d706b87d2cee5..454fe81adfa30b1795870b3e1b6549279f926298 100644 (file)
--- a/templates/process-accepted.install
+++ b/templates/process-accepted.install
@@ -2,6 +2,7 @@ From: __DAK_ADDRESS__
 To: __MAINTAINER_TO__
 __BCC__
 X-Debian: DAK
+X-Debian-Package: __SOURCE__
 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 c07d4869f0ad8eb84ecf29a9b87375e2756e106f..abb98dbf334b57d64c79da27fbc7def66b7ad8b4 100644 (file)
--- a/templates/process-accepted.unaccept
+++ b/templates/process-accepted.unaccept
@@ -3,6 +3,7 @@ To: __MAINTAINER_TO__
 __CC__
 __BCC__
 X-Debian: DAK
+X-Debian-Package: __SOURCE__
 MIME-Version: 1.0
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit

diff --git a/templates/process-new.prod b/templates/process-new.prod
index 23d67a4dd99bf5b5fe69919a4fe4926a89552fa7..4d24dc056f0e207378d4365fdc981403b4d0ff9e 100644 (file)
--- a/templates/process-new.prod
+++ b/templates/process-new.prod
@@ -2,6 +2,7 @@ From: __FROM_ADDRESS__
 To: __MAINTAINER_TO__
 __CC__
 X-Debian: DAK
+X-Debian-Package: __SOURCE__
 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 d5f5160079ac868711842f8ee3e0b29e0ef8ddbb..e7268254c0dd83140d75fd2d3cbf88de979ca95f 100644 (file)
--- a/templates/process-unchecked.accepted
+++ b/templates/process-unchecked.accepted
@@ -2,6 +2,7 @@ From: __DAK_ADDRESS__
 To: __MAINTAINER_TO__
 __BCC__
 X-Debian: DAK
+X-Debian-Package: __SOURCE__
 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 91b4f1e9e73099d407c0edcdff4e677fcfea9d3e..7297c91c87d7a5a641f74db7d38c697c04156ac4 100644 (file)
--- a/templates/process-unchecked.announce
+++ b/templates/process-unchecked.announce
@@ -2,6 +2,7 @@ From: __MAINTAINER_FROM__
 To: __ANNOUNCE_LIST_ADDRESS__
 __BCC__
 X-Debian: DAK
+X-Debian-Package: __SOURCE__
 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 2d0dd40752dd037e68e081f2740ed122bd4e4c57..8ab731728a054cf5f389531a5a4b8cbd9c793a92 100644 (file)
--- a/templates/process-unchecked.bug-close
+++ b/templates/process-unchecked.bug-close
@@ -2,6 +2,7 @@ From: __MAINTAINER_FROM__
 To: __BUG_NUMBER__-close@__BUG_SERVER__
 __BCC__
 X-Debian: DAK
+X-Debian-Package: __SOURCE__
 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 6596322a434630b86db5306df24a971862c27052..34c5ca5973a9d3de4d9057734fe59bac4fc0a14f 100644 (file)
--- a/templates/process-unchecked.bug-experimental-fixed
+++ b/templates/process-unchecked.bug-experimental-fixed
@@ -3,6 +3,7 @@ To: control@__BUG_SERVER__
 Cc: __MAINTAINER_TO__
 __BCC__
 X-Debian: DAK
+X-Debian-Package: __SOURCE__
 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 d13d72b53ad09258306d2d99edfe7639f10b3da2..45f6c733ee9dc534bf7982d1fe89250c8ad9b96e 100644 (file)
--- a/templates/process-unchecked.bug-nmu-fixed
+++ b/templates/process-unchecked.bug-nmu-fixed
@@ -3,6 +3,7 @@ To: control@__BUG_SERVER__
 Cc: __MAINTAINER_TO__
 __BCC__
 X-Debian: DAK
+X-Debian-Package: __SOURCE__
 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 5b02e67ebcd14da15f0116d719e5a80a733fc14c..6c3162fa2bb7287076fdd600428da3107df44fc3 100644 (file)
--- a/templates/process-unchecked.new
+++ b/templates/process-unchecked.new
@@ -2,6 +2,7 @@ From: __DAK_ADDRESS__
 To: __MAINTAINER_TO__
 __BCC__
 X-Debian: DAK
+X-Debian-Package: __SOURCE__
 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 aee1bb8d2cfac0fe7977937448b6fde6337c8c1c..bafbd4fdaba96bf351cf435ddf45bac6e62d5268 100644 (file)
--- a/templates/process-unchecked.override-disparity
+++ b/templates/process-unchecked.override-disparity
@@ -2,6 +2,7 @@ From: __DAK_ADDRESS__
 To: __MAINTAINER_TO__
 __BCC__
 X-Debian: DAK
+X-Debian-Package: __SOURCE__
 Precedence: junk
 MIME-Version: 1.0
 Content-Type: text/plain; charset="utf-8"

diff --git a/templates/queue.rejected b/templates/queue.rejected
index 140401adf461efca1b29b8a66252a4bcc99259d4..7b027868160ae273ddbc364e328350e42ae0c2ef 100644 (file)
--- a/templates/queue.rejected
+++ b/templates/queue.rejected
@@ -3,6 +3,7 @@ To: __MAINTAINER_TO__
 __BCC__
 __CC__
 X-Debian: DAK
+X-Debian-Package: __SOURCE__
 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 cac2f45050f3f8ad73b83029d3671223d15e050e..9fc567f1852a4d5c865b4203f9b9ff6dd69ad048 100644 (file)
--- a/templates/reject-proposed-updates.rejected
+++ b/templates/reject-proposed-updates.rejected
@@ -3,6 +3,7 @@ To: __MAINTAINER_TO__
 __CC__
 __BCC__
 X-Debian: DAK
+X-Debian-Package: __SOURCE__
 Precedence: bulk
 MIME-Version: 1.0
 Content-Type: text/plain; charset="utf-8"

diff --git a/templates/security-install.advisory b/templates/security-install.advisory
index baebe9166661b1c2de77c043cece2f7b62e3f504..2ee2e82bb5a555d7c40403b2f410d0ecb79dbcdd 100644 (file)
--- a/templates/security-install.advisory
+++ b/templates/security-install.advisory
@@ -1,6 +1,7 @@
 From: __DAK_ADDRESS__
 To: __WHOAMI__ <dak@security.debian.org>
 __BCC__
+X-Debian-Package: __SOURCE__
 Subject: Template Advisory __ADVISORY__
 
 ------------------------------------------------------------------------