merged from lp:~donkult/apt/sid

diff --combined debian/changelog
index d813f035ad5b8a2d93202dc3ec3bda10351d0492,936f2557e2d61d6dac749172aaa1d129b78a385d..569136b7a75f6acb285b3d62d276c022e7b9379f
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -2,9 -2,12 +2,13 @@@ apt (0.9.7.5) UNRELEASED; urgency=lo
  
    [ Manpages translation updates ]
    * Japanese (KURASAWA Nozomu) (Closes: #684435)
 +  * Portuguese (Américo Monteiro) (Closes: #686975)
  
    [ David Kalnischkies ]
+   * handle packages without a mandatory architecture (debian-policy §5.3)
+     by introducing a pseudo-architecture 'none' so that the small group of
+     users with these packages can get right of them without introducing too
+     much hassle for other users (Closes: #686346)
    * apt-pkg/cdrom.cc:
      - copy only configured translation files from a CD-ROM and not all
        available translation files preventing new installs with d-i from
@@@ -29,6 -32,9 +33,9 @@@
      - do not warn about files which have a record in the Release file, but
        are not present on the CD to mirror the behavior of the other methods
        and to allow uncompressed indexes to be dropped without scaring users
+   * apt-pkg/pkgcachegen.cc:
+     - do not create 'native' (or now 'none') package structures as a side
+       effect of description translation parsing as it pollutes the cache
  
   -- David Kalnischkies <kalnischkies@gmail.com>  Sun, 26 Aug 2012 10:49:17 +0200