update changed

diff --git a/ChangeLog b/ChangeLog
index 046b057a75a394ab5fbc441ef46c1c9a7ce02b77..e5a92c440f656c7162dfa6dc2b5c551d99c8bf69 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+Tue Feb  8 21:33:58 EST 2000 Ben Collins <bcollins@debian.org>
+
+  * main/{processarc,archive}.c: Make the conflictor an array of structs and
+    make sure that check_conflicts uses that and increments a global indexs
+    for the array. The reason that multiple conflicts/replaces were getting
+    borked had something to do with thre first one in the hash not being
+    processed. This was the result of bad pointer games, so this makes it a
+    lot cleaner.
+
 Wed Jan 19 16:41:04 CET 2000 Wichert Akkerman <wakkerma@debian.org>
 
   * scripts/controllib.pl: add comment with description of global variables

diff --git a/debian/changelog b/debian/changelog
index 1982e76f6b353595d678e3858fda74d3ac40c65c..8fa7510e14a8b6f6d5e766291c24bac26f47b16b 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
 dpkg (1.6.8) unstable; urgency=low
 
+  * fixed problems with multiple conflicts/replaces
 
  -- Wichert Akkerman <wakkerma@debian.org>  UNRELEASED