diff -u dkms-2.0.20.4/debian/changelog dkms-2.0.20.4/debian/changelog --- dkms-2.0.20.4/debian/changelog +++ dkms-2.0.20.4/debian/changelog @@ -1,3 +1,11 @@ +dkms (2.0.20.4-0ubuntu3) intrepid; urgency=low + + * Ensure that the /lib/modules//updates/dkms directory is + removed if it is empty after a removal. This allows the modules + directory to be removed as it becomes empty. (LP: #300773) + + -- Andy Whitcroft Thu, 04 Dec 2008 16:48:10 +0000 + dkms (2.0.20.4-0ubuntu2) intrepid; urgency=low * Backport these fixes from trunk: only in patch2: unchanged: --- dkms-2.0.20.4.orig/kernel_prerm.d_dkms +++ dkms-2.0.20.4/kernel_prerm.d_dkms @@ -13,4 +13,8 @@ done < <(dkms status -k $inst_kern 2>/dev/null | grep ": installed") fi +rmdir --ignore-fail-on-non-empty \ + "/lib/modules/$inst_kern/updates/dkms" \ + "/lib/modules/$inst_kern/updates" + exit 0