Index: dpkg-1.16.10/src/t/100_dpkg_divert.t
===================================================================
--- dpkg-1.16.10.orig/src/t/100_dpkg_divert.t
+++ dpkg-1.16.10/src/t/100_dpkg_divert.t
@@ -148,7 +148,7 @@ sub diversions_eq {
 
 cleanup();
 
-note("Command line parsing testing");
+#note("Command line parsing testing");
 
 my $usagere = qr/.*Usage.*dpkg-divert.*Commands.*Options.*/s;
 
@@ -191,7 +191,7 @@ call([@dd, '--admindir'], [],
 
 cleanup();
 
-note("Querying information from diverts db (empty one)");
+#note("Querying information from diverts db (empty one)");
 
 install_diversions('');
 
@@ -201,7 +201,7 @@ call_divert_sort(['--list', 'baz'], expe
 
 cleanup();
 
-note("Querying information from diverts db (1)");
+#note("Querying information from diverts db (1)");
 
 install_diversions(<<EOF);
 /bin/sh
@@ -237,7 +237,7 @@ call_divert_sort(['--list', '/bin/sh', '
 
 cleanup();
 
-note("Querying information from diverts db (2)");
+#note("Querying information from diverts db (2)");
 
 install_diversions(<<EOF);
 /bin/sh
@@ -259,7 +259,7 @@ call_divert(['--truename', '/bin/somethi
 
 cleanup();
 
-note("Adding diversion");
+#note("Adding diversion");
 
 my $diversions_added_foo_local = <<EOF;
 $testdir/foo
@@ -279,7 +279,7 @@ diversions_eq($diversions_added_foo_loca
 
 cleanup();
 
-note("Adding diversion (2)");
+#note("Adding diversion (2)");
 
 install_diversions('');
 
@@ -293,7 +293,7 @@ diversions_eq($diversions_added_foo_loca
 
 cleanup();
 
-note("Adding diversion (3)");
+#note("Adding diversion (3)");
 
 install_diversions('');
 
@@ -306,7 +306,7 @@ diversions_eq($diversions_added_foo_loca
 
 cleanup();
 
-note("Adding diversion (4)");
+#note("Adding diversion (4)");
 
 install_diversions('');
 system("touch $testdir/foo");
@@ -318,7 +318,7 @@ diversions_eq('');
 
 cleanup();
 
-note("Adding diversion (5)");
+#note("Adding diversion (5)");
 
 install_diversions('');
 call_divert(['--quiet', '--rename', "$testdir/foo"],
@@ -328,7 +328,7 @@ ok(!-e "$testdir/foo.distrib", "foo was
 
 cleanup();
 
-note("Adding diversion (6)");
+#note("Adding diversion (6)");
 
 install_diversions('');
 system("touch $testdir/foo");
@@ -341,7 +341,7 @@ diversions_eq($diversions_added_foo_loca
 
 cleanup();
 
-note("Adding diversion (7)");
+#note("Adding diversion (7)");
 
 install_diversions('');
 call_divert(['--quiet', '--rename', '--package', 'bash', "$testdir/foo"],
@@ -352,7 +352,7 @@ $testdir/foo.distrib
 bash
 EOF
 
-note("Adding diversion (8)");
+#note("Adding diversion (8)");
 
 install_diversions('');
 system("touch $testdir/foo; ln $testdir/foo $testdir/foo.distrib");
@@ -363,7 +363,7 @@ ok(-e "$testdir/foo.distrib", "foo diver
 
 cleanup();
 
-note("Adding diversion (9)");
+#note("Adding diversion (9)");
 
 install_diversions('');
 system("touch $testdir/foo $testdir/foo.distrib");
@@ -373,7 +373,7 @@ diversions_eq('');
 
 cleanup();
 
-note("Adding second diversion");
+#note("Adding second diversion");
 
 install_diversions('');
 call_divert(["$testdir/foo"]);
@@ -393,7 +393,7 @@ call_divert(['--divert', "$testdir/foo",
 
 cleanup();
 
-note("Adding third diversion");
+#note("Adding third diversion");
 
 install_diversions('');
 call_divert(["$testdir/foo"]);
@@ -405,7 +405,7 @@ call_divert(['--package', 'foobar', "$te
 
 cleanup();
 
-note("Adding diversion in non-existing directory");
+#note("Adding diversion in non-existing directory");
 
 install_diversions('');
 
@@ -419,7 +419,7 @@ EOF
 
 cleanup();
 
-note("Adding diversion of file owned by --package");
+#note("Adding diversion of file owned by --package");
 
 install_filelist("coreutils", "i386", "$testdir/foo");
 install_diversions('');
@@ -437,7 +437,7 @@ EOF
 
 cleanup();
 
-note("Remove diversions");
+#note("Remove diversions");
 
 install_diversions('');
 
@@ -446,7 +446,7 @@ call_divert(['--remove', '--quiet', '/bi
 
 cleanup();
 
-note("Remove diversion (2)");
+#note("Remove diversion (2)");
 
 install_diversions('');
 call_divert(["$testdir/foo"]);
@@ -473,7 +473,7 @@ EOF
 
 cleanup();
 
-note("Remove diversion (3)");
+#note("Remove diversion (3)");
 
 install_diversions('');
 
@@ -494,7 +494,7 @@ EOF
 
 cleanup();
 
-note("Remove diversion (4)");
+#note("Remove diversion (4)");
 
 install_diversions('');
 
@@ -515,7 +515,7 @@ EOF
 
 cleanup();
 
-note("Remove diversion(5)");
+#note("Remove diversion(5)");
 
 install_diversions('');
 system("touch $testdir/foo");
@@ -535,7 +535,7 @@ diversions_eq('');
 
 cleanup();
 
-note("Corrupted divertions db handling");
+#note("Corrupted divertions db handling");
 
 SKIP: {
     skip "running as root or similar", 3, if (defined($ENV{FAKEROOTKEY}) or $> == 0);
@@ -569,7 +569,7 @@ cleanup();
 SKIP: {
     skip "running as root or similar", 10, if (defined($ENV{FAKEROOTKEY}) or $> == 0);
 
-    note("R/O directory");
+    #note("R/O directory");
 
     install_diversions('');
     system("mkdir $testdir/rodir && touch $testdir/rodir/foo $testdir/bar && chmod 500 $testdir/rodir");
@@ -582,7 +582,7 @@ SKIP: {
     system("chmod 755 $testdir/rodir");
     cleanup();
 
-    note("Unavailable file");
+    #note("Unavailable file");
 
     install_diversions('');
     system("mkdir $testdir/nadir && chmod 000 $testdir/nadir");
@@ -596,7 +596,7 @@ SKIP: {
     cleanup();
 }
 
-note("Errors during saving diversions db");
+#note("Errors during saving diversions db");
 
 install_diversions('');