[libconfig-model-perl] 05/07: dh_cme_upgrade: fix doc

[dod at debian.org]

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

dod pushed a commit to branch fix-dh-cm
in repository libconfig-model-perl.

commit 4ced3c4a56ed1f24ee4233ebbddc86e957635c14
Author: Dominique Dumont <dod at debian.org>
Date:   Sun Sep 29 19:33:59 2013 +0200

    dh_cme_upgrade: fix doc
---
 debian/dh/dh_config_model_upgrade |   19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/debian/dh/dh_config_model_upgrade b/debian/dh/dh_config_model_upgrade
index 0e223e7..2bebb21 100644
--- a/debian/dh/dh_config_model_upgrade
+++ b/debian/dh/dh_config_model_upgrade
@@ -161,8 +161,8 @@ script to merge configuration on package upgrade. This merge is based
 on L<cme> from L<Config::Model> and will merge user's customisations
 with maintainer's configuration updates.
 
-Configuration information used by L<cme> for upgrade can be specified
-by command options or a configuration file: C<debian/foo.config-model>
+Configuration information used by L<cme> for upgrade are specified in
+a configuration file (see below)
 
 Configuration information is specified in a configuration model. It
 must be provided by another package like
@@ -187,7 +187,7 @@ C<control> file has a dependency on C<${misc:Depends}>
 =head1 OPTIONS
 
 This program accepts all debhelper options, including the C<-p>
-optionto specify which package(s) to act on.
+option to specify which package(s) to act on.
 
 =head1 Usage
 
@@ -232,7 +232,7 @@ L<cme> during upgrade. (optional)
 Here's a possible configuration for openssh server:
 
  $ cat debian/openssh-server.config-model
- cme-app-name: Sshd
+ cme-app-name: sshd
  cme-model-package: lib-config-model-openssh-perl
  cme-model-version: 1.206
 
@@ -241,6 +241,9 @@ For lcdproc:
  $ cat debian/lcdproc.config-model
  cme-app-name: lcdproc
  cme-package: libconfig-model-lcdproc-perl
+ cme-model-version: 2.040
+ # required to upgrade LCDd.conf from upstream
+ cme-options: -force
 
 For Popcon:
 
@@ -248,14 +251,6 @@ For Popcon:
  cme-app-name: popcon
  cme-model-package: libconfig-model-perl
 
-For major changes in a (fictional) package configuration (whether this
-example is a good idea is an exercise left to the reader):
-
- $ cat debian/ohboy.config-model
- cme-app-name: ohboy
- cme-model-package: libconfig-model-ohboy-perl
- cme-options: -force
-
 =head1 debian files setup
 
 C<dh_config_model_upgrade> will work only if:

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libconfig-model-perl.git