diff options
| author | Luk Claes <luk@debian.org> | 2012-02-11 10:54:21 +0000 |
|---|---|---|
| committer | Luk Claes <luk@debian.org> | 2012-02-11 10:54:21 +0000 |
| commit | ef3ae329ad674e4bb3622b59160d7c6b4654d2c9 (patch) | |
| tree | 81b6aa7699a2aa2ce5834d82cf3b041f6d5ff046 | |
| parent | a17141628ebbe4f4b6c6dd5721fd3532f60030fb (diff) | |
Don't use etch or lenny in examples
git-svn-id: svn+ssh://svn.debian.org/svn/secure-testing@18421 e39458fd-73e7-0310-bf30-c45bca0a0e42
| -rw-r--r-- | doc/how-to-DTSA | 6 | ||||
| -rw-r--r-- | doc/narrative_introduction | 2 | ||||
| -rw-r--r-- | website/uploading.html | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/doc/how-to-DTSA b/doc/how-to-DTSA index dfd9e7cfa0..3958a8186e 100644 --- a/doc/how-to-DTSA +++ b/doc/how-to-DTSA @@ -23,7 +23,7 @@ Use debdiff, interdiff etc. Use debdiff on the binary packages, too. The distribution needs to be "testing-security". If you append something to the version number currently in testing, use something -like "+lenny1" or ".0lenny1". A simple "lenny1" is not enough because of binNMUs +like "+wheezy1" or ".0wheezy1". A simple "wheezy1" is not enough because of binNMUs adding "+b1". dcut does not seem to work on security-master.debian.org, but someone @@ -79,8 +79,8 @@ Otherwise do some debdiffing to ensure that the filelists and dependencies look correct. You can do this by downloading the binary packages from klecker and the compare them, like the following: - for i in *lenny1*.deb; do - oldpkg=$(echo $i | sed -e 's/+lenny1//') + for i in *wheezy1*.deb; do + oldpkg=$(echo $i | sed -e 's/+wheezy1//') debdiff debian.netcologne.de/debian/pool/main/c/cupsys/$oldpkg $i done|less diff --git a/doc/narrative_introduction b/doc/narrative_introduction index 49c74bede4..708595f6f3 100644 --- a/doc/narrative_introduction +++ b/doc/narrative_introduction @@ -497,7 +497,7 @@ it hit stable. There is no need to add anything to CVE/list for a DSA, the DSA cross-reference will be added automatically by the cron job. However, -you do need to add [etch] or [lenny] entries to CVE/list when there +you do need to add [lenny] or [squeeze] entries to CVE/list when there is a 'no-dsa' or 'not-affected' condition. The bin/dsa2list script can be used to generate a template for a new diff --git a/website/uploading.html b/website/uploading.html index 2f2f09e15a..2f4e659d7a 100644 --- a/website/uploading.html +++ b/website/uploading.html @@ -57,14 +57,14 @@ number of the fix in unstable, but greater than the version number of the fix in testing (including a possible +b1 for binNMUs). For example, if the fix is in a new upstream version 1.0-1 in unstable, - upload version 1.0-1~lenny1 to testing-security. If the current version + upload version 1.0-1~wheezy1 to testing-security. If the current version in testing is 1.2-3 and the fix is backported to this version, upload - version 1.2-3+lenny1 to testing-security. Make sure + version 1.2-3+wheezy1 to testing-security. Make sure that the version you used has <strong>never</strong> been used before in any release.</li> <li>Use <em>CODENAME-security</em> as the distribution in the - changelog (e.g. wheezey-security).</li> + changelog (e.g. wheezy-security).</li> <li>Build the package in a testing chroot using pbuilder so that all the dependencies are ok. <strong>Be sure to build with |