From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Mon, 5 May 2008 09:44:45 +0000 (+0200)
Subject: * enable installation of recommends by default
X-Git-Tag: 0.7.24ubuntu1~69
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/113d2d69ce824c4eeec5d58636c32d56aacf237e

* 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
---

113d2d69ce824c4eeec5d58636c32d56aacf237e
diff --cc debian/apt.conf.ubuntu
index 0489faf98,000000000..d295aee25
mode 100644,000000..100644
--- a/debian/apt.conf.ubuntu
+++ b/debian/apt.conf.ubuntu
@@@ -1,10 -1,0 +1,3 @@@
 +APT
 +{
-   Install-Recommends-Sections
-   { 
- 	"metapackages"; 
- 	"restricted/metapackages";
- 	"universe/metapackages";
- 	"multiverse/metapackages";
-   };
 +};
diff --cc debian/changelog
index 1bf5cc953,0a42c92ae..8c48f5f90
--- a/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
  
 +  [ Michael Vogt ]
-   * merged from debian/sid
++  * 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