diff options
author | Michael Vogt <mvo@ubuntu.com> | 2015-03-13 15:01:18 +0100 |
---|---|---|
committer | Michael Vogt <mvo@ubuntu.com> | 2015-03-13 15:01:18 +0100 |
commit | 1c01d6cc57b19e599d926d245cee30ea25826220 (patch) | |
tree | e5edd13e551023f106bed0bb2db5a12ff2084250 /doc/apt-verbatim.ent | |
parent | ca495d048f6a6fd596b061208d28f319fa6dbcd8 (diff) | |
parent | 1a0619ac765cc0b2f4906c96c1a4d7f510569a3f (diff) |
Merge branch 'debian/sid' into ubuntu/master
Conflicts:
configure.ac
debian/changelog
Diffstat (limited to 'doc/apt-verbatim.ent')
-rw-r--r-- | doc/apt-verbatim.ent | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/doc/apt-verbatim.ent b/doc/apt-verbatim.ent index 126f26b8b..e88d39332 100644 --- a/doc/apt-verbatim.ent +++ b/doc/apt-verbatim.ent @@ -225,13 +225,13 @@ "> <!-- this will be updated by 'prepare-release' --> -<!ENTITY apt-product-version "1.0.9.1"> +<!ENTITY apt-product-version "1.0.9.6"> <!-- (Code)names for various things used all over the place --> -<!ENTITY oldstable-codename "squeeze"> -<!ENTITY stable-codename "wheezy"> -<!ENTITY testing-codename "jessie"> -<!ENTITY stable-version "7"> +<!ENTITY oldstable-codename "wheezy"> +<!ENTITY stable-codename "jessie"> +<!ENTITY testing-codename "stretch"> +<!ENTITY stable-version "8"> <!ENTITY ubuntu-codename "trusty"> <!-- good and bad just refers to matching and not matching a pattern… |