* merged with main

[apt.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index ff400a6aba5454c759922e1017668f2229c57b19..2b100e0403b10992c621e1bbfcd755911aeadef8 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ apt (0.6.42.0exp1) experimental; urgency=low
 
   * added support for package index diffs 
   * added support for i18n of the package descriptions
+  * synced with the apt--debian-sid--0 branch
   * build from mvo@debian.org--2005/apt--debian-experimental--0
     (from http://people.debian.org/~mvo/arch)
 
@@ -26,7 +27,7 @@ apt (0.6.42) unstable; urgency=low
   * fix leak in the mmap code, thanks to Daniel Burrows for the
     patch (closes: #250583)
   * support for apt-get [build-dep|source] -t (closes: #152129)
-  * added "APT::Authentication::Trust-CDROM" option to make the life
+  * added "APT::Authentication::TrustCDROM" option to make the life
     for the installer people easier (closes: #334656)
   * fix crash in apt-ftparchive (thanks to Bastian Blank for the patch)
     (closes: #334671)