merge the latest debian-sid branch

diff --cc configure.in
index d8de015,b6e5d6b..ed31095
--- 1/configure.in
--- 2/configure.in
+++ b/configure.in
@@@ -18,7 -18,7 +18,7 @@@ AC_CONFIG_AUX_DIR(buildlib
  AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildlib/apti18n.h.in)
  
  dnl -- SET THIS TO THE RELEASE VERSION --
- AC_DEFINE_UNQUOTED(VERSION,"0.7.19ubuntu2")
 -AC_DEFINE_UNQUOTED(VERSION,"0.7.20.2")
++AC_DEFINE_UNQUOTED(VERSION,"0.7.20.2ubuntu1")
  PACKAGE="apt"
  AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE")
  AC_SUBST(PACKAGE)

diff --cc debian/changelog
index bfbe6be,dfc1831..a21c383
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,55 -1,41 +1,76 @@@
- apt (0.7.19ubuntu3) jaunty; urgency=low
 -apt (0.7.20.3) UNRELEASED; urgency=low
++apt (0.7.20.2ubuntu1) jaunty; urgency=low
  
-   * apt-inst/contrib/arfile.cc:
-     - support members ending with '/' as well (thanks to Michal Cihr,
-       closes: #500988)
+   [ Christian Perrier ]
+   * Translations:
+     - bg.po. Closes: #513211
+     - zh_TW.po. Closes: #513311
+     - nb.po. Closes: #513843
++  
 +  [ Michael Vogt ]
++  * merged from the debian-sid branch
++  * [ABI break] merge support for http redirects, thanks to
++    Jeff Licquia and Anthony Towns
++  * [ABI break] use int for the package IDs (thanks to Steve Cotton)
 +  * apt-pkg/contrib/strutl.cc:
 +    - fix TimeToStr i18n (LP: #289807)
-   * [ABI break] merge support for http redirects, thanks to
-     Jeff Licquia and Anthony Towns
-   * [ABI break] use int for the package IDs (thanks to Steve Cotton)
 +  * debian/apt.conf.autoremove:
 +    - readd "linux-image" (and friends) to the auto-remove
 +     blacklist
 +  * fix some i18n issues (thanks to  Gabor Kelemen)
 +    LP: #263089
 +  * apt-pkg/deb/dpkgpm.cc:
 +    - filter "ENOMEM" errors when creating apport reports 
 +  * cmdline/apt-get.cc:
 +    - fix "apt-get source pkg=ver" if binary name != source name
 +      (LP: #202219)
 +  * apt-pkg/indexrecords.cc:
 +    - fix some i18n issues
 +  * apt-pkg/contrib/strutl.h:
 +    - add new strprintf() function to make i18n strings easier
 +  * apt-pkg/dev/debsystem.cc:
 +    - add missing apti18n.h header
 - -- Michael Vogt <mvo@debian.org>  Sun, 08 Feb 2009 11:47:48 +0100
 +
++  [ Dereck Wonnacott ]
++  * Clarify the --help for 'purge' (LP: #243948)
++
++  [ Ian Weisser ]
++  * /apt-pkg/deb/debsystem.cc:
++    - add 'sudo' to the error message to "run 'dpkg --configure -a'"
++      (LP: #52697)
++
++ -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 16 Dec 2008 06:59:17 +0100
+ 
++
++ -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 09 Feb 2009 14:21:05 +0100
+ 
+ apt (0.7.20.2) unstable; urgency=medium
+ 
+   [ Eugene V. Lyubimkin ]
+   * Urgency set to medium due to RC bug fix.
+   * doc/apt.ent, apt-get.8.xml:
+     - Fix invalid XML entities. (Closes: #514402)
+ 
+  -- Eugene V. Lyubimkin <jackyf.devel@gmail.com>  Sat, 07 Feb 2009 16:48:21 +0200
+ 
+ apt (0.7.20.1) unstable; urgency=low
+ 
+   [ Michael Vogt ]
+   * apt-pkg/pkgcachegen.cc:
+     - fix apt-cache search for localized description 
+       (closes: #512110)
+   
    [ Christian Perrier ]
    * Translations:
-     - Galician updated. Closes: #509151
-     - Catalan updated. Closes: #509375
-     - Vietnamese updated. Closes: #509422
-     - Traditional Chinese added. Closes: #510664
-     - French corrected (remove awful use of first person) 
-     - Finnish updated. Closes: #508449 
+     - fr.po: fix spelling error to "défectueux". Thanks to Thomas Péteul.
  
-   [ Eugene V. Lyubimkin ]  
-   * COPYING:
-     - Actualized. Removed obsolete Qt section, added GPLv2 clause.
-       (Closes: #440049, #509337)
+  -- Michael Vogt <mvo@debian.org>  Tue, 20 Jan 2009 09:35:05 +0100
  
-   [ Dereck Wonnacott ]
-   * Clarify the --help for 'purge' (LP: #243948)
+ apt (0.7.20) unstable; urgency=low
  
    [ Eugene V. Lyubimkin ]
-   * doc/examples/sources.list:
-     - Removed obsolete commented non-us deb-src entry, replaced it with
-       'deb-src security.debian.org' one. (Closes: #411298)
-   * apt-pkg/contrib/mmap.cc:
-     - Added instruction how to work around MMap error in MMap error message.
-       (Closes: #385674, 436028)
+   * debian/changelog:
+     - Fixed place of 'merged install-recommends and install-task branches'
+       from 0.6.46.1 to 0.7.0. (Closes: #439866)
    * buildlib/config.{sub,guess}:
      - Renewed. This fixes lintian errors.
    * doc/apt.conf.5.xml, debian/apt-transport-https:
@@@ -59,20 -45,37 +80,43 @@@
      - Mentioned 'APT::Periodic' and 'APT::Archives' groups of options.
        (Closes: #438559)
      - Mentioned '/* ... */' comments. (Closes: #507601)
+   * doc/examples/sources.list:
+     - Removed obsolete commented non-us deb-src entry, replaced it with
+       'deb-src security.debian.org' one. (Closes: #411298)
+   * apt-pkg/contrib/mmap.cc:
+     - Added instruction how to work around MMap error in MMap error message.
+       (Closes: #385674, 436028)
+   * COPYING:
+     - Actualized. Removed obsolete Qt section, added GPLv2 clause.
+       (Closes: #440049, #509337)
  
-   [ Ian Weisser ]
-   * /apt-pkg/deb/debsystem.cc:
-     - add 'sudo' to the error message to "run 'dpkg --configure -a'"
-       (LP: #52697)
+   [ Michael Vogt ]
 -  * add option to "apt-get build-dep" to mark the needed 
 -    build-dep packages as automatic installed. 
++  * add option to "apt-get build-dep" to mark the needed
++    build-dep packages as automatic installed.
+     This is controlled via the value of
 -    APT::Get::Build-Dep-Automatic and is set "false" by default.  
++    APT::Get::Build-Dep-Automatic and is set "false" by default.
+     Thanks to Aaron Haviland, closes: #448743
+   * apt-inst/contrib/arfile.cc:
+     - support members ending with '/' as well (thanks to Michal Cihr,
+       closes: #500988)
  
-  -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 16 Dec 2008 06:59:17 +0100
+   [ Christian Perrier ]
+   * Translations:
 -    - Finnish updated. Closes: #508449 
++    - Finnish updated. Closes: #508449
+     - Galician updated. Closes: #509151
+     - Catalan updated. Closes: #509375
+     - Vietnamese updated. Closes: #509422
+     - Traditional Chinese added. Closes: #510664
 -    - French corrected (remove awful use of first person) 
++    - French corrected (remove awful use of first person)
+ 
+  -- Michael Vogt <mvo@debian.org>  Mon, 05 Jan 2009 08:59:20 +0100
  
 +apt (0.7.19ubuntu1) jaunty; urgency=low
 +
 +  * merge from debian
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 24 Nov 2008 10:52:20 +0100
 +
  apt (0.7.19) unstable; urgency=low
  
    [ Eugene V. Lyubimkin ]

diff --cc doc/apt-get.8.xml
Simple merge