dpkg (1.2.14) stable unstable; urgency=MEDIUM

  * dselect +/-/_/= on lines for all broken, new, local or whatever
    packages do not affect _all_ packages.  (Bug#4129.)

 -- Ian Jackson <ian@chiark.chu.cam.ac.uk>  Thu, 22 Aug 1996 00:39:52 +0100

diff --git a/debian.Changelog b/debian.Changelog
index a6dcd1339042294db3686e1ff714d63d93629f01..7ae991d23244f15393fd0b13ee4e1f768a9a688a 100644 (file)
--- a/debian.Changelog
+++ b/debian.Changelog
@@ -1,3 +1,10 @@
+dpkg (1.2.14) stable unstable; urgency=MEDIUM
+
+  * dselect +/-/_/= on lines for all broken, new, local or whatever
+    packages do not affect _all_ packages.  (Bug#4129.)
+
+ -- Ian Jackson <ian@chiark.chu.cam.ac.uk>  Thu, 22 Aug 1996 00:39:52 +0100
+
 dpkg (1.2.13) unstable; urgency=LOW
 
   * dpkg --search produces correct output for diversions.

diff --git a/debian.rules b/debian.rules
index e6552aa760a51bec28c98fe8d18695d47823f483..992a34f39dd58d3bdcb6f8dc4fe687e68fb1e7ba 100755 (executable)
--- a/debian.rules
+++ b/debian.rules
@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 
 package=dpkg
-version=1.2.13
+version=1.2.14
 
 archi=$(shell dpkg --print-architecture)
 DIR:=$(shell pwd)

diff --git a/doc/developer-keys.bak b/doc/developer-keys.bak
deleted file mode 100644 (file)
index a62f9c9..0000000
Binary files a/doc/developer-keys.bak and /dev/null differ

diff --git a/dselect/pkgcmds.cc b/dselect/pkgcmds.cc
index 26a32566e9e17f8e46e46ddcc40ab9007ba2b09f..7950bb9b9d6fa7c94f7255a0b8ed16fb0b549cd1 100644 (file)
--- a/dselect/pkgcmds.cc
+++ b/dselect/pkgcmds.cc
@@ -33,7 +33,19 @@ extern "C" {
 #include "dselect.h"
 #include "pkglist.h"
 
-static int matches(struct pkginfo *pkg, struct pkginfo *comparewith) {
+int packagelist::affectedmatches(struct pkginfo *pkg, struct pkginfo *comparewith) {
+  switch (statsortorder) {
+  case sso_avail:
+    if (comparewith->clientdata->ssavail != pkg->clientdata->ssavail) return 0;
+    break;
+  case sso_state:
+    if (comparewith->clientdata->ssstate != pkg->clientdata->ssstate) return 0;
+    break;
+  case sso_unsorted:
+    break;
+  default:
+    internerr("unknown statsortorder in affectedmatches");
+  }
   if (comparewith->priority != pkginfo::pri_unset &&
       (comparewith->priority != pkg->priority ||
        comparewith->priority == pkginfo::pri_other &&
@@ -60,7 +72,8 @@ void packagelist::affectedrange(int *startp, int *endp) {
     return;
   }
   *startp= index;
-  while (index < nitems && matches(table[index]->pkg,table[cursorline]->pkg)) index++;
+  while (index < nitems && affectedmatches(table[index]->pkg,table[cursorline]->pkg))
+    index++;
   *endp= index;
 }
 

diff --git a/dselect/pkglist.h b/dselect/pkglist.h
index c93db25351d61e38e000745da753286fa306ef84..4bfc84352819a122642ba2ffee744a8644eea183 100644 (file)
--- a/dselect/pkglist.h
+++ b/dselect/pkglist.h
@@ -160,6 +160,7 @@ class packagelist : public baselist {
   void addheading(enum ssavailval, enum ssstateval,
                   pkginfo::pkgpriority, const char*, const char *section);
   void sortinplace();
+  int affectedmatches(struct pkginfo *pkg, struct pkginfo *comparewith);
   void affectedrange(int *startp, int *endp);
   void setwant(pkginfo::pkgwant nw);
   void sethold(int hold);

diff --git a/version.h b/version.h
index ac5cd6c6d1a3f36fb7e1e1eab836b768291f1617..42be7bd9c8366f860bd49d2bab076e86a78563ba 100644 (file)
--- a/version.h
+++ b/version.h
@@ -1 +1 @@
-#define DPKG_VERSION "1.2.13" /* This line modified by Makefile */
+#define DPKG_VERSION "1.2.14" /* This line modified by Makefile */