Index: ChangeLog
===================================================================
--- ChangeLog	(revision 5)
+++ ChangeLog	(revision 6)
@@ -1,3 +1,12 @@
+2006-07-11 Anton Vorontsov (cbou at mail dot ru)
+        * pkgutil.{cc,h}: refactored, new types introduced, old types
+          typedef'ed. New dbg() macros introduced to get rid of many
+          "#ifdef NDEBUG"
+        * pkgadd.{cc,h}: refactored, to lower indentation level big
+          functions splitted to small ones
+        * pkginfo.cc: changed as side-effect of pkgutils.{cc,h}
+        * Makefile: -Wno-variadic-macros CXXFLAG added.
+        * Because of all above, bugs fixed: #15, #63
 2006-04-29 Simone Rota (sip at crux dot nu)
         * Optimized file type detection for stripping in pkgmk
           Thanks to Antti Nykänen
Index: NEWS
===================================================================
--- NEWS	(revision 5)
+++ NEWS	(revision 6)
@@ -1,3 +1,7 @@
+5.21		- Released 200X-YY-ZZ
+		- pkgadd will now warn on mode/ownership-conflicting files
+		  (fixed bugs #15, #63)
+
 5.20		- Released 2005-05-04
 		- pkgadd/rejmerge will now consider user, group and access
 		  permissions on rejected files.