Merge branch 'master' into buildsystems

[debhelper.git] / doc / TODO

diff --git a/doc/TODO b/doc/TODO
index 40fafbb46b023519fd8122701d53957fd3d45de2..3092736bbf0208531c4d8b1f613c2bda31aa5d9b 100644 (file)
--- a/doc/TODO
+++ b/doc/TODO
@@ -23,8 +23,6 @@ Deprecated:
 * dh_installmanpages.
 * dh_testversion. Remove as soon as nothing uses it.
 * dh_movefiles. I won't hold my breath.
-* debconf-mergetemplates support and the debian/template.ll files and the
-  debconf-utils dependency.
 * dh_undocumented
 * dh_installinit --init-script
 * dh_python
@@ -32,3 +30,4 @@ Deprecated:
 * Convert warning about unknown command-line options back to an error.
   Need to wait a while (from Oct 2008) to ensure that most rules files
   that pass unknown options to commands are fixed.
+* dh_desktop, dh_scrollkeeper. Remove eventually..