* Fix up two things in debian/apt.auto-removal.sh:

  - Use exact matches with $-terminated regexes, so we don't get
    confusion between similarly-named kernel flavours.
  - Keep linux-backports-modules in sync with installed kernels.
Conflicts:
	configure.in
	debian/changelog
	doc/apt-verbatim.ent

diff --git a/configure.in b/configure.in
index 541d0e95fac2c43edc1a4500cbfb9680603a19cb..4c25ba5d45804af9ce8d177e5844221ecbca9146 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)
 
 PACKAGE="apt"
-PACKAGE_VERSION="0.9.8.1"
+PACKAGE_VERSION="0.9.7.6ubuntu2"
 PACKAGE_MAIL="APT Development Team <deity@lists.debian.org>"
 AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE")
 AC_DEFINE_UNQUOTED(PACKAGE_VERSION,"$PACKAGE_VERSION")

diff --git a/debian/apt.auto-removal.sh b/debian/apt.auto-removal.sh
index 17becd30e2b245577d992214df58ea49516f9b0a..8b0f1cf69d5e12f51cffc78fcdb91d641af20df9 100644 (file)
--- a/debian/apt.auto-removal.sh
+++ b/debian/apt.auto-removal.sh
@@ -81,9 +81,10 @@ APT
   {
 EOF
 for kernel in $kernels; do
-       echo "    \"^linux-image-$kernel.*\";" >> "$config_file".dpkg-new
-       echo "    \"^linux-image-extra-$kernel.*\";" >> "$config_file".dpkg-new
-       echo "    \"^linux-signed-image-$kernel.*\";" >> "$config_file".dpkg-new
+       echo "    \"^linux-image-${kernel}$\";" >> "$config_file".dpkg-new
+       echo "    \"^linux-image-extra-${kernel}$\";" >> "$config_file".dpkg-new
+       echo "    \"^linux-signed-image-${kernel}$\";" >> "$config_file".dpkg-new
+       echo "    \"^linux-backports-modules-.*-${kernel}$\";" >> "$config_file".dpkg-new
 done
 cat >> "$config_file".dpkg-new <<EOF
   };

diff --git a/debian/changelog b/debian/changelog
index d196bb136d33f77356e77ed3de3b49957cbdf0a8..185322bb62dfe4ab19ed084aa4747e543424f0d0 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,12 @@ apt (0.9.9.1) UNRELEASED; urgency=low
     newest kernel, so we don't fill /boot up with an unlimited number of
     kernels.  LP: #923876.
 
+  [ Adam Conrad ]
+  * Fix up two things in debian/apt.auto-removal.sh:
+    - Use exact matches with $-terminated regexes, so we don't get
+      confusion between similarly-named kernel flavours.
+    - Keep linux-backports-modules in sync with installed kernels.
+
  -- Michael Vogt <michael.vogt@ubuntu.com>  Fri, 05 Jul 2013 16:39:34 +0200
 
 apt (0.9.9) unstable; urgency=low

diff --git a/doc/apt-verbatim.ent b/doc/apt-verbatim.ent
index 1ab7b605659ff56d0e2547e85b0fefbbc695c6bc..c9bb061236715b1fcef04b0512d620fb45552bce 100644 (file)
--- a/doc/apt-verbatim.ent
+++ b/doc/apt-verbatim.ent
@@ -213,7 +213,7 @@
 ">
 
 <!-- this will be updated by 'prepare-release' -->
-<!ENTITY apt-product-version "0.9.8">
+<!ENTITY apt-product-version "0.9.7.6ubuntu2">
 
 <!-- Codenames for debian releases -->
 <!ENTITY oldstable-codename "squeeze">