From: Michael Vogt <mvo@debian.org>
Date: Thu, 20 Oct 2005 09:44:54 +0000 (+0000)
Subject: * merged with main
X-Git-Tag: 0.7.21~284^2~44
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/d64805b9d9bb6df1ca22aff8ad040b5288c996eb

* merged with main


Patches applied:

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-77
   * renamed Trust-CDROM to TrustCDROM to make it consistent with ubuntu
---

d64805b9d9bb6df1ca22aff8ad040b5288c996eb
diff --cc debian/changelog
index ff400a6ab,6b858cdcd..2b100e040
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,3 +1,13 @@@
 +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)
 +
 + -- Michael Vogt <mvo@debian.org>  Wed, 19 Oct 2005 22:12:13 +0200
 +
  apt (0.6.42) unstable; urgency=low
  
    * apt-pkg/cdrom.cc: