Merge remote-tracking branch 'upstream/debian/jessie' into debian/sid

[apt.git] / debian / apt.conf.autoremove

diff --git a/debian/apt.conf.autoremove b/debian/apt.conf.autoremove
index ebe49c7cd4b16bd5bc5a405add6b3a5bd8494bb3..fc02350aee5706332248674d0a537eb4047b3757 100644 (file)
--- a/debian/apt.conf.autoremove
+++ b/debian/apt.conf.autoremove
@@ -4,11 +4,26 @@ APT
   {
        "^firmware-linux.*";
        "^linux-firmware$";
   {
        "^firmware-linux.*";
        "^linux-firmware$";

-       "^linux-image.*";
-       "^kfreebsd-image.*";
-       "^linux-restricted-modules.*";
-       "^linux-ubuntu-modules-.*";
-       "^gnumach$";
+  };
+
+  VersionedKernelPackages
+  {
+       # linux kernels
+       "linux-image";
+       "linux-headers";
+       "linux-image-extra";
+       "linux-signed-image";
+       # kfreebsd kernels
+       "kfreebsd-image";
+       "kfreebsd-headers";
+       # hurd kernels
+       "gnumach-image";
+       # (out-of-tree) modules
+       ".*-modules";
+       ".*-kernel";
+       "linux-backports-modules-.*";
+        # tools
+        "linux-tools";

   };
 
   Never-MarkAuto-Sections
   };
 
   Never-MarkAuto-Sections