[Pkg-dkms-commits] [SCM] Dynamic Kernel Module Support branch, master, updated. debian/2.2.0.1-2-3-g370ff7b

[Giuseppe Iuculano]

The following commit has been merged in the master branch:
commit 370ff7b9714e80e1577297210e5a9c8709412125
Author: Giuseppe Iuculano <iuculano at debian.org>
Date:   Fri Jul 15 16:42:49 2011 +0200

    Remove debian-lsb.patch. Now Ubuntu can sync from Debian

diff --git a/debian/patches/debian-lsb.patch b/debian/patches/debian-lsb.patch
deleted file mode 100644
index 4813ffb..0000000
--- a/debian/patches/debian-lsb.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-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
-@@ -341,9 +341,10 @@ distro_version()
-     # try the LSB-provided strings first
-     if [ -r /etc/lsb-release ]; then
- 	. /etc/lsb-release
--    elif type lsb_release >/dev/null 2>&1; then
--	DISTRIB_ID=$(lsb_release -i -s)
--	DISTRIB_RELEASE=$(lsb_release -r -s)
-+    else
-+       DISTRIB_ID=Debian
-+       DISTRIB_RELEASE=$(cat /etc/debian_version)
-+       LSB_RELEASE=1
-     fi
- 
-     case ${DISTRIB_ID} in
diff --git a/debian/patches/series b/debian/patches/series
index 948f67b..26238c9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-debian-lsb.patch
 kfreebsd.patch

-- 
Dynamic Kernel Module Support