summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--configure.in2
-rw-r--r--debian/apt.auto-removal.sh7
-rw-r--r--debian/changelog6
-rw-r--r--doc/apt-verbatim.ent2
4 files changed, 12 insertions, 5 deletions
diff --git a/configure.in b/configure.in
index 541d0e95f..4c25ba5d4 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)
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 17becd30e..8b0f1cf69 100644
--- 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 d196bb136..185322bb6 100644
--- 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 1ab7b6056..c9bb06123 100644
--- 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">