Merge commit 'sec-merge' into security

* commit 'sec-merge':
  cater for uid_email None in sponsor notification
  Use "import daklib.foo as foo" style
  Use "import daklib.foo as foo" style
  Use "import daklib.foo as foo" style
  Use "import daklib.foo as foo" style
  Use "import daklib.foo as foo" style
  Use "import daklib.foo as foo" style
  Use "import daklib.foo as foo" style
  Use "import daklib.foo as foo" style
  Use "import daklib.foo as foo" style
  Use "import daklib.foo as foo" style
  Use "import daklib.foo as foo" style
  Use "import daklib.foo as foo" style
  Use "import daklib.foo as foo" style
  Use "import daklib.foo as foo" style
  Use "import daklib.foo as foo" style

Signed-off-by: Joerg Jaspert <joerg@debian.org>

diff --git a/ChangeLog b/ChangeLog
index eead3da3bcfc0b541efd1535f06d6401b3c600c3..05a17bc50864a5aa85db676c170410d1a4895820 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -70,6 +70,7 @@
        * dak/stats.py: likewise
        * dak/symlink_dists.py: likewise
        * dak/transitions.py: likewise
+>>>>>>> sec-merge:ChangeLog
 
 2008-05-03  Joerg Jaspert  <joerg@debian.org>
 

diff --git a/templates/security-install.advisory b/templates/security-install.advisory
index baebe9166661b1c2de77c043cece2f7b62e3f504..13220f362de0dc8f3dc52f21883b0a523f71fb07 100644 (file)
--- a/templates/security-install.advisory
+++ b/templates/security-install.advisory
@@ -30,16 +30,15 @@ Foo discovered that
 For the 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 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
 __PACKAGE__
 
-For the old stable distribution (sarge), 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,13 +62,9 @@ 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
 -------------------------------
 
-
 __ADVISORY_TEXT__