diff options
| author | Salvatore Bonaccorso <carnil@debian.org> | 2015-04-25 08:25:43 +0000 |
|---|---|---|
| committer | Salvatore Bonaccorso <carnil@debian.org> | 2015-04-25 08:25:43 +0000 |
| commit | 88cb580242f10e51c2290fa3ce4feb164b99f2fc (patch) | |
| tree | 247ecece5deca5172bff770b3c4b58aeaed29a92 | |
| parent | bd67b8065bdef44bf7baa4064f92e0b61cbd80b5 (diff) | |
Merge branch 'jessie-release'
Prepare template text after jessie is new stable
git-svn-id: svn+ssh://svn.debian.org/svn/secure-testing@33823 e39458fd-73e7-0310-bf30-c45bca0a0e42
| -rwxr-xr-x | bin/gen-DSA | 12 | ||||
| -rw-r--r-- | doc/DSA.template | 5 |
2 files changed, 11 insertions, 6 deletions
diff --git a/bin/gen-DSA b/bin/gen-DSA index 9437f35095..395a8f1a93 100755 --- a/bin/gen-DSA +++ b/bin/gen-DSA @@ -27,9 +27,10 @@ case "$(basename "$0")" in ;; 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 @@ else setvar DLAID "$DAID" fi setvar BUGNUM +setvar OLDOLDSTABLE setvar OLDSTABLE setvar STABLE setvar TESTING @@ -320,7 +322,7 @@ setvar SPACEDDATE 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 @@ EOF 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 diff --git a/doc/DSA.template b/doc/DSA.template index 39966eae67..5b607470ee 100644 --- a/doc/DSA.template +++ b/doc/DSA.template @@ -14,10 +14,13 @@ Debian Bug : $BUGNUM $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 |