* debian/apt.conf.autoremove:

  - remove "linux-image" (and friends) from the auto-remove
    blacklist. we have the kernel fallback infrastructure now
    in intrepid (thanks to BenC)

diff --git a/configure.in b/configure.in
index cb229a68d7264fd53d1f427b1175ff9efaef8ce9..9e958225127a664d86abc738a4f72d2d1a34eb69 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -18,7 +18,7 @@ AC_CONFIG_AUX_DIR(buildlib)
 AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildlib/apti18n.h.in)
 
 dnl -- SET THIS TO THE RELEASE VERSION --
-AC_DEFINE_UNQUOTED(VERSION,"0.7.14ubuntu4")
+AC_DEFINE_UNQUOTED(VERSION,"0.7.14ubuntu5")
 PACKAGE="apt"
 AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE")
 AC_SUBST(PACKAGE)

diff --git a/debian/apt.conf.autoremove b/debian/apt.conf.autoremove
index 63b69d5f6607601ebacb5b06ad7f98f86fb26920..713dcdda67895f545fa00d068f33eae68738ba26 100644 (file)
--- a/debian/apt.conf.autoremove
+++ b/debian/apt.conf.autoremove
@@ -1,12 +1,5 @@
 APT
 {
-  NeverAutoRemove  
-  { 
-       "^linux-image.*";  
-       "^linux-restricted-modules.*";
-       "^linux-ubuntu-modules-.*";
-  };
-
   Never-MarkAuto-Sections
   { 
        "metapackages";

diff --git a/debian/changelog b/debian/changelog
index 44fcb96fe9e6b5ad029f843fa241d99354cc5cd4..e5669830dd07fa83372e4b8d996cded55a74e8b8 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+apt (0.7.14ubuntu6) UNRELEASED; urgency=low
+
+  * debian/apt.conf.autoremove:
+    - remove "linux-image" (and friends) from the auto-remove
+      blacklist. we have the kernel fallback infrastructure now
+      in intrepid (thanks to BenC)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 07 Aug 2008 16:28:05 +0200
+
 apt (0.7.14ubuntu5) intrepid; urgency=low
 
   * fix various -Wall warnings