diff options
| author | Adam Conrad <adconrad@ubuntu.com> | 2012-11-06 15:54:31 -0700 |
|---|---|---|
| committer | Colin Watson <cjwatson@canonical.com> | 2012-11-06 15:54:31 -0700 |
| commit | 164f3b36c71d6e6b8bfaeb8635d26ff0aa1b7658 (patch) | |
| tree | aa4ec69bd99704512ad3f22f4f79ab444fe5b952 | |
| parent | da0d83e38c5c2bd4770fcdf8125f540e7752c9c4 (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.
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | debian/apt.auto-removal.sh | 7 | ||||
| -rw-r--r-- | debian/changelog | 9 | ||||
| -rw-r--r-- | doc/apt-verbatim.ent | 2 |
4 files changed, 15 insertions, 5 deletions
diff --git a/configure.in b/configure.in index 5f2103872..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.7.6ubuntu1" +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 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 ] diff --git a/doc/apt-verbatim.ent b/doc/apt-verbatim.ent index b13c9b5ee..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.7.6ubuntu1"> +<!ENTITY apt-product-version "0.9.7.6ubuntu2"> <!-- Codenames for debian releases --> <!ENTITY oldstable-codename "squeeze"> |