[Pkg-dkms-commits] [dkms] 01/01: Update mkbmdeb behavior (Closes: #830670)

[Aron Xu]

This is an automated email from the git hooks/post-receive script.

aron pushed a commit to branch master
in repository dkms.

commit f77fbb3cd0720a436f73401e1e17dfff522220b1
Author: Adel Belhouane <bugs.a.b at free.fr>
Date:   Tue Oct 25 19:24:33 2016 +0800

    Update mkbmdeb behavior (Closes: #830670)
    
    * Rename built package from DEBIAN_PACKAGE-dkms-bin to
      DEBIAN_PACKAGE-modules-KERNEL_VERSION to allow concurrently
      installed versions
    * Provides package DEBIAN_PACKAGE-modules
---
 ...kbmdeb-support-for-lean-binary-package-with-only-th.patch | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/debian/patches/0004-mkbmdeb-support-for-lean-binary-package-with-only-th.patch b/debian/patches/0004-mkbmdeb-support-for-lean-binary-package-with-only-th.patch
index 3e6b9ba..530136b 100644
--- a/debian/patches/0004-mkbmdeb-support-for-lean-binary-package-with-only-th.patch
+++ b/debian/patches/0004-mkbmdeb-support-for-lean-binary-package-with-only-th.patch
@@ -87,7 +87,7 @@ Index: dkms/dkms
 +	    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-bin_${module_version}_${debian_build_arch}.deb' '$deb_basedir'" "Moving built files to $deb_basedir"
++	invoke_command "mv '$temp_dir/${debian_package}-modules-${kernelver}_${module_version}_${debian_build_arch}.deb' '$deb_basedir'" "Moving built files to $deb_basedir"
          ;;
      esac
      popd > /dev/null 2>&1
@@ -187,7 +187,7 @@ Index: dkms/template-dkms-mkbmdeb/debian/control
 ===================================================================
 --- /dev/null
 +++ dkms/template-dkms-mkbmdeb/debian/control
-@@ -0,0 +1,13 @@
+@@ -0,0 +1,14 @@
 +Source: DEBIAN_PACKAGE-dkms-bin
 +Section: misc
 +Priority: optional
@@ -195,9 +195,10 @@ Index: dkms/template-dkms-mkbmdeb/debian/control
 +Build-Depends: debhelper (>= 7), dkms
 +Standards-Version: 3.8.1
 +
-+Package: DEBIAN_PACKAGE-dkms-bin
++Package: DEBIAN_PACKAGE-modules-KERNEL_VERSION
 +Architecture: DEBIAN_BUILD_ARCH
 +Depends: ${misc:Depends}, linux-image-KERNEL_VERSION
++Provides: DEBIAN_PACKAGE-modules
 +Description: DEBIAN_PACKAGE binary drivers for linux-image-KERNEL_VERSION
 + This package contains DEBIAN_PACKAGE drivers for the KERNEL_VERSION Linux kernel,
 + built from DEBIAN_PACKAGE-dkms for the DEBIAN_BUILD_ARCH architecture.
@@ -212,7 +213,7 @@ Index: dkms/template-dkms-mkbmdeb/debian/rules
 ===================================================================
 --- /dev/null
 +++ dkms/template-dkms-mkbmdeb/debian/rules
-@@ -0,0 +1,57 @@
+@@ -0,0 +1,58 @@
 +#!/usr/bin/make -f
 +# -*- makefile -*-
 +
@@ -222,6 +223,7 @@ Index: dkms/template-dkms-mkbmdeb/debian/rules
 +DEB_NAME=DEBIAN_PACKAGE
 +NAME=MODULE_NAME
 +VERSION=MODULE_VERSION
++KVER=KERNEL_VERSION
 +
 +configure: configure-stamp
 +configure-stamp:
@@ -248,7 +250,7 @@ Index: dkms/template-dkms-mkbmdeb/debian/rules
 +	dh_testroot
 +	dh_prep
 +	dh_installdirs
-+	$(MAKE) DESTDIR=$(CURDIR)/debian/$(DEB_NAME)-dkms-bin NAME=$(NAME) VERSION=$(VERSION) install
++	$(MAKE) DESTDIR=$(CURDIR)/debian/$(DEB_NAME)-modules-$(KVER) NAME=$(NAME) VERSION=$(VERSION) install
 +
 +binary-arch: build install
 +

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-dkms/dkms.git