Author: carnil
Date: 2015-04-25 08:25:43 +0000 (Sat, 25 Apr 2015)
New Revision: 33823
Modified:
bin/gen-DSA
doc/DSA.template
Log:
Merge branch 'jessie-release'
Prepare template text after jessie is new stable
Modified: bin/gen-DSA
===================================================================
--- bin/gen-DSA 2015-04-25 07:05:53 UTC (rev 33822)
+++ bin/gen-DSA 2015-04-25 08:25:43 UTC (rev 33823)
@@ -27,9 +27,10 @@
;;
esac
-OLDSTABLE=squeeze
-STABLE=wheezy
-TESTING=jessie
+OLDOLDSTABLE=squeeze
+OLDSTABLE=wheezy
+STABLE=jessie
+TESTING=stretch
NAME_SPACING=24
DATE_SPACING=22
@@ -313,6 +314,7 @@
setvar DLAID "$DAID"
fi
setvar BUGNUM
+setvar OLDOLDSTABLE
setvar OLDSTABLE
setvar STABLE
setvar TESTING
@@ -320,7 +322,7 @@
setvar DATE
setvar TEXT "${TEXT:-$IDMODE text goes here}"
-for dist in $OLDSTABLE $STABLE $TESTING UNSTABLE; do
+for dist in $OLDOLDSTABLE $OLDSTABLE $STABLE $TESTING UNSTABLE; do
version="$(eval 'printf "%s" "$'"$dist"_VERSION'"')"
if $save && [ -z "$version" ] && grep -q "${dist}_VERSION" "$tmpf"; then
printf "Enter $dist's version [unset]: "
@@ -354,7 +356,7 @@
printf "\t{%s}\n" "$CVE" >> $daid_entry
fi
- for dist in $OLDSTABLE $STABLE; do
+ for dist in $OLDOLDSTABLE $OLDSTABLE $STABLE; do
version="$(eval 'printf "%s" "$'"$dist"_VERSION'"')"
[ -z "$version" ] || \
printf "\t[%s] - %s %s\n" "$dist" "$PACKAGE" "$version" >>
$daid_entry
Modified: doc/DSA.template
===================================================================
--- doc/DSA.template 2015-04-25 07:05:53 UTC (rev 33822)
+++ doc/DSA.template 2015-04-25 08:25:43 UTC (rev 33823)
@@ -14,10 +14,13 @@
$TEXT
+For the oldstable distribution ($OLDSTABLE), this problem has been fixed in
+version $$OLDSTABLE_VERSION.
+
For the stable distribution ($STABLE), this problem has been fixed in
version $$STABLE_VERSION.
-For the upcoming stable distribution ($TESTING), this problem has been
+For the testing distribution ($TESTING), this problem has been fixed in
fixed in version $$TESTING_VERSION.
For the unstable distribution (sid), this problem has been fixed in
_______________________________________________
Secure-testing-commits mailing list
Secure-testing-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/secure-testing-commits
