* Translations:

  - French corrected (remove awful use of first person)
  - Finnish updated. Closes: #508449
* 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)
* buildlib/config.{sub,guess}:
  - Renewed. This fixes lintian errors.
* doc/apt.conf.5.xml, debian/apt-transport-https:
  - Documented briefly 'APT::https' group of options. (Closes: #507398)
  - Applied patch from Daniel Burrows to document 'Debug' group of options.
    (Closes: #457265)
  - Mentioned 'APT::Periodic' and 'APT::Archives' groups of options.
    (Closes: #438559)
  - Mentioned '/* ... */' comments. (Closes: #507601)
* merged "install-recommends" branch (ABI break):
  - new "--install-recommends"
  - install new recommends on "upgrade" if --install-recommends is
    given
  - new "--fix-policy" option to install all packages with unmet
    important dependencies (usefull with --install-recommends to
    see what not-installed recommends are on the system)
  - fix of recommended packages display (only show CandidateVersion
    fix or-group handling)
* merged "install-task" branch (use with "apt-get install taskname^")

diff --cc cmdline/apt-get.cc
Simple merge

diff --cc debian/changelog
index 6abba009666be83cffb6e80ef479fb254f0019ad,35a8fb2b4f68e9236546d0c5d6425770aa2fba82..f15652d0bcfb2d548a9c8eaae03958d1463aadea
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,30 -1,47 +1,53 @@@
 -apt (0.7.20) unstable; urgency=low
 +apt (0.7.19ubuntu2) jaunty; urgency=low
 +
 +  [ Michael Vogt ]
 +  * 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
 +
++  [ Christian Perrier ]
++  * Translations:
++    - French corrected (remove awful use of first person) 
++    - Finnish updated. Closes: #508449 
+ 
+   [ Eugene V. Lyubimkin ]
 -  * debian/changelog:
 -    - Fixed place of 'merged install-recommends and install-task branches'
 -      from 0.6.46.1 to 0.7.0. (Closes: #439866)
++  * 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)
+   * buildlib/config.{sub,guess}:
+     - Renewed. This fixes lintian errors.
+   * doc/apt.conf.5.xml, debian/apt-transport-https:
+     - Documented briefly 'APT::https' group of options. (Closes: #507398)
+     - Applied patch from Daniel Burrows to document 'Debug' group of options.
+       (Closes: #457265)
+     - Mentioned 'APT::Periodic' and 'APT::Archives' groups of options.
+       (Closes: #438559)
+     - Mentioned '/* ... */' comments. (Closes: #507601)
+ 
 -  [ Michael Vogt ]
 -  * 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.  
 -    Thanks to Aaron Haviland, closes: #448743
 -
 -  [ Christian Perrier ]
 -  * Translations:
 -    - Finnish updated. Closes: #508449 
+ 
 - -- Eugene V. Lyubimkin <jackyf.devel@gmail.com>  Sat, 06 Dec 2008 20:57:00 +0200
 +  [ Ian Weisser ]
 +  * /apt-pkg/deb/debsystem.cc:
 +    - add 'sudo' to the error message to "run 'dpkg --configure -a'"
 +      (LP: #52697)
  
 -apt (0.7.20~exp2) unstable; urgency=low
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 16 Dec 2008 06:59:17 +0100
  
 -  [ 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)
 +apt (0.7.19ubuntu1) jaunty; urgency=low
  
 -  [ Christian Perrier ]
 -  * Translations:
 -    - French corrected (remove awful use of first person) 
 +  * merge from debian
  
 - -- Michael Vogt <mvo@debian.org>  Tue, 02 Dec 2008 20:30:14 +0100
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 24 Nov 2008 10:52:20 +0100
  
  apt (0.7.19) unstable; urgency=low
  

diff --cc debian/rules
Simple merge