diff options
| author | Michael Vogt <mvo@debian.org> | 2010-06-10 14:01:18 +0200 |
|---|---|---|
| committer | Michael Vogt <mvo@debian.org> | 2010-06-10 14:01:18 +0200 |
| commit | e934f8c63aabf4ff94962a4602c143b52b19b3cb (patch) | |
| tree | 8f4774cc300c0621cc4532b53eef2a04e5e56b3c /debian | |
| parent | 189bb640d2443a5fcaade2ce169429c629ba3148 (diff) | |
| parent | 97f4026d93a85838439263d30146c3ad25fef474 (diff) | |
merged from david
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/apt.conf.autoremove | 21 | ||||
| -rw-r--r-- | debian/changelog | 12 |
2 files changed, 20 insertions, 13 deletions
diff --git a/debian/apt.conf.autoremove b/debian/apt.conf.autoremove index 2f00b9f8b..b3f4a3edd 100644 --- a/debian/apt.conf.autoremove +++ b/debian/apt.conf.autoremove @@ -1,9 +1,11 @@ APT { - NeverAutoRemove + NeverAutoRemove { - "^linux-firmware$"; - "^linux-image.*"; + "^firmware-linux.*"; + "^linux-firmware$"; + "^linux-image.*"; + "^kfreebsd-image.*"; "^linux-restricted-modules.*"; "^linux-ubuntu-modules-.*"; }; @@ -11,13 +13,12 @@ APT Never-MarkAuto-Sections { "metapackages"; - "restricted/metapackages"; - "universe/metapackages"; - "multiverse/metapackages"; + "restricted/metapackages"; + "universe/metapackages"; + "multiverse/metapackages"; "oldlibs"; - "restricted/oldlibs"; - "universe/oldlibs"; - "multiverse/oldlibs"; - + "restricted/oldlibs"; + "universe/oldlibs"; + "multiverse/oldlibs"; }; }; diff --git a/debian/changelog b/debian/changelog index 9135d523b..cfb7c814f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -apt (0.7.26~exp6) UNRELEASED; urgency=low +apt (0.7.26~exp6) experimental; urgency=low [ Michael Vogt ] * merge the remaining Ubuntu change: @@ -8,7 +8,7 @@ apt (0.7.26~exp6) UNRELEASED; urgency=low that use round robin DNS) - support Original-Maintainer in RewritePackageOrder - enable cdrom autodetection via libudev by default - - show messsage about Vcs in use when apt-get source is run for + - show message about Vcs in use when apt-get source is run for packages maintained in a Vcs - better support transitional packages with mark auto-installed. when the transitional package is in "oldlibs" the new package @@ -47,6 +47,7 @@ apt (0.7.26~exp6) UNRELEASED; urgency=low - add a constant Exists check for MetaKeys * apt-pkg/acquire-item.cc: - do not try PDiff if it is not listed in the Meta file + - sent Last-Modified header also for Translation files * apt-pkg/cacheiterator.h: - let pkgCache::Iterator inherent std::iterator * ftparchive/writer.h: @@ -81,8 +82,13 @@ apt (0.7.26~exp6) UNRELEASED; urgency=low looking code copycat from wget * ftparchive/writer.cc: - add ValidTime option to generate a Valid-Until header in Release file + * apt-pkg/policy.cc: + - get the candidate right for a not-installed pseudo package if + his non-pseudo friend is installed + * apt-pkg/indexcopy.cc: + - move the gpg codecopy to a new method and use it also in methods/gpgv.cc - -- David Kalnischkies <kalnischkies@gmail.com> Wed, 09 Jun 2010 10:52:31 +0200 + -- David Kalnischkies <kalnischkies@gmail.com> Wed, 09 Jun 2010 21:15:46 +0200 apt (0.7.26~exp5) experimental; urgency=low |