Merge branch 'master' into merge

[dak.git] / templates / security-install.advisory

diff --git a/templates/security-install.advisory b/templates/security-install.advisory
index baebe9166661b1c2de77c043cece2f7b62e3f504..9036bd01b044c4f85cbc70bd579edb9c8a7bedea 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__
 
 ------------------------------------------------------------------------
@@ -27,19 +28,24 @@ Foo discovered that
 
 
 [single issue]
-For the stable distribution (etch), this problem has been fixed in version XXX
+For the old stable distribution (etch), this problem has been fixed in version XXX
 __PACKAGE__
 
-For the old stable distribution (sarge), this problem has been fixed in
-version __PACKAGE__
+For the stable distribution (lenny), this problem has been fixed in version XXX
+__PACKAGE__
+
+For the unstable distribution (sid), this problem has been fixed in
+version XXX
 
 [multiple issues]
-For the stable distribution (etch), these problems have been fixed in version
+For the old stable distribution (etch), these problems have been fixed in version
 __PACKAGE__
 
-For the old stable distribution (sarge), these problems have been fixed in
-version __PACKAGE__
+For the stable distribution (lenny), these problems have been fixed in version
+__PACKAGE__
 
+For the unstable distribution (sid), these problems have been fixed in
+version XXX
 
 We recommend that you upgrade your __PACKAGE__ package.
 
@@ -63,12 +69,11 @@ You may use an automated update by adding the resources from the
 footer to the proper configuration.
 
 
-Debian GNU/Linux 3.1 alias sarge
---------------------------------
-
 Debian GNU/Linux 4.0 alias etch
 -------------------------------
 
+Debian GNU/Linux 5.0 alias lenny
+--------------------------------
 
 __ADVISORY_TEXT__