diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2008-05-05 11:44:45 +0200 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2008-05-05 11:44:45 +0200 |
| commit | 113d2d69ce824c4eeec5d58636c32d56aacf237e (patch) | |
| tree | c05e2d1889aa8fc0e25f360cd429f3ada62d20d1 | |
| parent | a2ec4d22dd77a363cd5b1f8b55ed34ba88331396 (diff) | |
| parent | d22d41ff6ffb978dcd0e867117617956bfe97274 (diff) | |
* 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
| -rw-r--r-- | apt-pkg/init.cc | 2 | ||||
| -rw-r--r-- | debian/apt.conf.ubuntu | 7 | ||||
| -rw-r--r-- | debian/changelog | 10 |
3 files changed, 10 insertions, 9 deletions
diff --git a/apt-pkg/init.cc b/apt-pkg/init.cc index dc6b7e976..c0384cd45 100644 --- a/apt-pkg/init.cc +++ b/apt-pkg/init.cc @@ -35,7 +35,7 @@ bool pkgInitConfig(Configuration &Cnf) // General APT things Cnf.Set("APT::Architecture", COMMON_ARCH); Cnf.Set("APT::Build-Essential::", "build-essential"); - Cnf.Set("APT::Install-Recommends", false); + Cnf.Set("APT::Install-Recommends", true); Cnf.Set("APT::Install-Suggests", false); Cnf.Set("Dir","/"); diff --git a/debian/apt.conf.ubuntu b/debian/apt.conf.ubuntu index 0489faf98..d295aee25 100644 --- a/debian/apt.conf.ubuntu +++ b/debian/apt.conf.ubuntu @@ -1,10 +1,3 @@ APT { - Install-Recommends-Sections - { - "metapackages"; - "restricted/metapackages"; - "universe/metapackages"; - "multiverse/metapackages"; - }; }; diff --git a/debian/changelog b/debian/changelog index 1bf5cc953..8c48f5f90 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,15 @@ 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 |