diff -Nru dkms-2.1.1.2/debian/changelog dkms-2.1.1.2/debian/changelog --- dkms-2.1.1.2/debian/changelog 2010-05-13 13:41:11.000000000 +0000 +++ dkms-2.1.1.2/debian/changelog 2011-06-16 06:12:26.000000000 +0000 @@ -1,14 +1,87 @@ -dkms (2.1.1.2-2fakesync2) lucid; urgency=low +dkms (2.1.1.2-6yavdr0~lucid) lucid; urgency=medium - * Added dkms-gen-changes.diff + dkms-performance.diff + * add - -- Holger Schvestka Thu, 13 May 2010 15:40:03 +0200 + -- Holger Schvestka Sun, 22 May 2011 19:01:02 +0200 -dkms (2.1.1.2-2fakesync1) lucid; urgency=low +dkms (2.1.1.2-5ubuntu1) natty; urgency=low - * Fakesync with debian (LP: #534843) + * Merge from Debian unstable, remaining changes: + - debian/control: + - depend on patch instead of recommending it, if its missing + the "patches" feature of dkms will no longer work and that + will cause build failures (LP: #653899) + - debian/patches/improve-the-logic-behind-kernels-detection.patch: + - Before using the current kernel we need to make sure that this + kernel doesn't belong to the host of a chroot and we should + also be more careful when adding kernels to the candidates + list (LP: #602408). + + -- Benjamin Drung Mon, 25 Oct 2010 01:32:41 +0200 + +dkms (2.1.1.2-5) unstable; urgency=low + + * [bd3b35d] Set DISTRIB_ID=Debian in case lsb_release is missing + * [2465627] Removed lsb-release from Pre-Depends + * [1732998] Do not use lsb_release to determine the distribution, add + a static assignment (Closes: #547353) + * [d00ff09] Do not return error if /etc/dkms/framework.conf is missing + (LP: #613407) - thanks to pasadrul + * [618efc8] Copy from the right directory with mkdsc and copy + source.changes when building with mkdsc (LP: #611652) - thanks to + David Henningsson + * [f23d6b0] Bump to standards-version 3.9.1, no changes needed + + -- Giuseppe Iuculano Wed, 04 Aug 2010 16:03:16 +0200 + +dkms (2.1.1.2-4) unstable; urgency=low + + * [f649aa1] Added coreutils >= 7.4 in Depends (Closes: #586356) + * [01c7c14] Remove old modules when removing a kernel (Closes: #586724) + - thanks to Jan Muszynski + * [b6182ba] Bump to Standards-Version 3.9.0, no changes needed + * [eaeddb3] dkms_common.postinst: handle dkms build error gracefully + by skipping build for the non matching kernels. (Closes: #588585) - + thanks to Jan-Marek Glogowski + * [73533c2] Promote lsb-release to Pre-Depends (Closes: #589308) - -- Mario Limonciello Sun, 28 Mar 2010 00:45:36 -0500 + -- Giuseppe Iuculano Sat, 17 Jul 2010 13:23:43 +0200 + +dkms (2.1.1.2-3ubuntu1.1) maverick-proposed; urgency=low + + * debian/control: + - depend on patch instead of recommending it, if its missing + the "patches" feature of dkms will no longer work and that + will cause build failures (LP: #653899) + + -- Michael Vogt Mon, 11 Oct 2010 09:27:28 +0200 + +dkms (2.1.1.2-3ubuntu1) maverick; urgency=low + + * debian/patches/improve-the-logic-behind-kernels-detection.patch: + - Before using the current kernel we need to make sure that this + kernel doesn't belong to the host of a chroot and we should + also be more careful when adding kernels to the candidates + list (LP: #602408). + + -- Alberto Milone Thu, 23 Sep 2010 18:59:55 +0200 + +dkms (2.1.1.2-3) unstable; urgency=low + + [ Michael Gilbert ] + * Update to source format 3 (quilt) for better patch management/handling. + * Improve the status info displayed during the kernel postinst, and + provide informative/useful messages when things go awry. + * Fix bashism in dkms_common.postinst (closes: #581079). + * Document odd behavior of MAKE[#] (closes: #553625). + * Document package naming convention (closes: #571753). + * Use system TMPDIR setting in all scripts (closes: #581568). + + [ Giuseppe Iuculano ] + * [208b229] Added a lintian override for python-script-but-no-python- + dep, dkms.py is an apport hook + + -- Giuseppe Iuculano Fri, 04 Jun 2010 13:53:23 +0200 dkms (2.1.1.2-2) unstable; urgency=low diff -Nru dkms-2.1.1.2/debian/control dkms-2.1.1.2/debian/control --- dkms-2.1.1.2/debian/control 2010-05-13 13:32:32.000000000 +0000 +++ dkms-2.1.1.2/debian/control 2010-10-24 23:31:49.000000000 +0000 @@ -1,24 +1,26 @@ Source: dkms Section: kernel Priority: optional -Maintainer: Dynamic Kernel Modules Support Team +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Dynamic Kernel Modules Support Team Uploaders: David Paleino , Mario Limonciello , Giuseppe Iuculano Build-Depends: debhelper (>= 7), quilt -Standards-Version: 3.8.4 +Standards-Version: 3.9.1 Homepage: http://linux.dell.com/dkms Vcs-Git: git://git.debian.org/collab-maint/dkms.git Vcs-Browser: http://git.debian.org/?p=collab-maint/dkms.git Package: dkms Architecture: all -Depends: ${misc:Depends}, module-init-tools, +Depends: ${misc:Depends}, + module-init-tools, gcc, - make | build-essential | dpkg-dev -Recommends: patch, - fakeroot, - lsb-release, + make | build-essential | dpkg-dev, + coreutils (>= 7.4), + patch +Recommends: fakeroot, menu | sudo, linux-headers-2.6-686 | linux-headers-2.6-amd64 | linux-headers-generic | linux-headers, linux-image diff -Nru dkms-2.1.1.2/debian/dkms.lintian-overrides dkms-2.1.1.2/debian/dkms.lintian-overrides --- dkms-2.1.1.2/debian/dkms.lintian-overrides 1970-01-01 00:00:00.000000000 +0000 +++ dkms-2.1.1.2/debian/dkms.lintian-overrides 2010-08-04 14:03:45.000000000 +0000 @@ -0,0 +1 @@ +dkms: python-script-but-no-python-dep ./usr/share/apport/package-hooks/dkms.py diff -Nru dkms-2.1.1.2/debian/patches/debian-changes-2.1.1.2-2fakesync1 dkms-2.1.1.2/debian/patches/debian-changes-2.1.1.2-2fakesync1 --- dkms-2.1.1.2/debian/patches/debian-changes-2.1.1.2-2fakesync1 2010-05-13 13:37:33.000000000 +0000 +++ dkms-2.1.1.2/debian/patches/debian-changes-2.1.1.2-2fakesync1 2011-05-22 16:57:55.000000000 +0000 @@ -53,12 +53,3 @@ if [ "$?" -eq 0 ]; then echo $"" echo $"DKMS: mk${create_type} Completed." -@@ -3390,7 +3389,7 @@ function make_debian() - echo $"Error! There was a problem creating your ${create_type}." >&2 - exit 7 - fi -- invoke_command "mv '$temp_dir/${debian_package}-dkms_${module_version}.dsc' '$temp_dir/${debian_package}-dkms_${module_version}.tar.gz' '$deb_basedir'" "Moving built files to $deb_basedir" -+ invoke_command "mv '$temp_dir/${debian_package}-dkms_${module_version}_source.changes' '$temp_dir/${debian_package}-dkms_${module_version}.dsc' '$temp_dir/${debian_package}-dkms_${module_version}.tar.gz' '$deb_basedir'" "Moving built files to $deb_basedir" - ;; - deb) - invoke_command "dpkg-buildpackage -rfakeroot -d -b -us -uc 1>/dev/null" "Building binary package" diff -Nru dkms-2.1.1.2/debian/patches/debian-lsb.patch dkms-2.1.1.2/debian/patches/debian-lsb.patch --- dkms-2.1.1.2/debian/patches/debian-lsb.patch 1970-01-01 00:00:00.000000000 +0000 +++ dkms-2.1.1.2/debian/patches/debian-lsb.patch 2010-08-04 14:03:45.000000000 +0000 @@ -0,0 +1,20 @@ +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 +@@ -363,10 +363,10 @@ function distro_version() + if [ -r /etc/lsb-release ]; then + . /etc/lsb-release + LSB_RELEASE=1 +- elif type lsb_release >/dev/null 2>&1; then +- DISTRIB_ID=$(lsb_release -i -s) +- DISTRIB_RELEASE=$(lsb_release -r -s) +- LSB_RELEASE=1 ++ else ++ DISTRIB_ID=Debian ++ DISTRIB_RELEASE=$(cat /etc/debian_version) ++ LSB_RELEASE=1 + fi + + case "${DISTRIB_ID}" in diff -Nru dkms-2.1.1.2/debian/patches/fix-bashism.patch dkms-2.1.1.2/debian/patches/fix-bashism.patch --- dkms-2.1.1.2/debian/patches/fix-bashism.patch 1970-01-01 00:00:00.000000000 +0000 +++ dkms-2.1.1.2/debian/patches/fix-bashism.patch 2010-08-04 14:03:45.000000000 +0000 @@ -0,0 +1,12 @@ +Description: Fix bashism +--- dkms-2.1.1.2.orig/dkms_common.postinst ++++ dkms-2.1.1.2/dkms_common.postinst +@@ -99,7 +99,7 @@ get_newest_kernel() { + CURRENT_ABI=${CURRENT_ABI%%-*} + NEWEST_KERNEL=$(_get_newest_kernel_debian "$CURRENT_VERSION-$CURRENT_ABI") + +- elif [ `which rpm &>/dev/null` ]; then ++ elif [ `which rpm >/dev/null` ]; then + # If RPM based + NEWEST_KERNEL=$(_get_newest_kernel_rhel) + fi diff -Nru dkms-2.1.1.2/debian/patches/framework_conf.patch dkms-2.1.1.2/debian/patches/framework_conf.patch --- dkms-2.1.1.2/debian/patches/framework_conf.patch 1970-01-01 00:00:00.000000000 +0000 +++ dkms-2.1.1.2/debian/patches/framework_conf.patch 2010-08-04 14:03:45.000000000 +0000 @@ -0,0 +1,12 @@ +Do not return error if /etc/dkms/framework.conf is missing +--- a/dkms_autoinstaller ++++ b/dkms_autoinstaller +@@ -53,7 +53,7 @@ uname=`uname -mr` + arch=${uname#* } + kernel_preparation_done="" + dkms_tree="/var/lib/dkms" +-. /etc/dkms/framework.conf 2>/dev/null ++[ -e /etc/dkms/framework.conf ] && . /etc/dkms/framework.conf 2>/dev/null + + # See how we were called. + case "$1" in diff -Nru dkms-2.1.1.2/debian/patches/improved-error-messages.patch dkms-2.1.1.2/debian/patches/improved-error-messages.patch --- dkms-2.1.1.2/debian/patches/improved-error-messages.patch 1970-01-01 00:00:00.000000000 +0000 +++ dkms-2.1.1.2/debian/patches/improved-error-messages.patch 2010-08-04 14:03:45.000000000 +0000 @@ -0,0 +1,58 @@ +Description: Improve kernel postinst status information. +Author: Michael Gilbert +--- dkms-2.1.1.2.orig/kernel_postinst.d_dkms ++++ dkms-2.1.1.2/kernel_postinst.d_dkms +@@ -4,5 +4,10 @@ + inst_kern=$1 + + if [ -x /usr/lib/dkms/dkms_autoinstaller ]; then +- exec /usr/lib/dkms/dkms_autoinstaller start $inst_kern > /dev/null ++ /usr/lib/dkms/dkms_autoinstaller start $inst_kern >&2 ++fi ++ ++if [ ! -e /lib/modules/$inst_kern/build/include ] ; then ++ echo "dkms: WARNING: linux headers are missing, which may explain the above failures." >&2 ++ echo " please install the linux-headers-$inst_kern package to fix this." >&2 + fi +--- dkms-2.1.1.2.orig/kernel_prerm.d_dkms ++++ dkms-2.1.1.2/kernel_prerm.d_dkms +@@ -8,7 +8,7 @@ while read line; do + name=`echo "$line" | awk '{print $1}' | sed 's/,$//'` + vers=`echo "$line" | awk '{print $2}' | sed 's/,$//'` + arch=`echo "$line" | awk '{print $4}' | sed 's/:$//'` +- echo "Uninstalling: $name $vers ($inst_kern) ($arch)" ++ echo "dkms: uninstalling: $name $vers ($inst_kern) ($arch)" >&2 + dkms uninstall -m $name -v $vers -k $inst_kern -a $arch + done < <(dkms status -k $inst_kern 2>/dev/null | grep ": installed") + fi +--- dkms-2.1.1.2.orig/dkms_autoinstaller ++++ dkms-2.1.1.2/dkms_autoinstaller +@@ -58,7 +58,8 @@ dkms_tree="/var/lib/dkms" + # See how we were called. + case "$1" in + start) +- log_daemon_msg "Running DKMS auto installation service for kernel $kernel" ++ log_daemon_msg "dkms: running auto installation service for kernel $kernel" ++ echo "" + + if [ -z "$kernel" ]; then + if [ -L /vmlinuz -a -e /vmlinuz ]; then +@@ -96,7 +97,7 @@ case "$1" in + [ "$current_state" = "installed" -o "$current_state" = "installed-weak" ] && already_installed="true" && already_installed_version=$version_in_tree + done + +- log_action_begin_msg " $module_in_tree ($version_in_tree)" ++ log_action_begin_msg " $module_in_tree ($version_in_tree)" + + # Based on what we know, either do it or not + if [ "$current_state" = "broken" ]; then +@@ -147,9 +148,6 @@ case "$1" in + fi + fi + done +- if [ -z "$modules_needing_status" ]; then +- log_end_msg 0 +- fi + ;; + stop|restart|force-reload|status|reload) + # ignore diff -Nru dkms-2.1.1.2/debian/patches/improve-the-logic-behind-kernels-detection.patch dkms-2.1.1.2/debian/patches/improve-the-logic-behind-kernels-detection.patch --- dkms-2.1.1.2/debian/patches/improve-the-logic-behind-kernels-detection.patch 1970-01-01 00:00:00.000000000 +0000 +++ dkms-2.1.1.2/debian/patches/improve-the-logic-behind-kernels-detection.patch 2010-09-23 16:59:04.000000000 +0000 @@ -0,0 +1,41 @@ +Improve the logic behind kernels detection. + +Before using the current kernel we need to make sure that this +kernel doesn't belong to the host of a chroot and we should also +be more careful when adding kernels to the candidates list. +Index: dkms-2.1.1.2/dkms_common.postinst +=================================================================== +--- dkms-2.1.1.2.orig/dkms_common.postinst 2010-09-23 18:56:55.119898998 +0200 ++++ dkms-2.1.1.2/dkms_common.postinst 2010-09-23 18:58:03.579898998 +0200 +@@ -188,13 +188,26 @@ + # current kernel. + NEWEST_KERNEL=$(get_newest_kernel "$KERNELS") + +-if [ -n "$NEWEST_KERNEL" ] && [ ${CURRENT_KERNEL} != ${NEWEST_KERNEL} ]; then +- echo "Building for $CURRENT_KERNEL and $NEWEST_KERNEL" +- KERNELS="$KERNELS $NEWEST_KERNEL" ++# If the current kernel doesn't come from the host of a chroot ++if [ `_is_kernel_name_correct $CURRENT_KERNEL` = "yes" ]; then ++ # See if it's worth building the module for both the newest kernel ++ # and for the current kernel ++ if [ -n "$NEWEST_KERNEL" ] && [ ${CURRENT_KERNEL} != ${NEWEST_KERNEL} ]; then ++ echo "Building for $CURRENT_KERNEL and $NEWEST_KERNEL" ++ KERNELS="$CURRENT_KERNEL $NEWEST_KERNEL" ++ else ++ echo "Building only for $CURRENT_KERNEL" ++ fi ++# The current kernel is not useful as it's the host's + else +- echo "Building only for $CURRENT_KERNEL" +-fi ++ echo "It is likely that $CURRENT_KERNEL belongs to a chroot's host" + ++ # Let's use only the newest kernel ++ if [ -n "$NEWEST_KERNEL" ]; then ++ KERNELS="$NEWEST_KERNEL" ++ echo "Building only for $NEWEST_KERNEL" ++ fi ++fi + + if [ -n "$ARCH" ]; then + if which lsb_release >/dev/null && [ $(lsb_release -s -i) = "Ubuntu" ]; then diff -Nru dkms-2.1.1.2/debian/patches/manpage-update.patch dkms-2.1.1.2/debian/patches/manpage-update.patch --- dkms-2.1.1.2/debian/patches/manpage-update.patch 1970-01-01 00:00:00.000000000 +0000 +++ dkms-2.1.1.2/debian/patches/manpage-update.patch 2010-08-04 14:03:45.000000000 +0000 @@ -0,0 +1,13 @@ +Description: Document MAKE[#] behavior +--- dkms-2.1.1.2.orig/dkms.8 ++++ dkms-2.1.1.2/dkms.8 +@@ -477,6 +477,9 @@ directives match against the kernel bein + will be used to build your module. If no MAKE directive is specified or if no + MAKE_MATCH matches the kernel being built for, DKMS + will attempt to use a generic MAKE command to build your module. ++ ++KERNELRELEASE will be automatically appended to MAKE[#]. If you want to ++suppress this behavior, you can quote the make command: 'make'. + .TP + .B MAKE_MATCH[#]= + See the above entry on diff -Nru dkms-2.1.1.2/debian/patches/mkdsc.patch dkms-2.1.1.2/debian/patches/mkdsc.patch --- dkms-2.1.1.2/debian/patches/mkdsc.patch 1970-01-01 00:00:00.000000000 +0000 +++ dkms-2.1.1.2/debian/patches/mkdsc.patch 2010-08-04 14:03:45.000000000 +0000 @@ -0,0 +1,40 @@ +From 55321c5537c963206d51c9965aa7816c7a5dfef0 Mon Sep 17 00:00:00 2001 +From: David Henningsson +Date: Fri, 30 Jul 2010 12:43:48 +0200 +Subject: [PATCH] Copy from the right directory with mkdsc + +Signed-off-by: David Henningsson +--- + dkms | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +From 469f8cc9d9db1390c5ce43fb839240c1538491bc Mon Sep 17 00:00:00 2001 +From: David Henningsson +Date: Fri, 30 Jul 2010 13:15:28 +0200 +Subject: [PATCH 2/2] Also copy source.changes when building with mkdsc + +Signed-off-by: David Henningsson +--- + dkms | 3 ++- + 1 files changed, 2 insertions(+), 1 deletions(-) +--- a/dkms ++++ b/dkms +@@ -3390,7 +3390,8 @@ function make_debian() + echo $"Error! There was a problem creating your ${create_type}." >&2 + exit 7 + fi +- invoke_command "mv '$temp_dir/${debian_package}-dkms_${module_version}.dsc' '$temp_dir/${debian_package}-dkms_${module_version}.tar.gz' '$deb_basedir'" "Moving built files to $deb_basedir" ++ package_prefix="$temp_dir/${debian_package}-dkms_${module_version}" ++ invoke_command "mv '${package_prefix}.dsc' '${package_prefix}_source.changes' '${package_prefix}.tar.gz' '$deb_basedir'" "Moving built files to $deb_basedir" + ;; + deb) + invoke_command "dpkg-buildpackage -rfakeroot -d -b -us -uc 1>/dev/null" "Building binary package" +@@ -3410,7 +3411,7 @@ function make_debian() + + if in_temporary_trees; then + echo "Copying built files to "`pwd`"/.." >&2 +- cp "$dkms_tree/$module/$module_version/deb/"* .. ++ cp "${deb_basedir}/"* .. + fi + + #cleanup diff -Nru dkms-2.1.1.2/debian/patches/remove-old-mod.patch dkms-2.1.1.2/debian/patches/remove-old-mod.patch --- dkms-2.1.1.2/debian/patches/remove-old-mod.patch 1970-01-01 00:00:00.000000000 +0000 +++ dkms-2.1.1.2/debian/patches/remove-old-mod.patch 2010-08-04 14:03:45.000000000 +0000 @@ -0,0 +1,19 @@ +When removing a kernel it would be good to remove all the modules and not just uninstall them. +Issuing a remove instead of an uninstall to dkms will cause the module to be uninstalled first +(if it's not already), then removed. If the kernel is ever re-installed then dkims will +rebuild the module as needed, so nothing is lost by removing the modules for a +reomoved kernel, but you do run a cleaner system. + +--- a/kernel_prerm.d_dkms ++++ b/kernel_prerm.d_dkms +@@ -8,8 +8,8 @@ while read line; do + name=`echo "$line" | awk '{print $1}' | sed 's/,$//'` + vers=`echo "$line" | awk '{print $2}' | sed 's/,$//'` + arch=`echo "$line" | awk '{print $4}' | sed 's/:$//'` +- echo "dkms: uninstalling: $name $vers ($inst_kern) ($arch)" >&2 +- dkms uninstall -m $name -v $vers -k $inst_kern -a $arch ++ echo "dkms: removing: $name $vers ($inst_kern) ($arch)" >&2 ++ dkms remove -m $name -v $vers -k $inst_kern -a $arch + done < <(dkms status -k $inst_kern 2>/dev/null | grep ": installed") + fi + diff -Nru dkms-2.1.1.2/debian/patches/series dkms-2.1.1.2/debian/patches/series --- dkms-2.1.1.2/debian/patches/series 2010-05-13 13:37:33.000000000 +0000 +++ dkms-2.1.1.2/debian/patches/series 2011-05-22 16:58:35.000000000 +0000 @@ -1,2 +1,11 @@ -# This is empty for now +improved-error-messages.patch +fix-bashism.patch +manpage-update.patch +use-system-tmpdir.patch +remove-old-mod.patch +skip-non-matching-kernel.patch +debian-lsb.patch +framework_conf.patch +mkdsc.patch +improve-the-logic-behind-kernels-detection.patch debian-changes-2.1.1.2-2fakesync1 diff -Nru dkms-2.1.1.2/debian/patches/skip-non-matching-kernel.patch dkms-2.1.1.2/debian/patches/skip-non-matching-kernel.patch --- dkms-2.1.1.2/debian/patches/skip-non-matching-kernel.patch 1970-01-01 00:00:00.000000000 +0000 +++ dkms-2.1.1.2/debian/patches/skip-non-matching-kernel.patch 2010-08-04 14:03:45.000000000 +0000 @@ -0,0 +1,34 @@ +dkms.conf allows to set a BUILD_EXCLUSIVE_KERNEL / BUILD_EXCLUSIVE_ARCH +parameter to specify a regular expression which defines the subset of +kernels / architectures which DKMS is allowed to build the module for. If +the kernel being built for does not match against this regular +expressions, the dkms build will error out with exit code 9. + +This patch changes dkms_common.postinst to handle this dkms build +error gracefully by skipping build for the non matching kernels. +--- a/dkms_common.postinst ++++ b/dkms_common.postinst +@@ -231,8 +231,22 @@ for KERNEL in $KERNELS; do + fi + if [ -e /lib/modules/$KERNEL/build/include ]; then + echo "Building initial module for $KERNEL" ++ set +e + dkms build -m $NAME -v $VERSION -k $KERNEL $ARCH > /dev/null +- echo "Done." ++ case $? in ++ 9) ++ set -e ++ echo "Skipped." ++ continue ++ ;; ++ 0) ++ set -e ++ echo "Done." ++ ;; ++ *) ++ exit $? ++ ;; ++ esac + dkms_status=`dkms status -m $NAME -v $VERSION -k $KERNEL $ARCH` + else + echo "Module build for the currently running kernel was skipped since the" diff -Nru dkms-2.1.1.2/debian/patches/use-system-tmpdir.patch dkms-2.1.1.2/debian/patches/use-system-tmpdir.patch --- dkms-2.1.1.2/debian/patches/use-system-tmpdir.patch 1970-01-01 00:00:00.000000000 +0000 +++ dkms-2.1.1.2/debian/patches/use-system-tmpdir.patch 2010-08-04 14:03:45.000000000 +0000 @@ -0,0 +1,65 @@ +Description: Use system setting for tmpdir +Author: Michael Gilbert +--- dkms-2.1.1.2.orig/dkms ++++ dkms-2.1.1.2/dkms +@@ -3592,7 +3592,8 @@ current_kernel=`uname -r` + dkms_tree="/var/lib/dkms" + source_tree="/usr/src" + install_tree="/lib/modules" +-tmp_location="/tmp" ++tmp_file=`mktemp --tmpdir dkms.XXXXXXXX` ++tmp_location=`dirname $tmp_file` + verbose="" + dkms_frameworkconf="/etc/dkms/framework.conf" + +--- dkms-2.1.1.2.orig/dkms_find-provides ++++ dkms-2.1.1.2/dkms_find-provides +@@ -59,7 +59,7 @@ get_modinfo() { + } + + +-TMPDIR=$(mktemp -d /tmp/dkms-findprovides-$$-$RANDOM-XXXXXX) ++TMPDIR=$(mktemp -d --tmpdir dkms-findprovides-$$-$RANDOM-XXXXXX) + trap "rm -rf $TMPDIR >/dev/null 2>&1" QUIT EXIT HUP INT TERM + + modlist= +--- dkms-2.1.1.2.orig/Makefile ++++ dkms-2.1.1.2/Makefile +@@ -88,7 +88,7 @@ tarball: $(TARBALL) + + $(TARBALL): + mkdir -p $(deb_destdir) +- tmp_dir=`mktemp -d /tmp/dkms.XXXXXXXX` ; \ ++ tmp_dir=`mktemp -d --tmpdir dkms.XXXXXXXX` ; \ + cp -a ../$(RELEASE_NAME) $${tmp_dir}/$(RELEASE_STRING) ; \ + sed -e "s/\[INSERT_VERSION_HERE\]/$(RELEASE_VERSION)/" dkms > $${tmp_dir}/$(RELEASE_STRING)/dkms ; \ + sed -e "s/\[INSERT_VERSION_HERE\]/$(RELEASE_VERSION)/" dkms.spec > $${tmp_dir}/$(RELEASE_STRING)/dkms.spec ; \ +@@ -105,7 +105,7 @@ $(TARBALL): + + + rpm: $(TARBALL) dkms.spec +- tmp_dir=`mktemp -d /tmp/dkms.XXXXXXXX` ; \ ++ tmp_dir=`mktemp -d --tmpdir dkms.XXXXXXXX` ; \ + mkdir -p $${tmp_dir}/{BUILD,RPMS,SRPMS,SPECS,SOURCES} ; \ + cp $(TARBALL) $${tmp_dir}/SOURCES ; \ + sed "s/\[INSERT_VERSION_HERE\]/$(RELEASE_VERSION)/" dkms.spec > $${tmp_dir}/SPECS/dkms.spec ; \ +@@ -129,7 +129,7 @@ debmagic: $(TARBALL) + cd - + + debs: +- tmp_dir=`mktemp -d /tmp/dkms.XXXXXXXX` ; \ ++ tmp_dir=`mktemp -d --tmpdir dkms.XXXXXXXX` ; \ + make debmagic DEB_TMP_BUILDDIR=$${tmp_dir} DIST=$(DIST); \ + rm -rf $${tmp_dir} + +--- dkms-2.1.1.2.orig/dkms_autoinstaller ++++ dkms-2.1.1.2/dkms_autoinstaller +@@ -32,7 +32,7 @@ fi + invoke_command () + { + local exitval=0 +- local exitval_file=`mktemp /tmp/dkms.XXXXXX` ++ local exitval_file=`mktemp --tmpdir dkms.XXXXXX` + if [ "$3" = background ] && [ -z "$verbose" ]; then + (eval $1 >/dev/null 2>&1; echo "exitval=$?" >> "$exitval_file") & + while [ -e "$exitval_file" ] && ! [ -s "$exitval_file" ]; do diff -Nru dkms-2.1.1.2/debian/README.source dkms-2.1.1.2/debian/README.source --- dkms-2.1.1.2/debian/README.source 2010-05-13 13:32:32.000000000 +0000 +++ dkms-2.1.1.2/debian/README.source 1970-01-01 00:00:00.000000000 +0000 @@ -1,5 +0,0 @@ -This package uses quilt to manage all modifications to the upstream -source. Changes are stored in the source package as diffs in -debian/patches and applied during the build. - -See /usr/share/doc/quilt/README.source for a detailed explanation. diff -Nru dkms-2.1.1.2/debian/rules dkms-2.1.1.2/debian/rules --- dkms-2.1.1.2/debian/rules 2010-05-13 13:32:32.000000000 +0000 +++ dkms-2.1.1.2/debian/rules 2010-08-04 14:03:45.000000000 +0000 @@ -6,8 +6,6 @@ CURVER = $(shell dpkg-parsechangelog | grep ^Version | cut -d" " -f2 | cut -d"-" -f1 ) -include /usr/share/quilt/quilt.make - dh_dkms.1: debian/scripts/dh_dkms pod2man \ --center "DKMS Debhelper" \ @@ -19,7 +17,7 @@ dh_testdir touch $@ -clean: unpatch +clean: dh_testdir dh_testroot rm -f build-stamp configure-stamp @@ -40,6 +38,7 @@ dh_testroot dh_installchangelogs dh_installdocs AUTHORS debian/HOWTO.Debian + dh_lintian dh_installexamples dh_installman dh_link diff -Nru dkms-2.1.1.2/debian/scripts/dh_dkms.1 dkms-2.1.1.2/debian/scripts/dh_dkms.1 --- dkms-2.1.1.2/debian/scripts/dh_dkms.1 2010-05-13 13:32:32.000000000 +0000 +++ dkms-2.1.1.2/debian/scripts/dh_dkms.1 2010-08-04 14:03:45.000000000 +0000 @@ -175,6 +175,8 @@ Note that this command is not idempotent. \fIdh_prep\fR\|(1) should be called between invocations of this command. Otherwise, it may cause multiple instances of the same text to be added to maintainer scripts. + +IMPORTANT: binary packages using dh_dkms must have a name that ends in '-dkms'. .SH "SEE ALSO" .IX Header "SEE ALSO" \&\fIdebhelper\fR\|(1)