* merged fixes from the debian-sid bzr branch:

* Simplified Chinese (Aron Xu). Closes: #594458
* Bulgarian (Damyan Ivanov). Closes: #594627
* Portuguese (Miguel Figueiredo). Closes: #594668
* Korean (Changwoo Ryu). Closes: #594809
* Portuguese (Américo Monteiro)
* cmdline/apt-cache.cc:
  - remove useless GetInitialize method
* cmdline/apt-get.cc:
  - remove direct calls of ReadMainList and use the wrapper instead
    to protect us from useless re-reads and two-times notice display
  - remove death code by removing unused GetInitialize
* apt-pkg/depcache.cc:
  - now that apt-get purge works on 'rc' packages let the MarkDelete
    pass this purge forward to the non-pseudo package for pseudos
* apt-pkg/contrib/fileutl.cc:
  - apply SilentlyIgnore also on files without an extension
* apt-pkg/contrib/configuration.cc:
  - fix autoremove by using correct config-option name and
    don't make faulty assumptions in error handling (Closes: #594689)
* apt-pkg/versionmatch.cc:
  - let the pin origin actually work as advertised in the manpage
    which means "" are optional and pinning a local archive does
    work - even if it is a non-flat archive (Closes: #594435)

diff --cc debian/changelog
index f9fbc43cc51c142249c12e923cd15ada7808402e,e37a5504fd3649030eced151b11064f86c00e9cc..ead815d33f2411117874d5e1e78c1c42896aee9e
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,31 -1,48 +1,66 @@@
 -apt (0.8.1) UNRELEASED; urgency=low
++apt (0.8.0ubuntu3) UNRELEASED; urgency=low
+ 
++  * merged fixes from the debian-sid bzr branch:
++  
+   [ Programs translations ]
 -  * Thai (Theppitak Karoonboonyanan). Closes: #592695
 -  * Russian (Yuri Kozlov). Closes: #594232
 -  * Slovak (Ivan Masár). Closes: #594255
 -  * Swedish (Daniel Nylander). Closes: #594241
 -  * Japanese (Kenshi Muto, Osamu Aoki). Closes: #594265
 -  * Italian (Milo Casagrande). Closes: #594238
 -  * Asturian (maacub). Closes: #594303
+   * Simplified Chinese (Aron Xu). Closes: #594458
+   * Bulgarian (Damyan Ivanov). Closes: #594627
+   * Portuguese (Miguel Figueiredo). Closes: #594668
+   * Korean (Changwoo Ryu). Closes: #594809
+ 
 -  [ Christian Perrier ]
 -  * Fix spelling error in cmdline/apt-get.cc. Thanks to Osamu Aoki
 -    Closes: #594211
 -
+   [ Manpages translations ]
+   * Portuguese (Américo Monteiro)
+ 
+   [ David Kalnischkies ]
+   * cmdline/apt-cache.cc:
 -    - show in madison command again also source packages (LP: #614589)
+     - remove useless GetInitialize method
+   * cmdline/apt-get.cc:
+     - remove direct calls of ReadMainList and use the wrapper instead
+       to protect us from useless re-reads and two-times notice display
+     - remove death code by removing unused GetInitialize
+   * apt-pkg/depcache.cc:
+     - now that apt-get purge works on 'rc' packages let the MarkDelete
+       pass this purge forward to the non-pseudo package for pseudos
+   * apt-pkg/contrib/fileutl.cc:
+     - apply SilentlyIgnore also on files without an extension
+   * apt-pkg/contrib/configuration.cc:
+     - fix autoremove by using correct config-option name and
+       don't make faulty assumptions in error handling (Closes: #594689)
+   * apt-pkg/versionmatch.cc:
+     - let the pin origin actually work as advertised in the manpage
+       which means "" are optional and pinning a local archive does
+       work - even if it is a non-flat archive (Closes: #594435)
+ 
+  -- Michael Vogt <mvo@debian.org>  Mon, 30 Aug 2010 11:53:30 +0200
+ 
 +apt (0.8.0ubuntu2) maverick; urgency=low
 +
 +  * merged fixes from the debian-sid bzr branch:
 +  
 +  [ Programs translations ]
 +  * Thai (Theppitak Karoonboonyanan). Closes: #592695
 +  * Russian (Yuri Kozlov). Closes: #594232
 +  * Slovak (Ivan Masár). Closes: #594255
 +  * Swedish (Daniel Nylander). Closes: #594241
 +  * Japanese (Kenshi Muto, Osamu Aoki). Closes: #594265
 +  * Italian (Milo Casagrande). Closes: #594238
 +  * Asturian (maacub). Closes: #594303
 +
 +  [ Christian Perrier ]
 +  * Fix spelling error in cmdline/apt-get.cc. Thanks to Osamu Aoki
 +    Closes: #594211
 +
 +  [ David Kalnischkies ]
 +  * show in madison command again also source packages (LP: #614589)
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 26 Aug 2010 18:56:23 +0200
 +
 +apt (0.8.0ubuntu1) maverick; urgency=low
 +
 +  * merged from debian/unstable
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 24 Aug 2010 21:39:06 +0200
 +
  apt (0.8.0) unstable; urgency=low
  
    [ Michael Vogt ]