finialize v6 mode

3 files changed, 9 insertions, 6 deletions

diff --git a/debhelper.pod b/debhelper.pod
index 220091c5..94f03abe 100644
--- a/debhelper.pod
+++ b/debhelper.pod
@@ -339,8 +339,7 @@ dh_link will correct existing links to conform with policy.
 
 =item V5
 
-This is the recommended mode of operation. It does everything V4 does,
-plus:
+Changes from V4 are:
 
 =over 8
 
@@ -365,8 +364,8 @@ dh_install errors out if wildcards expand to nothing.
 
 =item V6
 
-This mode is still under development. Currently it has these differences
-compared to V5:
+This is the recommended mode of operation. It does everything V5 does,
+plus:
 
 =over 8
 
diff --git a/debian/changelog b/debian/changelog
index a68b8fcf..93cf8d1f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-debhelper (5.0.64) UNRELEASED; urgency=low
+debhelper (6.0.0) UNRELEASED; urgency=low
 
   * dh_gencontrol: Stop passing -isp, it's the default now. Closes: #458114
   * dh_shlibdeps: Update documentation for -L and -l. dpkg-shlibdeps is now
@@ -11,6 +11,10 @@ debhelper (5.0.64) UNRELEASED; urgency=low
     dpkg-shlibdeps. The old behavior of passing -L to dpkg-shlibdeps didn't
     affect where it looked for symbols files. Closes: #459224
   * Depend on dpkg-dev 1.14.15, the first to support dpkg-shlibdeps -S.
+  * dh_installdocs, dh_installexamples: Support files with spaces in exclude
+    mode. Closes: #459426
+  * debhelper v6 mode is finalised and the new recommended compatability
+    level.
 
  -- Joey Hess <joeyh@debian.org>  Fri, 28 Dec 2007 15:45:39 -0500
 
diff --git a/doc/TODO b/doc/TODO
index 05aa80a0..e45e243c 100644
--- a/doc/TODO
+++ b/doc/TODO
@@ -30,7 +30,7 @@ Wishlist items:
 
   This needs more thought.
   
-v6:
+v7:
 
 * escaping in config files (for whitespace)?
 * make dh_install use hard links for efficiency