[Pkg-dkms-commits] [SCM] Dynamic Kernel Module Support branch, master, updated. debian/2.1.1.2-2-3-g2e1168b

Mon May 17 03:21:28 UTC 2010

The following commit has been merged in the master branch:
commit 2e1168b41dc1768043056d58529a49e32ced718c
Author: Michael Gilbert <michael.s.gilbert at gmail.com>
Date:   Sun May 16 23:20:41 2010 -0400

    fix patch descriptions; include changelog; remove quilt from rules

diff --git a/debian/changelog b/debian/changelog
index 73d3149..2582b1b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,10 @@ dkms (2.1.1.2-3) UNRELEASED; urgency=low
   * Update to source format 3 (quilt) for better patch management/handling.
   * Improve the status info displayed during the kernel postinst, and
     provide informative/useful messages when things go awry.
+  * Fix bashism in dkms_common.postinst (closes: #581079).
+  * Document odd behavior of MAKE[#] (closes: #553625).
+  * Document package naming convention (closes: #571753).
+  * Use system TMPDIR setting in all scripts (closes: #581568).
 
  -- Michael Gilbert <michael.s.gilbert at gmail.com>  Sun, 16 May 2010 18:59:38 -0400
 
diff --git a/debian/patches/manpage-update.patch b/debian/patches/manpage-update.patch
index a562d21..da2f748 100644
--- a/debian/patches/manpage-update.patch
+++ b/debian/patches/manpage-update.patch
@@ -1,33 +1,4 @@
-Description: Upstream changes introduced in version 2.1.1.2-3
- This patch has been created by dpkg-source during the package build.
- Here's the last changelog entry, hopefully it gives details on why
- those changes were made:
- .
- dkms (2.1.1.2-3) UNRELEASED; urgency=low
- .
-   [ Michael Gilbert ]
-   * Add missing depends on python (needed by dkms.py).
-   * Update to source format 3 (quilt) for better patch management/handling.
-   * Improve the status info displayed during the kernel postinst, and
-     provide informative/useful messages when things go awry.
-   * Fix bashism in dkms_common.postinst (closes: #581079).
- .
- The person named in the Author field signed this changelog entry.
-Author: Michael Gilbert <michael.s.gilbert at gmail.com>
-Bug-Debian: http://bugs.debian.org/581079
-
----
-The information above should follow the Patch Tagging Guidelines, please
-checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
-are templates for supplementary fields that you might want to add:
-
-Origin: <vendor|upstream|other>, <url of original patch>
-Bug: <url in upstream bugtracker>
-Bug-Debian: http://bugs.debian.org/<bugnumber>
-Forwarded: <no|not-needed|url proving that it has been forwarded>
-Reviewed-By: <name and email of someone who approved the patch>
-Last-Update: <YYYY-MM-DD>
-
+Description: Document MAKE[#] behavior 
 --- dkms-2.1.1.2.orig/dkms.8
 +++ dkms-2.1.1.2/dkms.8
 @@ -477,6 +477,9 @@ directives match against the kernel bein
diff --git a/debian/patches/use-system-tmpdir.patch b/debian/patches/use-system-tmpdir.patch
index f35fc2e..7e38dee 100644
--- a/debian/patches/use-system-tmpdir.patch
+++ b/debian/patches/use-system-tmpdir.patch
@@ -1,37 +1,5 @@
-Description: Upstream changes introduced in version 2.1.1.2-3
- This patch has been created by dpkg-source during the package build.
- Here's the last changelog entry, hopefully it gives details on why
- those changes were made:
- .
- dkms (2.1.1.2-3) UNRELEASED; urgency=low
- .
-   [ Michael Gilbert ]
-   * Add missing depends on python (needed by dkms.py).
-   * Update to source format 3 (quilt) for better patch management/handling.
-   * Improve the status info displayed during the kernel postinst, and
-     provide informative/useful messages when things go awry.
-   * Fix bashism in dkms_common.postinst (closes: #581079).
-   * Document odd behavior of MAKE[#] (closes: #553625).
-   * Document package naming convention (closes: #571753).
- .
- The person named in the Author field signed this changelog entry.
+Description: Use system setting for tmpdir
 Author: Michael Gilbert <michael.s.gilbert at gmail.com>
-Bug-Debian: http://bugs.debian.org/553625
-Bug-Debian: http://bugs.debian.org/571753
-Bug-Debian: http://bugs.debian.org/581079
-
----
-The information above should follow the Patch Tagging Guidelines, please
-checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
-are templates for supplementary fields that you might want to add:
-
-Origin: <vendor|upstream|other>, <url of original patch>
-Bug: <url in upstream bugtracker>
-Bug-Debian: http://bugs.debian.org/<bugnumber>
-Forwarded: <no|not-needed|url proving that it has been forwarded>
-Reviewed-By: <name and email of someone who approved the patch>
-Last-Update: <YYYY-MM-DD>
-
 --- dkms-2.1.1.2.orig/dkms
 +++ dkms-2.1.1.2/dkms
 @@ -3592,7 +3592,8 @@ current_kernel=`uname -r`
diff --git a/debian/rules b/debian/rules
index 41c6efa..dc2db26 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,8 +6,6 @@
 
 CURVER = $(shell dpkg-parsechangelog | grep ^Version | cut -d" " -f2 | cut -d"-" -f1 )
 
-include /usr/share/quilt/quilt.make
-
 dh_dkms.1: debian/scripts/dh_dkms
 	pod2man \
 		--center "DKMS Debhelper" \
@@ -19,7 +17,7 @@ build-stamp: $(QUILT_STAMPFN)
 	dh_testdir
 	touch $@
 
-clean: unpatch
+clean:
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp configure-stamp
diff --git a/debian/scripts/dh_dkms.1 b/debian/scripts/dh_dkms.1
index 2207da1..da722ab 100644
--- a/debian/scripts/dh_dkms.1
+++ b/debian/scripts/dh_dkms.1
@@ -175,6 +175,8 @@ Don't look for debian/\fIpackage\fR.dkms or debian/dkms, but install \fIfile\fR
 Note that this command is not idempotent. \fIdh_prep\fR\|(1) should be called
 between invocations of this command. Otherwise, it may cause multiple
 instances of the same text to be added to maintainer scripts.
+
+IMPORTANT: binary packages using dh_dkms must have a name that ends in '-dkms'.
 .SH "SEE ALSO"
 .IX Header "SEE ALSO"
 \&\fIdebhelper\fR\|(1)

-- 
Dynamic Kernel Module Support

