ftpmaster-dak r1090: Merge mailtags
------------------------------------------------------------
revno: 1090
committer: Joerg Jaspert <joerg@debian.org>
branch nick: upstream
timestamp: Sat 2008-05-10 00:28:13 +0200
message:
Merge mailtags
modified:
ChangeLog
dak/override.py
templates/override.bug-close
templates/process-accepted.install
templates/process-accepted.unaccept
templates/process-new.prod
templates/process-unchecked.accepted
templates/process-unchecked.announce
templates/process-unchecked.bug-close
templates/process-unchecked.bug-experimental-fixed
templates/process-unchecked.bug-nmu-fixed
templates/process-unchecked.new
templates/process-unchecked.override-disparity
templates/queue.rejected
templates/reject-proposed-updates.rejected
templates/security-install.advisory
------------------------------------------------------------
revno: 1087.1.2
committer: Joerg Jaspert <joerg@debian.org>
branch nick: mailtags
timestamp: Sat 2008-05-10 00:27:53 +0200
message:
Also set X-Debian-Package: header
modified:
ChangeLog
dak/override.py
templates/override.bug-close
templates/process-accepted.install
templates/process-accepted.unaccept
templates/process-new.prod
templates/process-unchecked.accepted
templates/process-unchecked.announce
templates/process-unchecked.bug-close
templates/process-unchecked.bug-experimental-fixed
templates/process-unchecked.bug-nmu-fixed
templates/process-unchecked.new
templates/process-unchecked.override-disparity
templates/queue.rejected
templates/reject-proposed-updates.rejected
templates/security-install.advisory
=== modified file 'ChangeLog'
--- a/ChangeLog 2008-05-07 22:43:45 +0000
+++ b/ChangeLog 2008-05-09 22:27:53 +0000
@@ -1,35 +1,41 @@
+2008-05-09 Joerg Jaspert <joerg@debian.org>
+
+ * 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.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.
- * 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
=== modified file 'dak/override.py'
--- a/dak/override.py 2008-05-07 22:43:45 +0000
+++ b/dak/override.py 2008-05-09 22:27:53 +0000
@@ -251,6 +251,7 @@
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)
=== modified file 'templates/override.bug-close'
--- a/templates/override.bug-close 2008-05-07 22:43:45 +0000
+++ b/templates/override.bug-close 2008-05-09 22:27:53 +0000
@@ -3,6 +3,7 @@
__CC__
__BCC__
X-Debian: DAK
+X-Debian-Package: __SOURCE__
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 8bit
=== modified file 'templates/process-accepted.install'
--- a/templates/process-accepted.install 2008-05-07 22:43:45 +0000
+++ b/templates/process-accepted.install 2008-05-09 22:27:53 +0000
@@ -2,6 +2,7 @@
To: __MAINTAINER_TO__
__BCC__
X-Debian: DAK
+X-Debian-Package: __SOURCE__
Precedence: bulk
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
=== modified file 'templates/process-accepted.unaccept'
--- a/templates/process-accepted.unaccept 2008-05-07 22:43:45 +0000
+++ b/templates/process-accepted.unaccept 2008-05-09 22:27:53 +0000
@@ -3,6 +3,7 @@
__CC__
__BCC__
X-Debian: DAK
+X-Debian-Package: __SOURCE__
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 8bit
=== modified file 'templates/process-new.prod'
--- a/templates/process-new.prod 2008-05-07 22:43:45 +0000
+++ b/templates/process-new.prod 2008-05-09 22:27:53 +0000
@@ -2,6 +2,7 @@
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
=== modified file 'templates/process-unchecked.accepted'
--- a/templates/process-unchecked.accepted 2008-05-07 22:43:45 +0000
+++ b/templates/process-unchecked.accepted 2008-05-09 22:27:53 +0000
@@ -2,6 +2,7 @@
To: __MAINTAINER_TO__
__BCC__
X-Debian: DAK
+X-Debian-Package: __SOURCE__
Precedence: bulk
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
=== modified file 'templates/process-unchecked.announce'
--- a/templates/process-unchecked.announce 2008-05-07 22:43:45 +0000
+++ b/templates/process-unchecked.announce 2008-05-09 22:27:53 +0000
@@ -2,6 +2,7 @@
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
=== modified file 'templates/process-unchecked.bug-close'
--- a/templates/process-unchecked.bug-close 2008-05-07 22:43:45 +0000
+++ b/templates/process-unchecked.bug-close 2008-05-09 22:27:53 +0000
@@ -2,6 +2,7 @@
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
=== modified file 'templates/process-unchecked.bug-experimental-fixed'
--- a/templates/process-unchecked.bug-experimental-fixed 2008-05-07 22:43:45 +0000
+++ b/templates/process-unchecked.bug-experimental-fixed 2008-05-09 22:27:53 +0000
@@ -3,6 +3,7 @@
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
=== modified file 'templates/process-unchecked.bug-nmu-fixed'
--- a/templates/process-unchecked.bug-nmu-fixed 2008-05-07 22:43:45 +0000
+++ b/templates/process-unchecked.bug-nmu-fixed 2008-05-09 22:27:53 +0000
@@ -3,6 +3,7 @@
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
=== modified file 'templates/process-unchecked.new'
--- a/templates/process-unchecked.new 2008-05-07 22:43:45 +0000
+++ b/templates/process-unchecked.new 2008-05-09 22:27:53 +0000
@@ -2,6 +2,7 @@
To: __MAINTAINER_TO__
__BCC__
X-Debian: DAK
+X-Debian-Package: __SOURCE__
Precedence: bulk
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
=== modified file 'templates/process-unchecked.override-disparity'
--- a/templates/process-unchecked.override-disparity 2008-05-07 22:43:45 +0000
+++ b/templates/process-unchecked.override-disparity 2008-05-09 22:27:53 +0000
@@ -2,6 +2,7 @@
To: __MAINTAINER_TO__
__BCC__
X-Debian: DAK
+X-Debian-Package: __SOURCE__
Precedence: junk
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
=== modified file 'templates/queue.rejected'
--- a/templates/queue.rejected 2008-05-07 22:43:45 +0000
+++ b/templates/queue.rejected 2008-05-09 22:27:53 +0000
@@ -3,6 +3,7 @@
__BCC__
__CC__
X-Debian: DAK
+X-Debian-Package: __SOURCE__
Precedence: bulk
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
=== modified file 'templates/reject-proposed-updates.rejected'
--- a/templates/reject-proposed-updates.rejected 2008-05-07 22:43:45 +0000
+++ b/templates/reject-proposed-updates.rejected 2008-05-09 22:27:53 +0000
@@ -3,6 +3,7 @@
__CC__
__BCC__
X-Debian: DAK
+X-Debian-Package: __SOURCE__
Precedence: bulk
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
=== modified file 'templates/security-install.advisory'
--- a/templates/security-install.advisory 2008-05-01 21:45:34 +0000
+++ b/templates/security-install.advisory 2008-05-09 22:27:53 +0000
@@ -1,6 +1,7 @@
From: __DAK_ADDRESS__
To: __WHOAMI__ <dak@security.debian.org>
__BCC__
+X-Debian-Package: __SOURCE__
Subject: Template Advisory __ADVISORY__
------------------------------------------------------------------------
Reply to: