summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorAdam Conrad <adconrad@ubuntu.com>2012-11-06 15:54:31 -0700
committerColin Watson <cjwatson@canonical.com>2012-11-06 15:54:31 -0700
commit164f3b36c71d6e6b8bfaeb8635d26ff0aa1b7658 (patch)
treeaa4ec69bd99704512ad3f22f4f79ab444fe5b952 /debian
parentda0d83e38c5c2bd4770fcdf8125f540e7752c9c4 (diff)
* 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.
Diffstat (limited to 'debian')
-rw-r--r--debian/apt.auto-removal.sh7
-rw-r--r--debian/changelog9
2 files changed, 13 insertions, 3 deletions
diff --git a/debian/apt.auto-removal.sh b/debian/apt.auto-removal.sh
index f44a11384..b4a266216 100644
--- a/debian/apt.auto-removal.sh
+++ b/debian/apt.auto-removal.sh
@@ -80,9 +80,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 ccc1c2cd3..c75042c61 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+apt (0.9.7.6ubuntu2) raring; urgency=low
+
+ * 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.
+
+ -- Adam Conrad <adconrad@ubuntu.com> Tue, 06 Nov 2012 15:54:31 -0700
+
apt (0.9.7.6ubuntu1) raring; urgency=low
[ Michael Vogt ]