[Pkg-dkms-commits] [SCM] Maintenance of the dkms package branch, master, updated. upstream/2.0.20.4-13-g4fd323d

[Giuseppe Iuculano]

The following commit has been merged in the master branch:
commit 4fd323d50edc07bbfebffea9ad74fdb6f6c6df78
Author: Giuseppe Iuculano <giuseppe at iuculano.it>
Date:   Thu Dec 25 11:48:57 2008 +0100

    debian/patches/10-lsb.patch: /etc/lsb-release is not present in Debian, so run run lsb_release
    
    /etc/lsb-release should only be interpreted by
    lsb_release and may not be present (it isn't in Debian).  dkms should
    run lsb_release -i -r to find the distributor name and release.

diff --git a/debian/patches/10-lsb.patch b/debian/patches/10-lsb.patch
new file mode 100644
index 0000000..4b9d2d8
--- /dev/null
+++ b/debian/patches/10-lsb.patch
@@ -0,0 +1,16 @@
+/etc/lsb-release is not present in Debian, so run run lsb_release
+--- a/dkms
++++ b/dkms
+@@ -300,6 +300,12 @@
+     if [ -r /etc/lsb-release ]; then
+ 	. /etc/lsb-release
+ 	LSB_RELEASE=1
++    else
++	if type lsb_release >/dev/null 2>&1; then
++		DISTRIB_ID=$(lsb_release -i -s)
++		DISTRIB_RELEASE=$(lsb_release -r -s)
++		LSB_RELEASE=1
++	fi
+     fi
+ 
+     if [ -n "${FEDORA_RELEASE}" ]; then
diff --git a/debian/patches/series b/debian/patches/series
index 2426c50..e7a9a09 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,3 +7,4 @@
 07-exit-if-build-fails.patch
 08-use_update-initramfs.patch
 09-lilo_detection.patch
+10-lsb.patch

-- 
Maintenance of the dkms package