r46151 - in /trunk/libconfig-model-perl/debian: changelog dh/config-config-model dh/dh_config_model_upgrade dh/postinst-config-model dh/templates-config-model libconfig-model-perl.install
ddumont-guest at users.alioth.debian.org
ddumont-guest at users.alioth.debian.org
Wed Oct 21 15:52:16 UTC 2009
Author: ddumont-guest
Date: Wed Oct 21 15:52:11 2009
New Revision: 46151
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=46151
Log:
set up db_get question before upgrade with config-model
Added:
trunk/libconfig-model-perl/debian/dh/config-config-model
trunk/libconfig-model-perl/debian/dh/templates-config-model
Modified:
trunk/libconfig-model-perl/debian/changelog
trunk/libconfig-model-perl/debian/dh/dh_config_model_upgrade
trunk/libconfig-model-perl/debian/dh/postinst-config-model
trunk/libconfig-model-perl/debian/libconfig-model-perl.install
Modified: trunk/libconfig-model-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libconfig-model-perl/debian/changelog?rev=46151&op=diff
==============================================================================
--- trunk/libconfig-model-perl/debian/changelog (original)
+++ trunk/libconfig-model-perl/debian/changelog Wed Oct 21 15:52:11 2009
@@ -1,3 +1,10 @@
+libconfig-model-perl (0.640-3) UNRELEASED; urgency=low
+
+ * dh_config_model_upgrade: setup debconf question to ask whether to use
+ config-model to upgrade configuration data.
+
+ -- Dominique Dumont <dominique.dumont at hp.com> Mon, 05 Oct 2009 10:58:25 +0200
+
libconfig-model-perl (0.640-2) unstable; urgency=low
* dh_config_model_upgrade: correctly pass versioned dependency when
Added: trunk/libconfig-model-perl/debian/dh/config-config-model
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libconfig-model-perl/debian/dh/config-config-model?rev=46151&op=file
==============================================================================
--- trunk/libconfig-model-perl/debian/dh/config-config-model (added)
+++ trunk/libconfig-model-perl/debian/dh/config-config-model Wed Oct 21 15:52:11 2009
@@ -1,0 +1,9 @@
+#!/bin/sh
+
+set -e
+
+. /usr/share/debconf/confmodule
+
+db_input medium %PACKAGE%/config-model-upgrade || true
+
+db_go || true
Modified: trunk/libconfig-model-perl/debian/dh/dh_config_model_upgrade
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libconfig-model-perl/debian/dh/dh_config_model_upgrade?rev=46151&op=diff
==============================================================================
--- trunk/libconfig-model-perl/debian/dh/dh_config_model_upgrade (original)
+++ trunk/libconfig-model-perl/debian/dh/dh_config_model_upgrade Wed Oct 21 15:52:11 2009
@@ -73,7 +73,7 @@
if (defined $cm_config{model_package}) {
# add dependency in misc:Depends control file
- addsubstvar($package,'misc:Depends',
+ addsubstvar($package,'misc:Depends',
$cm_config{model_package},
'>= '.$cm_config{model_version}) ;
}
@@ -84,7 +84,16 @@
# calls autoscript to update pkg.postinst with config-edit command
autoscript($package,postinst => 'postinst-config-model',
's/%MODEL%/'.$dh{model_name}.'/') ;
+
+ # add debconf template, we'll see later for translations
+ autoscript($package, templates => 'templates-config-model',
+ 's/%PACKAGE%/'.$package.'/') ;
+
+ # TODO ask debconf question in pre-inst
+ autoscript($package, config => 'config-config-model',
+ 's/%PACKAGE%/'.$package.'/') ;
}
+
__END__
=head1 NAME
Modified: trunk/libconfig-model-perl/debian/dh/postinst-config-model
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libconfig-model-perl/debian/dh/postinst-config-model?rev=46151&op=diff
==============================================================================
--- trunk/libconfig-model-perl/debian/dh/postinst-config-model (original)
+++ trunk/libconfig-model-perl/debian/dh/postinst-config-model Wed Oct 21 15:52:11 2009
@@ -1,7 +1,3 @@
-# Do we need to setup debconf to check if user want automatic upgrade ?
-# should this question be asked when installing libconfig-model-perl
-# or foo (and any other package that may use cm upgrade ?)
-
# Do we need a general debconf question to decide about general
# policy in case of error (force || UI || skip) ?
@@ -12,6 +8,13 @@
# - fire UI ?
# - don't upgrade
-# FIXME: upgrade requiring user interaction are not handled
-config-edit -model %MODEL% -ui none -save
+# debconf question to check if user want automatic upgrade ?
+db_get %PACKAGE%/config-model-upgrade
+# should this question be asked when installing libconfig-model-perl ?
+
+if [[ $RET ]]
+then
+ # FIXME: upgrade requiring user interaction are not handled
+ config-edit -model %MODEL% -ui none -save
+fi
Added: trunk/libconfig-model-perl/debian/dh/templates-config-model
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libconfig-model-perl/debian/dh/templates-config-model?rev=46151&op=file
==============================================================================
--- trunk/libconfig-model-perl/debian/dh/templates-config-model (added)
+++ trunk/libconfig-model-perl/debian/dh/templates-config-model Wed Oct 21 15:52:11 2009
@@ -1,0 +1,12 @@
+# This config-model template snippet is experimental
+# no attempt have been made (yet) for translation
+
+Template: %PACKAGE%/config-model-upgrade
+Type: boolean
+Default: true
+_Description: Upgrade config automatically ?
+ %PACKAGE% configuration files can be upgraded automatically by merging
+ your values with new recommendation from Debian. On the downside,
+ comments are not preserved. Otherwise automatic configuration upgrade
+ is safe (even though still experimental)
+
Modified: trunk/libconfig-model-perl/debian/libconfig-model-perl.install
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libconfig-model-perl/debian/libconfig-model-perl.install?rev=46151&op=diff
==============================================================================
--- trunk/libconfig-model-perl/debian/libconfig-model-perl.install (original)
+++ trunk/libconfig-model-perl/debian/libconfig-model-perl.install Wed Oct 21 15:52:11 2009
@@ -1,2 +1,5 @@
-debian/dh/postinst-config-model usr/share/debhelper/autoscripts/
-debian/dh/config_model.pm usr/share/perl5/Debian/Debhelper/Sequence/
+debian/dh/config-config-model usr/share/debhelper/autoscripts/
+debian/dh/config_model.pm usr/share/perl5/Debian/Debhelper/Sequence/
+debian/dh/postinst-config-model usr/share/debhelper/autoscripts/
+debian/dh/postinst-config-model usr/share/debhelper/autoscripts/
+debian/dh/templates-config-model usr/share/debhelper/autoscripts/
More information about the Pkg-perl-cvs-commits
mailing list