Merge branch sid (through commit '1.15.4.1')

Conflicts:
	configure.ac
	debian/changelog

2 files changed, 11 insertions, 0 deletions

diff --git a/debian/changelog b/debian/changelog
index 4f92a0b35..d22849458 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -121,6 +121,13 @@ dpkg (1.15.5) UNRELEASED; urgency=low
 
  -- Guillem Jover <guillem@debian.org>  Sun, 06 Sep 2009 09:48:45 +0200
 
+dpkg (1.15.4.1) unstable; urgency=medium
+
+  * Do not mark any package as unseen in dselect. This is a workaround
+    until it learns how to store such information again. Closes: #545366
+
+ -- Guillem Jover <guillem@debian.org>  Mon, 19 Oct 2009 15:15:17 +0200
+
 dpkg (1.15.4) unstable; urgency=low
 
   [ Guillem Jover ]
diff --git a/dselect/pkglist.cc b/dselect/pkglist.cc
index fd256552f..3051dd563 100644
--- a/dselect/pkglist.cc
+++ b/dselect/pkglist.cc
@@ -190,8 +190,12 @@ void packagelist::ensurestatsortinfo() {
       case pkginfo::stat_configfiles:
         if (!informativeversion(&pkg->available.version)) {
           table[index]->ssavail= ssa_notinst_gone;
+// FIXME: Disable for now as a workaround, until dselect knows how to properly
+//        store seen packages.
+#if 0
         } else if (table[index]->original == pkginfo::want_unknown) {
           table[index]->ssavail= ssa_notinst_unseen;
+#endif
         } else {
           table[index]->ssavail= ssa_notinst_seen;
         }