diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2006-09-07 11:52:58 +0200 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2006-09-07 11:52:58 +0200 |
| commit | 3a089a0178ee7b3adff28dcc8749735898201e27 (patch) | |
| tree | 94f379647920e4782308f1e01f7a7cf0e973a850 /debian | |
| parent | 94915e3424601c8fa935c527122d65f1f0878fe2 (diff) | |
| parent | 1d7229332a7707e9abb341a7ce75ce332df54420 (diff) | |
* apt-pkg/depcache.cc:
- merged from install-recommends
* debian/apt.conf.ubuntu:
- added "APT::Install-Recommends-Section" to "metapackages"
* renamed apt.conf.autoremove -> apt.conf.ubuntu
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/apt.conf.ubuntu (renamed from debian/apt.conf.autoremove) | 2 | ||||
| -rw-r--r-- | debian/changelog | 9 | ||||
| -rwxr-xr-x | debian/rules | 2 |
3 files changed, 10 insertions, 3 deletions
diff --git a/debian/apt.conf.autoremove b/debian/apt.conf.ubuntu index 98143ce9a..8d095f17e 100644 --- a/debian/apt.conf.autoremove +++ b/debian/apt.conf.ubuntu @@ -5,4 +5,6 @@ APT "^linux-image.*"; "^linux-restricted-modules.*"; }; + + Install-Recommends-Section "metapackages"; }; diff --git a/debian/changelog b/debian/changelog index d8f90ba40..0bd5e4532 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,9 +4,14 @@ apt (0.6.45ubuntu6) edgy; urgency=low * cmdline/apt-get.cc: - always show auto-removable packages and give a hint how to remove them - * debian/apt.conf.autoremove: + * debian/apt.conf.ubuntu: - exlucde linux-image and linux-restricted-modules from ever being auto-removed + - added "metapackages" as the section we want to install recommends + by default + * apt-pkg/depcache.cc: + - added support to turn install-recommends selectively on/off by + section [Ian Jackson] * Tests pass without code changes! Except that we need this: * Bump cache file major version to force rebuild so that Breaks @@ -17,7 +22,7 @@ apt (0.6.45ubuntu6) edgy; urgency=low * Initial draft of `Breaks' implementation. Appears to compile, but as yet *completely untested*. - -- + -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 7 Sep 2006 11:50:52 +0200 apt (0.6.45ubuntu5) edgy; urgency=low diff --git a/debian/rules b/debian/rules index ffc23402e..2007370c4 100755 --- a/debian/rules +++ b/debian/rules @@ -211,7 +211,7 @@ apt: build debian/shlibs.local cp debian/bugscript debian/$@/usr/share/bug/apt/script cp share/ubuntu-archive.gpg debian/$@/usr/share/$@ - cp debian/apt.conf.autoremove debian/$@/etc/apt/apt.conf.d/01autoremove + cp debian/apt.conf.ubuntu debian/$@/etc/apt/apt.conf.d/01ubuntu # head -n 500 ChangeLog > debian/ChangeLog # make rosetta happy and remove pot files in po/ (but leave stuff |