[Pkg-dkms-commits] [SCM] Dynamic Kernel Module Support branch, master, updated. debian/2.1.1.1-2-2-g73dd83f

[David Paleino]

The following commit has been merged in the master branch:
commit 73dd83ff258efbe43f48ee5b0e0437cf9d50955b
Author: David Paleino <dapal at debian.org>
Date:   Wed Feb 17 19:07:49 2010 +0100

    dh_dkms: specify that version mangling only happens if PACKAGE_VERSION=#MODULE_VERSION# in dkms.conf

diff --git a/debian/scripts/dh_dkms b/debian/scripts/dh_dkms
index d03029e..085b232 100755
--- a/debian/scripts/dh_dkms
+++ b/debian/scripts/dh_dkms
@@ -50,8 +50,9 @@ Add code to also support DKMS versions < 2.1.0.0.
 
 =item B<-V>, B<-V> I<version>
 
-Set C<PACKAGE_VERSION> in F<dkms.conf> to the given I<version> or, if none is
-given, default to the upstream version of the current package.
+If C<PACKAGE_VERSION> in F<dkms.conf> is set to C<#MODULE_VERSION#>, set it to
+the given I<version> or, if none is given, default to the upstream version of
+the current package. Otherwise, leave the value specified in F<dkms.conf>.
 
 =item B<--> I<file>
 
diff --git a/debian/scripts/dh_dkms.1 b/debian/scripts/dh_dkms.1
index 413f6b0..6062a49 100644
--- a/debian/scripts/dh_dkms.1
+++ b/debian/scripts/dh_dkms.1
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "DH_DKMS 1"
-.TH DH_DKMS 1 "2010-02-08" "2.1.1.0" "DKMS Debhelper"
+.TH DH_DKMS 1 "2010-02-17" "2.1.1.1" "DKMS Debhelper"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
@@ -154,7 +154,7 @@ in the proper directory as dkms.conf.
 .Sp
 It can also point to another file (this should be used when the configuration
 is provided by upstream), and in this case that file will be installed as dkms.conf
-in the proper directory.
+in the propery directory.
 .Sp
 This file can only miss if a filename is provided when calling dh_dkms.
 .SH "OPTIONS"
@@ -164,8 +164,9 @@ This file can only miss if a filename is provided when calling dh_dkms.
 Add code to also support \s-1DKMS\s0 versions < 2.1.0.0.
 .IP "\fB\-V\fR, \fB\-V\fR \fIversion\fR" 4
 .IX Item "-V, -V version"
-Set \f(CW\*(C`PACKAGE_VERSION\*(C'\fR in \fIdkms.conf\fR to the given \fIversion\fR or, if none is
-given, default to the upstream version of the current package.
+If \f(CW\*(C`PACKAGE_VERSION\*(C'\fR in \fIdkms.conf\fR is set to \f(CW\*(C`#MODULE_VERSION#\*(C'\fR, set it to
+the given \fIversion\fR or, if none is given, default to the upstream version of
+the current package. Otherwise, leave the value specified in \fIdkms.conf\fR.
 .IP "\fB\-\-\fR \fIfile\fR" 4
 .IX Item "-- file"
 Don't look for debian/\fIpackage\fR.dkms or debian/dkms, but install \fIfile\fR as dkms.conf.

-- 
Dynamic Kernel Module Support