Reschedule roadmap and feature removals in relation to versions

Use versions instead of Debian specific releases, although we map minor
versions to Debian releases.

2 files changed, 14 insertions, 20 deletions

diff --git a/README.feature-removal-schedule b/README.feature-removal-schedule
index 33e68abfb..225ec2fd6 100644
--- a/README.feature-removal-schedule
+++ b/README.feature-removal-schedule
@@ -3,7 +3,7 @@ This is a list of features that are scheduled to be removed from dpkg.
 
 What: Source-Version (substvar)
 Status: obsolete
-When: lenny+1
+When: 1.16.x
 Warning: lintian (substvar-source-version-is-deprecated)
 Why:
  The semantics of Source-Version are missleading when applied to binNMUs.
@@ -12,7 +12,7 @@ Why:
 What: Revision, Package-Revision, Package_Revision, Class, Recommended,
       Optional (field)
 Status: obsolete
-When: lenny+1
+When: 1.15.x
 Warning: program
 Why:
  These fields have been superseded by either other fields with better names
@@ -20,14 +20,14 @@ Why:
 
 What: -u, --udeb (dpkg-scanpackages option)
 Status: deprecated
-When: lenny+1
+When: 1.16.x
 Warning: program
 Why:
  This option has been superseded by -tudeb.
 
 What: support of custom changelog parsers understanding only -v
 Status: obsolete
-When: lenny+1
+When: 1.15.x
 Warning: none
 Why:
  The debian changelog parser has been enhanced. It supports new options
@@ -39,7 +39,7 @@ Why:
 
 What: support of PGP
 Status: deprecated
-When: lenny+1
+When: 1.15.x
 Warning: program
 Why:
  PGP is not part of Debian and GnuPG has been the standard tool for digital
diff --git a/TODO b/TODO
index c64e17843..c336356ef 100644
--- a/TODO
+++ b/TODO
@@ -1,8 +1,8 @@
 ROADMAP
 =======
 
-squeeze
-~~~~~~~
+1.15.x (squeeze)
+~~~~~~
 
  * Review this file and remove or update the old entries.
 
@@ -18,21 +18,8 @@ squeeze
    (1.x => 2.x) while minor version bump will be used for backwards
    compatible extension (e.g. new fields).
 
-squeeze + 1
-~~~~~~~~~~~
-
- * Remove compatibility symlinks
-   /usr/sbin/{update-alternatives,dpkg-divert,dpkg-statoverride}.
- * Remove install-info wrapper.
-
-1.14.x
-------
-
  * Make dpkg bootstrappable.
 
-1.14.y
-------
-
  * Code cleanup:
    - Get rid of static variables inside functions.
    - Coalesce admindir / infodir / foodir generation.
@@ -128,6 +115,13 @@ squeeze + 1
 
  * Fix quotes? <http://www.cl.cam.ac.uk/~mgk25/ucs/quotes.html>
 
+1.16.x (squeeze + 1)
+~~~~~~
+
+ * Remove compatibility symlinks
+   /usr/sbin/{update-alternatives,dpkg-divert,dpkg-statoverride}.
+ * Remove install-info wrapper.
+
 
 TODO
 ====