* enable installation of recommends by default

* debian/apt.conf.ubuntu:
  - remove APT::Install-Recommends-Sections (no longer needed)
* merged from debian/sid, remaining changes:
  - authentication-reliable branch (to be merged into debian soon)
  - mirror:// uri branch (breaks ABI in debian, not merged yet)
  - apport failure reporting
  - show warning on apt-get source with 'Vcs-' header
  - proxy detection from gconf in apt.cron

diff --cc apt-pkg/init.cc
Simple merge

diff --cc debian/apt.conf.ubuntu
index 0489faf987e48295d3e32bbca1db7645072f2428,0000000000000000000000000000000000000000..d295aee2553432c2d52307ed7b1d22979e75aa7d
mode 100644,000000..100644
--- 1/debian/apt.conf.ubuntu
--- /dev/null
+++ b/debian/apt.conf.ubuntu
@@@ -1,10 -1,0 +1,3 @@@
-   Install-Recommends-Sections
-   { 
-       "metapackages"; 
-       "restricted/metapackages";
-       "universe/metapackages";
-       "multiverse/metapackages";
-   };
 +APT
 +{
 +};

diff --cc debian/changelog
index 1bf5cc9538ff77bc3f2c2df02baf76de2d1af1d8,0a42c92aedd95630261ee62a4129f250f7bf0da0..8c48f5f902b75582869b7212f295cce4e95b1e74
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,8 -1,5 +1,16 @@@
 -apt (0.7.14) UNRELEASED; urgency=low
 +apt (0.7.14ubuntu1) intrepid; urgency=low
  
-   * merged from debian/sid
 +  [ Michael Vogt ]
++  * enable installation of recommends by default
++  * debian/apt.conf.ubuntu:
++    - remove APT::Install-Recommends-Sections (no longer needed)
++  * merged from debian/sid, remaining changes:
++    - authentication-reliable branch (to be merged into debian soon)
++    - mirror:// uri branch (breaks ABI in debian, not merged yet)
++    - apport failure reporting
++    - show warning on apt-get source with 'Vcs-' header
++    - proxy detection from gconf in apt.cron
 +  
    [ Christian Perrier ]
    * Mark a message from dselect backend as translatable
      Thanks to Frédéric Bothamy for the patch