[Pkg-dkms-commits] [SCM] Dynamic Kernel Module Support branch, master, updated. debian/2.1.1.2-5-2-g935ae61

[Michael Gilbert]

The following commit has been merged in the master branch:
commit 935ae61aad2e8b7be8f71eee7b1417e98f1ee803
Author: Michael Gilbert <michael.s.gilbert at gmail.com>
Date:   Tue Aug 17 23:50:54 2010 -0400

    Check for debhelper when using 'dkms mkdeb' (closes: #592863)

diff --git a/debian/patches/mkdeb.patch b/debian/patches/mkdeb.patch
new file mode 100644
index 0000000..4eebe3d
--- /dev/null
+++ b/debian/patches/mkdeb.patch
@@ -0,0 +1,18 @@
+Description: Check for debhelper installation when using 'dkms mkdeb'
+Author: Michael Gilbert <michael.s.gilbert at gmail.com>
+Bug-Debian: http://bugs.debian.org/592863
+--- dkms-2.1.1.2.orig/dkms
++++ dkms-2.1.1.2/dkms
+@@ -3250,6 +3250,12 @@ function make_debian_test_depends()
+     if ! which dpkg-buildpackage >/dev/null 2>&1 ; then
+         INSTALL_PACKAGES="dpkg-dev $INSTALL_PACKAGES"
+     fi
++    
++    # Check whether debhelper commands are present
++    if ! which dh_testdir >/dev/null 2>&1 ; then
++        INSTALL_PACKAGES="debhelper $INSTALL_PACKAGES"
++    fi
++
+     echo "$INSTALL_PACKAGES"
+ }
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 36bc11b..266a3a6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,3 +8,4 @@ debian-lsb.patch
 framework_conf.patch
 mkdsc.patch
 make-logging-fix.patch
+mkdeb.patch

-- 
Dynamic Kernel Module Support