summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--configure.in2
-rw-r--r--debian/apt.conf.autoremove7
-rw-r--r--debian/changelog9
3 files changed, 10 insertions, 8 deletions
diff --git a/configure.in b/configure.in
index cb229a68d..9e9582251 100644
--- 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 63b69d5f6..713dcdda6 100644
--- 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 44fcb96fe..e5669830d 100644
--- 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