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 2f00b9f8ba5a187f45b7a8601aeb9bee72668569..fc02350aee5706332248674d0a537eb4047b3757 100644 (file)
--- a/debian/apt.conf.autoremove
+++ b/debian/apt.conf.autoremove
@@ -1,23 +1,40 @@
 APT
 {
-  NeverAutoRemove  
+  NeverAutoRemove
   {
-        "^linux-firmware$";
-       "^linux-image.*";  
-       "^linux-restricted-modules.*";
-       "^linux-ubuntu-modules-.*";
+       "^firmware-linux.*";
+       "^linux-firmware$";
+  };
+
+  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
   {
        "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";
   };
 };