debian/patches/dpkg_version_comparison.patch

   1 From d56874b3ff3fd3012ad8032d258ee080785955ba Mon Sep 17 00:00:00 2001
   2 From: Robert Millan <rmh@aybabtu.com>
   3 Date: Mon, 13 Jan 2014 12:12:52 +0000
   4 Subject: Improve handling of Debian kernel version numbers
   5
   6 Forwarded: not-needed
   7 Last-Update: 2013-12-20
   8
   9 Patch-Name: dpkg_version_comparison.patch
  10 ---
  11  util/grub-mkconfig_lib.in | 7 ++++---
  12  1 file changed, 4 insertions(+), 3 deletions(-)
  13
  14 diff --git a/util/grub-mkconfig_lib.in b/util/grub-mkconfig_lib.in
  15 index 60b31ca..3a4684e 100644
  16 --- a/util/grub-mkconfig_lib.in
  17 +++ b/util/grub-mkconfig_lib.in
  18 @@ -238,8 +238,9 @@ version_test_numeric ()
  19
  20  version_test_gt ()
  21  {
  22 -  version_test_gt_a="`echo "$1" | sed -e "s/[^-]*-//"`"
  23 -  version_test_gt_b="`echo "$2" | sed -e "s/[^-]*-//"`"
  24 +  version_test_gt_sedexp="s/[^-]*-//;s/[._-]\(pre\|rc\|test\|git\|old\|trunk\)/~\1/g"
  25 +  version_test_gt_a="`echo "$1" | sed -e "$version_test_gt_sedexp"`"
  26 +  version_test_gt_b="`echo "$2" | sed -e "$version_test_gt_sedexp"`"
  27    version_test_gt_cmp=gt
  28    if [ "x$version_test_gt_b" = "x" ] ; then
  29      return 0
  30 @@ -249,7 +250,7 @@ version_test_gt ()
  31      *.old:*) version_test_gt_a="`echo "$version_test_gt_a" | sed -e 's/\.old$//'`" ; version_test_gt_cmp=gt ;;
  32      *:*.old) version_test_gt_b="`echo "$version_test_gt_b" | sed -e 's/\.old$//'`" ; version_test_gt_cmp=ge ;;
  33    esac
  34 -  version_test_numeric "$version_test_gt_a" "$version_test_gt_cmp" "$version_test_gt_b"
  35 +  dpkg --compare-versions "$version_test_gt_a" "$version_test_gt_cmp" "$version_test_gt_b"
  36    return "$?"
  37  }
  38