* Support global KERNEL_VERSION and SYSTEM_ARCH.

* Actually _build_ a real kernel module package, not just tar it inside
  a package!

debian/changelog

@@ -1,3 +1,11 @@
+dkms (2.2.0.1-0ubuntu1.tf.1) oneiric; urgency=low
+
+  * Support global KERNEL_VERSION and SYSTEM_ARCH.
+  * Actually _build_ a real kernel module package, not just tar it inside
+    a package!
+
+ -- Turbo Fredriksson <turbo@bayour.com>  Tue, 07 May 2013 15:37:19 +0200
+
 dkms (2.2.0.1-0ubuntu1) oneiric; urgency=low
 
   * New upstream version.  Bugs fixed in Ubuntu:

dkms

@@ -2849,6 +2849,8 @@ preproc_file()
     sed -e "s/DEBIAN_PACKAGE/$debian_package/g" \
 	-e "s/MODULE_NAME/$module/g" \
 	-e "s/MODULE_VERSION/$module_version/g" \
+	-e "s/KERNEL_VERSION/$kernelver/g" \
+	-e "s/SYSTEM_ARCH/$arch/g" \
 	-e "s/DATE_STAMP/$date_str/" "$1" > "$1.dkms-pp"
     mv "$1.dkms-pp" "$1"
 }
@@ -2975,7 +2977,7 @@ make_debian()
 		die 7 $"There was a problem creating your ${create_type}."
 	    echo $""
 	    echo $"DKMS: mk${create_type} completed."
-	    invoke_command "mv '$temp_dir/${debian_package}-dkms_${module_version}_all.deb' '$deb_basedir'" "Moving built files to $deb_basedir"
+	    invoke_command "mv $temp_dir/*.deb '$deb_basedir'" "Moving built files to $deb_basedir"
 	    ;;
     esac
     popd > /dev/null 2>&1
@@ -3455,7 +3457,7 @@ while (($# > 0)); do
 	--templatekernel*)   read_arg template_kernel "$1" "$2" || shift;;
 	-c)                  read_arg conf "$1" "$2" || shift;;
 	--quiet|-q)          exec >/dev/null 2>&1;;
-	--version|-V)        echo $"dkms: [INSERT_VERSION_HERE]"
+	--version|-V)        echo $"dkms: 2.2.0.3"
 			     exit 0;;
 	--no-prepare-kernel) no_prepare_kernel="no-prepare-kernel";;
 	--no-clean-kernel)   no_clean_kernel="no-clean-kernel";;

template-dkms-mkdeb/debian/changelog

@@ -1,4 +1,4 @@
-DEBIAN_PACKAGE-dkms (MODULE_VERSION) stable; urgency=low
+kmod-DEBIAN_PACKAGE (MODULE_VERSION-KERNEL_VERSION) stable; urgency=low
 
   * Automatically packaged by DKMS.
 

template-dkms-mkdeb/debian/control

@@ -1,11 +1,11 @@
-Source: DEBIAN_PACKAGE-dkms
+Source: kmod-DEBIAN_PACKAGE
 Section: misc
 Priority: optional
 Maintainer: Dynamic Kernel Modules Support Team <pkg-dkms-maint@lists.alioth.debian.org>
 Build-Depends: debhelper (>= 7), dkms
 Standards-Version: 3.8.1
 
-Package: DEBIAN_PACKAGE-dkms
-Architecture: all
-Depends: dkms (>= 1.95), ${misc:Depends}
-Description: DEBIAN_PACKAGE driver in DKMS format.
+Package: kmod-DEBIAN_PACKAGE
+Architecture: any
+Depends: ${misc:Depends}
+Description: Linux kernel driver for DEBIAN_PACKAGE.

template-dkms-mkdeb/debian/dirs

@@ -1 +1 @@
-usr/src
+lib/modules/KERNEL_VERSION/extra/MODULE_NAME

template-dkms-mkdeb/debian/rules

@@ -7,6 +7,8 @@
 DEB_NAME=DEBIAN_PACKAGE
 NAME=MODULE_NAME
 VERSION=MODULE_VERSION
+ARCH=SYSTEM_ARCH
+KVER=KERNEL_VERSION
 
 configure: configure-stamp
 configure-stamp:
@@ -15,7 +17,6 @@ configure-stamp:
 
 
 build: build-stamp
-
 build-stamp: configure-stamp 
 	dh_testdir
 	$(MAKE)
@@ -33,7 +34,11 @@ install: build
 	dh_testroot
 	dh_prep
 	dh_installdirs
-	$(MAKE) DESTDIR=$(CURDIR)/debian/$(DEB_NAME)-dkms NAME=$(NAME) VERSION=$(VERSION) install
+#	$(MAKE) DESTDIR=$(CURDIR)/debian/$(DEB_NAME)-dkms NAME=$(NAME) VERSION=$(VERSION) install
+	cd $(CURDIR)/debian/kmod-$(NAME) && \
+	  tar xvzf $(CURDIR)/$(NAME)-$(VERSION).dkms.tar.gz && \
+	  mv dkms_main_tree/$(KVER)/$(ARCH)/module/* lib/modules/$(KVER)/extra/$(NAME)/ && \
+	  rm -vRf dkms_binaries_only dkms_main_tree
 
 binary-arch: build install