Просмотр исходного кода

* 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

Adam Conrad лет назад: 13
Родитель
Сommit
50dba2a9ad
4 измененных файлов с 12 добавлено и 5 удалено
  1. 1 1
      configure.in
  2. 4 3
      debian/apt.auto-removal.sh
  3. 6 0
      debian/changelog
  4. 1 1
      doc/apt-verbatim.ent

+ 1 - 1
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")

+ 4 - 3
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
   };

+ 6 - 0
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

+ 1 - 1
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">