[libconfig-model-perl] 01/09: Merge branch 'master' into fix-dh-cm

[dod at debian.org]

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

dod pushed a commit to branch master
in repository libconfig-model-perl.

commit aaecc3c27fdeb5e46cb7e8a66de6d17ef8b1c84b
Merge: 508f312 856307b
Author: Dominique Dumont <dod at debian.org>
Date:   Thu Dec 19 18:39:11 2013 +0100

    Merge branch 'master' into fix-dh-cm
    
    Conflicts:
    	debian/changelog

 Build.PL                                           |   1 +
 Changes                                            |  20 +
 META.json                                          |   5 +-
 META.yml                                           |   5 +-
 README.pod                                         |  32 +-
 debian/changelog                                   |  18 +-
 debian/control                                     |   2 +-
 lib/Config/Model.pm                                |   6 +-
 lib/Config/Model/Annotation.pm                     |   6 +-
 lib/Config/Model/AnyId.pm                          |  10 +-
 lib/Config/Model/AnyThing.pm                       |  11 +-
 lib/Config/Model/Backend/Any.pm                    |  14 +-
 lib/Config/Model/Backend/Fstab.pm                  |   6 +-
 lib/Config/Model/Backend/IniFile.pm                |   6 +-
 lib/Config/Model/Backend/Json.pm                   |   6 +-
 lib/Config/Model/Backend/PlainFile.pm              |   6 +-
 lib/Config/Model/Backend/ShellVar.pm               |   6 +-
 lib/Config/Model/Backend/Yaml.pm                   |   6 +-
 lib/Config/Model/BackendMgr.pm                     | 103 ++--
 lib/Config/Model/CheckList.pm                      |   8 +-
 lib/Config/Model/Cookbook/CreateModelFromDoc.pod   |   4 +-
 lib/Config/Model/Describe.pm                       |   6 +-
 lib/Config/Model/DumpAsData.pm                     |   6 +-
 lib/Config/Model/Dumper.pm                         |   6 +-
 lib/Config/Model/Exception.pm                      | 593 +++++++++++----------
 lib/Config/Model/FuseUI.pm                         |   6 +-
 lib/Config/Model/HashId.pm                         |   6 +-
 lib/Config/Model/IdElementReference.pm             |   6 +-
 lib/Config/Model/Instance.pm                       |  18 +-
 lib/Config/Model/Iterator.pm                       |   6 +-
 lib/Config/Model/ListId.pm                         |   6 +-
 lib/Config/Model/Lister.pm                         |   6 +-
 lib/Config/Model/Loader.pm                         |   6 +-
 lib/Config/Model/Manual/ModelCreationAdvanced.pod  |   4 +-
 .../Model/Manual/ModelCreationIntroduction.pod     |   4 +-
 lib/Config/Model/Node.pm                           |  30 +-
 lib/Config/Model/ObjTreeScanner.pm                 |   6 +-
 lib/Config/Model/Report.pm                         |   6 +-
 lib/Config/Model/SearchElement.pm                  |   6 +-
 lib/Config/Model/SimpleUI.pm                       |   6 +-
 lib/Config/Model/TermUI.pm                         |   6 +-
 lib/Config/Model/TreeSearcher.pm                   |   6 +-
 lib/Config/Model/Value.pm                          |  14 +-
 lib/Config/Model/Value/LayeredInclude.pm           |   6 +-
 lib/Config/Model/ValueComputer.pm                  |  94 +++-
 lib/Config/Model/WarpedNode.pm                     |  12 +-
 lib/Config/Model/Warper.pm                         |  15 +-
 lib/Config/Model/models/Fstab.pod                  |   4 +-
 lib/Config/Model/models/Fstab/FsLine.pod           |   4 +-
 lib/Config/Model/models/Multistrap.pod             |   4 +-
 lib/Config/Model/models/Multistrap/Section.pod     |   4 +-
 lib/Config/Model/models/PopCon.pod                 |   4 +-
 script/cme                                         |  21 +-
 t/backend_ini_with_section_map.t                   |   8 +-
 t/backend_mgr.t                                    |   2 +-
 t/cme-command.t                                    |  13 +-
 t/config-edit-command.t                            |   2 +-
 t/model_tests.d/multistrap-test-conf.pl            |   8 +-
 t/value_compute.t                                  |  52 +-
 59 files changed, 807 insertions(+), 486 deletions(-)

diff --cc debian/changelog
index da24a86,0aef508..3c2eb93
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,17 -1,19 +1,33 @@@
- libconfig-model-perl (2.045-3) unstable; urgency=low
++libconfig-model-perl (2.046-2) unstable; urgency=low
 +
 +  *  dh_cme_upgrade (formerly dh_config_model_upgrade):
 +    * mostly re-written
 +    * run before install (ignored if run too soon)
 +    + add a template file to query user whether to perform
 +      automatic upgrade or not
 +  + added debian/dh/config-script-cme
 +  * debian/dh/postinst-cme:
 +    * use '-backup dpkg-old' when calling 'cme migrate'
 +    * fix manual upgrade instructions
 +
 + -- Dominique Dumont <dod at debian.org>  Sun, 17 Nov 2013 18:35:56 +0100
 +
+ libconfig-model-perl (2.046-1) unstable; urgency=medium
+ 
+   * Imported Upstream version 2.046
+     * cme:
+       + added -create option to force creation of missing configuration
+         file
+       * improved message about applied changes and don't show '0' as <undef>
+     * BackendMgr:
+       + add note about cme in header of saved file (if comments
+          are supported in the configuration file format)
+       * Improved error message when no config file is found
+       * skip backup copy if no original file is found
+   * control: removed version of BD-I libconfig-model-tester-perl
+ 
+  -- Dominique Dumont <dod at debian.org>  Wed, 18 Dec 2013 19:43:50 +0100
+ 
  libconfig-model-perl (2.045-2) unstable; urgency=low
  
    * Add missing Depends on libpath-class-perl (Closes: #728494, #728514)

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