[dak/security] Also set X-Debian-Package: header
---
ChangeLog | 38 +++++++++++--------
dak/override.py | 1 +
templates/override.bug-close | 1 +
templates/process-accepted.install | 1 +
templates/process-accepted.unaccept | 1 +
templates/process-new.prod | 1 +
templates/process-unchecked.accepted | 1 +
templates/process-unchecked.announce | 1 +
templates/process-unchecked.bug-close | 1 +
templates/process-unchecked.bug-experimental-fixed | 1 +
templates/process-unchecked.bug-nmu-fixed | 1 +
templates/process-unchecked.new | 1 +
templates/process-unchecked.override-disparity | 1 +
templates/queue.rejected | 1 +
templates/reject-proposed-updates.rejected | 1 +
templates/security-install.advisory | 1 +
16 files changed, 37 insertions(+), 16 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 6f476a7..2aaa4a2 100644
--- 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 108d019..ca3cb41 100755
--- 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 6efff8b..5865651 100644
--- 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 533b84d..454fe81 100644
--- 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 c07d486..abb98db 100644
--- 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 23d67a4..4d24dc0 100644
--- 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 d5f5160..e726825 100644
--- 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 91b4f1e..7297c91 100644
--- 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 2d0dd40..8ab7317 100644
--- 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 6596322..34c5ca5 100644
--- 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 d13d72b..45f6c73 100644
--- 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 5b02e67..6c3162f 100644
--- 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 aee1bb8..bafbd4f 100644
--- 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 140401a..7b02786 100644
--- 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 cac2f45..9fc567f 100644
--- 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 baebe91..2ee2e82 100644
--- 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__
------------------------------------------------------------------------
--
1.5.6.5
Reply to: