The following commit has been merged in the master branch:
commit ec26539044ed5b2fe18f36e223e2c8b9d0766612
Author: Giuseppe Iuculano <[email protected]>
Date: Wed Jan 27 09:45:29 2010 +0100
Merge from Ubuntu: Remove the init script and Upstart job. There is no
reason that DKMS needs to run on boot; you can build modules for non-running
kernels just fine at installation time.
diff --git a/debian/preinst b/debian/preinst
new file mode 100644
index 0000000..62fb904
--- /dev/null
+++ b/debian/preinst
@@ -0,0 +1,34 @@
+#!/bin/sh -e
+
+# snippet from http://www.dpkg.org/dpkg/ConffileHandling
+
+# Remove a no-longer used conffile
+rm_conffile() {
+ PKGNAME="$1"
+ CONFFILE="$2"
+ if [ -e "$CONFFILE" ]; then
+ md5sum="`md5sum \"$CONFFILE\" | sed -e \"s/ .*//\"`"
+ old_md5sum="`dpkg-query -W -f='${Conffiles}' $PKGNAME | sed -n -e
\"\\\\' $CONFFILE '{s/ obsolete$//;s/.* //p}\"`"
+ if [ "$md5sum" != "$old_md5sum" ]; then
+ echo "Obsolete conffile $CONFFILE has been modified by you."
+ echo "Saving as $CONFFILE.dpkg-bak ..."
+ mv -f "$CONFFILE" "$CONFFILE".dpkg-bak
+ else
+ echo "Removing obsolete conffile $CONFFILE ..."
+ rm -f "$CONFFILE"
+ fi
+ fi
+}
+
+case "$1" in
+install|upgrade)
+ if dpkg --compare-versions "$2" le "2.1.00.0-1"; then
+ rm_conffile dkms "/etc/dkms/template-dkms-mkdeb/debian/postrm"
+ fi
+
+ if dpkg --compare-versions "$2" le "2.1.1.0-0ubuntu7"; then
+ rm_conffile dkms "/etc/init.d/dkms_autoinstaller"
+ rm_conffile dkms "/etc/init/dkms_autoinstaller.conf"
+ fi
+esac
+
diff --git a/debian/rules b/debian/rules
index 62195d3..41c6efa 100755
--- a/debian/rules
+++ b/debian/rules
@@ -23,7 +23,7 @@ clean: unpatch
dh_testdir
dh_testroot
rm -f build-stamp configure-stamp
- [ ! -f Makefile ] || $(MAKE) clean-dpkg
+ [ ! -f Makefile ] || $(MAKE) clean
dh_clean
install: build
@@ -41,7 +41,6 @@ binary-indep: build install
dh_installchangelogs
dh_installdocs AUTHORS debian/HOWTO.Debian
dh_installexamples
- dh_installinit -r --name dkms_autoinstaller --update-rcd-params="start
20 2 3 4 5 ."
dh_installman
dh_link
dh_strip
--
Dynamic Kernel Module Support
_______________________________________________
Pkg-dkms-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-dkms-commits
