[Pkg-dkms-commits] [SCM] Dynamic Kernel Module Support branch, master, updated. debian/2.1.1.1-1-4-g4f947d4

[David Paleino]

The following commit has been merged in the master branch:
commit 4f947d40885e385d09672c5c611f70d68ef83a51
Merge: ecfc1c7cc8e08d839990b6a0d4347d58e942a4fd 9fd37904a814b57a0b2d1503f9473a8723dbf95c
Author: David Paleino <dapal at debian.org>
Date:   Mon Feb 8 11:17:00 2010 +0100

    Merge branch 'master' of git+ssh://git.debian.org/git/collab-maint/dkms

diff --combined debian/scripts/dh_dkms.1
index 69f7c84,e98340a..413f6b0
--- a/debian/scripts/dh_dkms.1
+++ b/debian/scripts/dh_dkms.1
@@@ -124,7 -124,7 +124,7 @@@
  .\" ========================================================================
  .\"
  .IX Title "DH_DKMS 1"
 -.TH DH_DKMS 1 "2010-01-16" "2.1.1.0" "DKMS Debhelper"
 +.TH DH_DKMS 1 "2010-02-08" "2.1.1.0" "DKMS Debhelper"
  .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
  .\" way too many mistakes in technical documents.
  .if n .ad l
@@@ -133,7 -133,7 +133,7 @@@
  dh_dkms \- correctly handle DKMS usage by a kernel module package
  .SH "SYNOPSIS"
  .IX Header "SYNOPSIS"
 -\&\fBdh_dkms\fR [\fIdebhelper\ options\fR] [\fB\-l\fR] [\fB\-\-\fR\ \fIfile\fR]
 +\&\fBdh_dkms\fR [\fIdebhelper\ options\fR] [\fB\-l\fR] [\fB\-V\fR[\fIversion\fR]] [\fB\-\-\fR\ \fIfile\fR]
  .SH "DESCRIPTION"
  .IX Header "DESCRIPTION"
  dh_dkms is a debhelper program that is responsible for correctly setting
@@@ -154,7 -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 propery directory.
+ in the proper directory.
  .Sp
  This file can only miss if a filename is provided when calling dh_dkms.
  .SH "OPTIONS"
@@@ -162,10 -162,6 +162,10 @@@
  .IP "\fB\-l\fR, \fB\-\-legacy\fR" 4
  .IX Item "-l, --legacy"
  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.
  .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