From: Joerg Jaspert Date: Sat, 1 Nov 2008 18:56:31 +0000 (+0100) Subject: Merge branch 'master' into security X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=f8996e240d9d0278bce098e23be63db0bcc6fbee;hp=55d37c6b50d3fda758cd825fe5c6fc0932fcedaf;p=dak.git Merge branch 'master' into security * master: (182 commits) Remove / Deactivate oldstable ignore EPERM as a result of the chmod of a .dak file EVIL SINGLE TAB CHARACTER IN LAST COMMIT EMERGENCY FIX changelog bug # produce changes without signature, fix delay calculation also for status add machine-readable status show_deferred config for show-deferred whitespace sanitizing move config to config message massage logfiles move show-deferred to dak move show-deferred to dak implement public access to deferred fix remaining days, some style spaces in uploader names validtime Valid-Until ... --- diff --git a/ChangeLog b/ChangeLog index 468f6047..8c7ce8a4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -530,6 +530,7 @@ * dak/stats.py: likewise * dak/symlink_dists.py: likewise * dak/transitions.py: likewise +>>>>>>> sec-merge:ChangeLog 2008-05-03 Joerg Jaspert diff --git a/templates/security-install.advisory b/templates/security-install.advisory index 2ee2e82b..eea2e937 100644 --- a/templates/security-install.advisory +++ b/templates/security-install.advisory @@ -31,16 +31,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. @@ -64,13 +63,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__