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

[David Paleino]

The following commit has been merged in the master branch:
commit 1a137939d17787d81c1505be98a3b6a2844c5acc
Author: David Paleino <d.paleino at gmail.com>
Date:   Fri Dec 26 14:55:31 2008 +0100

    Patches refreshed to cleanly apply

diff --git a/debian/patches/09-lilo_detection.patch b/debian/patches/09-lilo_detection.patch
index 074830c..02806b2 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
 --- dkms.orig/dkms
 +++ dkms/dkms
-@@ -271,7 +271,7 @@
+@@ -272,7 +272,7 @@
      fi
  
      # Rerun lilo if necessary
diff --git a/debian/patches/10-lsb.patch b/debian/patches/10-lsb.patch
index b64400e..7ab8f27 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
 --- dkms.orig/dkms
 +++ dkms/dkms
-@@ -316,6 +316,12 @@
+@@ -317,6 +317,12 @@
      if [ -r /etc/lsb-release ]; then
  	. /etc/lsb-release
  	LSB_RELEASE=1
@@ -14,7 +14,7 @@
      fi
  
      if [ -n "${FEDORA_RELEASE}" ]; then
-@@ -361,6 +367,7 @@
+@@ -362,6 +368,7 @@
  	sles*) echo "/updates" && return ;;
  	suse*) echo "/updates" && return ;;
  	Ubuntu*) echo "/updates/dkms" && return ;;

-- 
Maintenance of the dkms package