* merged the apt-breaks-iwj branch
authorMichael Vogt <egon@bottom>
Thu, 14 Dec 2006 11:39:29 +0000 (12:39 +0100)
committerMichael Vogt <egon@bottom>
Thu, 14 Dec 2006 11:39:29 +0000 (12:39 +0100)
commit6ca714d55119e87a01bd475abd08e7212dcafbd0
tree264c3a939b34f5daea19f45619686f060569f34d
parent0660506d1916f6538359f238e860804441ba24f3
parentdc4002d8c3c687e6614d01b34e4b6aa929411ea9
* merged the apt-breaks-iwj branch
* pulled in the other remaining ubuntu changes
apt-pkg/acquire-item.cc
apt-pkg/acquire-item.h
apt-pkg/algorithms.cc
apt-pkg/deb/debsrcrecords.h
apt-pkg/depcache.cc
apt-pkg/pkgcache.cc
apt-pkg/pkgcache.h
cmdline/apt-get.cc
debian/changelog
debian/rules