On 2012-07-21 19:43, Julien Cristau wrote: >> You need to send the diff to the log, not just your changelog entry. > ^ bug
ACK. debdiff attached. Andreas
diff -Nru dkms-2.2.0.3/debian/changelog dkms-2.2.0.3/debian/changelog --- dkms-2.2.0.3/debian/changelog 2011-12-07 20:30:49.000000000 +0100 +++ dkms-2.2.0.3/debian/changelog 2012-07-19 22:21:01.000000000 +0200 @@ -1,3 +1,11 @@ +dkms (2.2.0.3-1.1) unstable; urgency=low + + * Non-maintainer upload. + * Do not fail if /lib/modules does not exist. (Closes: #666023) + * Remove the directory where the module was installed. (Closes: #657145) + + -- Andreas Beckmann <[email protected]> Thu, 19 Jul 2012 22:20:45 +0200 + dkms (2.2.0.3-1) unstable; urgency=low * [e24a52f] Imported Upstream version 2.2.0.3 diff -Nru dkms-2.2.0.3/debian/patches/657145.patch dkms-2.2.0.3/debian/patches/657145.patch --- dkms-2.2.0.3/debian/patches/657145.patch 1970-01-01 01:00:00.000000000 +0100 +++ dkms-2.2.0.3/debian/patches/657145.patch 2012-07-19 22:21:01.000000000 +0200 @@ -0,0 +1,21 @@ +From: Andreas Beckmann <[email protected]> +Subject: remove the directory where the module was installed + after removing a module try to remove the path (below + /lib/modules/KVERS) were the module was installed to cleanup any + remaining empty directories +Bug-Debian: http://bugs.debian.org/657145 + +diff --git a/dkms b/dkms +index 042acc0..c96cd8f 100644 +--- a/dkms ++++ b/dkms +@@ -1579,6 +1579,9 @@ do_uninstall() + echo $" - Uninstallation" + echo $" - Deleting from: $install_tree/$1${real_dest_module_location}/" + rm -f "$install_tree/$1${real_dest_module_location}/${dest_module_name[$count]}$module_suffix" ++ dir_to_remove="${real_dest_module_location#/}" ++ while [ "${dir_to_remove}" != "${dir_to_remove#/}" ]; do dir_to_remove="${dir_to_remove#/}" ; done ++ (cd "$install_tree/$1" && rmdir --parents --ignore-fail-on-non-empty "${dir_to_remove}" || true) + echo $" - Original module" + if [[ -e $dkms_tree/$module/original_module/$1/$2/${dest_module_name[$count]}$module_suffix ]]; then + case "$running_distribution" in diff -Nru dkms-2.2.0.3/debian/patches/666023.patch dkms-2.2.0.3/debian/patches/666023.patch --- dkms-2.2.0.3/debian/patches/666023.patch 1970-01-01 01:00:00.000000000 +0100 +++ dkms-2.2.0.3/debian/patches/666023.patch 2012-07-19 22:21:01.000000000 +0200 @@ -0,0 +1,17 @@ +From: Andreas Beckmann <[email protected]> +Subject: do not fail if /lib/modules does not exist +Bug-Debian: http://bugs.debian.org/666023 + +diff --git a/dkms_common.postinst b/dkms_common.postinst +index d8cf3a7..0c8cfc1 100644 +--- a/dkms_common.postinst ++++ b/dkms_common.postinst +@@ -146,7 +146,7 @@ if [ -z "$NAME" ] || [ -z "$VERSION" ]; then + exit 1 + fi + +-KERNELS=$(ls /lib/modules/) ++KERNELS=$(ls /lib/modules/ 2>/dev/null || true) + CURRENT_KERNEL=$(uname -r) + + #We never want to keep an older version side by side to prevent conflicts diff -Nru dkms-2.2.0.3/debian/patches/series dkms-2.2.0.3/debian/patches/series --- dkms-2.2.0.3/debian/patches/series 2011-12-07 20:30:49.000000000 +0100 +++ dkms-2.2.0.3/debian/patches/series 2012-07-19 22:21:01.000000000 +0200 @@ -0,0 +1,2 @@ +666023.patch +657145.patch
_______________________________________________ Pkg-dkms-maint mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-dkms-maint
