[libconfig-model-perl] 02/03: renamed to dh_cme_upload (part 2)
dod at debian.org
dod at debian.org
Sun Sep 29 18:51:45 UTC 2013
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 c25cb86f06370cabd29a7b932ea40ccb925d2130
Author: Dominique Dumont <dod at debian.org>
Date: Sun Sep 29 20:48:01 2013 +0200
renamed to dh_cme_upload (part 2)
---
debian/README.Debian | 20 ++++++++++----------
debian/dh/{config_model.pm => cme_upgrade.pm} | 2 +-
debian/dh/dh_cme_upgrade | 22 +++++++++++-----------
debian/patches/add_dh_config | 4 ++--
4 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/debian/README.Debian b/debian/README.Debian
index 790cd63..8e5825c 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -1,4 +1,4 @@
-The aim of dh_config_model_upgrade is to provide an easy way for a
+The aim of dh_cme_upgrade is to provide an easy way for a
Debian developer to add better configuration upgrade to the packages
they maintain.
@@ -27,37 +27,37 @@ What does Joe, Debian developer, have to do?
- ensure that foobar.postinst has a #DEBHELPER# line (if this file
exists)
- ensure that foobar.control has a dependency on ${misc:Depends}
-- ensure that call dh_config_model_upgrade during package build.
+- ensure that call dh_cme_upgrade during package build.
Either:
- - run "dh --with config_model"
- - directly call dh_config_model_upgrade. (*)
+ - run "dh --with cme_upgrade"
+ - directly call dh_cme_upgrade. (*)
-Note to developer for embedded system: dh_config_model_upgrade will do
+Note to developer for embedded system: dh_cme_upgrade will do
nothing is DH_NO_ACT is set or if DEB_BUILD_OPTIONS contains
'noconfigmodel'
CDBS users should add a line like this in rules (*):
build/foo::
- dh_config_model_upgrade --model Foo
+ dh_cme_upgrade --model Foo
-(*) See dh_config_model_upgrade man page for more details on usage and
+(*) See dh_cme_upgrade man page for more details on usage and
options
How does this work?
--------------------
-When called, dh_config_model_upgrade will setup foobar package to
+When called, dh_cme_upgrade will setup foobar package to
upgrade the configuration with Config::Model.
-In more details, dh_config_model_upgrade will:
+In more details, dh_cme_upgrade will:
- add a dependency on libconfig-model-perl in foobar control file
- add or update foobar.postinst file so that the configuration is
upgraded. In case of upgrade issue, a message is displayed inviting the
user to re-run the upgrade command in force and interactive mode.
-All these operations are handled by dh_config_model_upgrade.
+All these operations are handled by dh_cme_upgrade.
For more information, see http://wiki.debian.org/PackageConfigUpgrade
diff --git a/debian/dh/config_model.pm b/debian/dh/cme_upgrade.pm
similarity index 86%
rename from debian/dh/config_model.pm
rename to debian/dh/cme_upgrade.pm
index 62e0de7..044decf 100644
--- a/debian/dh/config_model.pm
+++ b/debian/dh/cme_upgrade.pm
@@ -10,7 +10,7 @@ use strict;
use Debian::Debhelper::Dh_Lib;
# see /usr/share/doc/debhelper/PROGRAMMING.gz
-insert_before("dh_install", "dh_config_model_upgrade");
+insert_before("dh_install", "dh_cme_upgrade");
insert_before("dh_install","dh_install_debconf") ;
diff --git a/debian/dh/dh_cme_upgrade b/debian/dh/dh_cme_upgrade
index 8cefc1a..21480c1 100644
--- a/debian/dh/dh_cme_upgrade
+++ b/debian/dh/dh_cme_upgrade
@@ -17,7 +17,7 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
# 02110-1301 USA
-# dh_config_model_upgrade file provided by libconfig-model-perl package
+# dh_cme_upgrade file provided by libconfig-model-perl package
# See /usr/share/doc/debhelper/PROGRAMMING for debhelper details
@@ -37,7 +37,7 @@ if ( $dh{NO_ACT} ) {
}
if ( defined $ENV{DEB_BUILD_OPTIONS} and $ENV{DEB_BUILD_OPTIONS} =~ /noconfigmodel/ ) {
- warn "dh_config_model_upgrade: DEB_BUILD_OPTIONS specifies 'noconfigmodel', exiting ...\n";
+ warn "dh_cme_upgrade: DEB_BUILD_OPTIONS specifies 'noconfigmodel', exiting ...\n";
exit;
}
@@ -54,7 +54,7 @@ my %legal = map { ( $_ => 1 ) } @legal_list;
# debian/config file: foo.config-model
foreach my $package (@do_packages) {
- verbose_print("dh_config_model_upgrade: package $package");
+ verbose_print("dh_cme_upgrade: package $package");
my $metaconf = "debian/$package.config-model";
@@ -146,17 +146,17 @@ __END__
=head1 NAME
-dh_config_model_upgrade - add cme based configuration merge
+dh_cme_upgrade - add cme based configuration merge
=head1 SYNOPSIS
- dh_config_model_upgrade [ debhelper options ] [ -p pkg ]
+ dh_cme_upgrade [ debhelper options ] [ -p pkg ]
=head1 DESCRIPTION
-B<dh_config_model_upgrade is experimental>
+B<dh_cme_upgrade is experimental>
-dh_config_model_upgrade is a debhelper that will modify the package
+dh_cme_upgrade is a debhelper that will modify the package
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.
@@ -191,13 +191,13 @@ option to specify which package(s) to act on.
=head1 Usage
-C<dh_config_model_upgrade> is designed be called in the rules file via
+C<dh_cme_upgrade> is designed be called in the rules file via
the dh command:
%:
- dh --with config_model
+ dh --with cme_upgrade
-No options can be passed to C<dh_config_model_upgrade>. Its
+No options can be passed to C<dh_cme_upgrade>. Its
configuration must be specified in C<debian/*.config_model> file. This
file contains several lines, each in the form of "key: value".
@@ -253,7 +253,7 @@ For Popcon:
=head1 debian files setup
-C<dh_config_model_upgrade> will work only if:
+C<dh_cme_upgrade> will work only if:
=over 4
diff --git a/debian/patches/add_dh_config b/debian/patches/add_dh_config
index 2fc7314..9045b1e 100644
--- a/debian/patches/add_dh_config
+++ b/debian/patches/add_dh_config
@@ -10,7 +10,7 @@ Last-Update: 2010-11-12
@version_info,
license => 'lgpl',
- script_files => ['config-edit','script/cme'],
-+ script_files => ['config-edit','script/cme', 'debian/dh/dh_config_model_upgrade'],
++ script_files => ['config-edit','script/cme', 'debian/dh/dh_cme_upgrade'],
appli_files => \%appli_files,
dist_abstract => 'Describe, edit and validate configuration data',
dist_author => 'Dominique Dumont (ddumont at cpan dot org)',
@@ -20,7 +20,7 @@ Last-Update: 2010-11-12
contrib/bash_completion.cme
contrib/bash_completion.config-edit
contrib/log4config-model
-+debian/dh/dh_config_model_upgrade
++debian/dh/dh_cme_upgrade
examples/fstab/README
examples/fstab/add-ext4-workshop.txt
examples/fstab/fstab.sample
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libconfig-model-perl.git
More information about the Pkg-perl-cvs-commits
mailing list