[Pkg-dkms-commits] [SCM] Dynamic Kernel Module Support branch, master, updated. debian/2.1.1.2-4-3-g1732998

[Giuseppe Iuculano]

The following commit has been merged in the master branch:
commit 17329982ba66139c1f4de96bb42d76f4b32e4ac4
Author: Giuseppe Iuculano <iuculano at debian.org>
Date:   Wed Aug 4 14:47:29 2010 +0200

    Do not use lsb_release to determine the distribution, add a a static assignment
    
    Closes: #547353

diff --git a/debian/patches/debian-lsb.patch b/debian/patches/debian-lsb.patch
index 7829f45..af4fbee 100644
--- a/debian/patches/debian-lsb.patch
+++ b/debian/patches/debian-lsb.patch
@@ -1,12 +1,20 @@
-Set DISTRIB_ID=Debian in case lsb_release is missing
+Do not use lsb_release to determine the distribution, add a a static assignment
+
+This patch should not be merged upstream
 --- a/dkms
 +++ b/dkms
-@@ -367,6 +367,8 @@ function distro_version()
-         DISTRIB_ID=$(lsb_release -i -s)
-         DISTRIB_RELEASE=$(lsb_release -r -s)
+@@ -363,10 +363,10 @@ function distro_version()
+     if [ -r /etc/lsb-release ]; then
+         . /etc/lsb-release
          LSB_RELEASE=1
+-    elif type lsb_release >/dev/null 2>&1; then
+-        DISTRIB_ID=$(lsb_release -i -s)
+-        DISTRIB_RELEASE=$(lsb_release -r -s)
+-        LSB_RELEASE=1
 +    else
 +	DISTRIB_ID=Debian
++	DISTRIB_RELEASE=$(cat /etc/debian_version)
++	LSB_RELEASE=1
      fi
  
      case "${DISTRIB_ID}" in

-- 
Dynamic Kernel Module Support