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

[David Paleino]

The following commit has been merged in the master branch:
commit 20e7840ff291631ab3adba5fa16a619814c846ff
Author: David Paleino <d.paleino at gmail.com>
Date:   Thu Dec 25 21:34:34 2008 +0100

    Patches refreshed

diff --git a/debian/patches/09-lilo_detection.patch b/debian/patches/09-lilo_detection.patch
index 3411316..074830c 100644
--- a/debian/patches/09-lilo_detection.patch
+++ b/debian/patches/09-lilo_detection.patch
@@ -1,7 +1,7 @@
 check /etc/kernel-img.conf to find if user is using grub
---- a/dkms
-+++ b/dkms
-@@ -255,7 +255,7 @@
+--- dkms.orig/dkms
++++ dkms/dkms
+@@ -271,7 +271,7 @@
      fi
  
      # Rerun lilo if necessary
diff --git a/debian/patches/10-lsb.patch b/debian/patches/10-lsb.patch
index 24f1ae2..b64400e 100644
--- a/debian/patches/10-lsb.patch
+++ b/debian/patches/10-lsb.patch
@@ -1,7 +1,7 @@
 /etc/lsb-release is not present in Debian, so run run lsb_release
---- a/dkms
-+++ b/dkms
-@@ -300,6 +300,12 @@
+--- dkms.orig/dkms
++++ dkms/dkms
+@@ -316,6 +316,12 @@
      if [ -r /etc/lsb-release ]; then
  	. /etc/lsb-release
  	LSB_RELEASE=1
@@ -14,7 +14,7 @@
      fi
  
      if [ -n "${FEDORA_RELEASE}" ]; then
-@@ -345,6 +351,7 @@
+@@ -361,6 +367,7 @@
  	sles*) echo "/updates" && return ;;
  	suse*) echo "/updates" && return ;;
  	Ubuntu*) echo "/updates/dkms" && return ;;

-- 
Maintenance of the dkms package