[libtest-bdd-cucumber-perl] 01/03: Merge tag 'debian/0.26-1' into wheezy-backports

[Intrigeri]

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

intrigeri pushed a commit to branch wheezy-backports
in repository libtest-bdd-cucumber-perl.

commit 577e4ed1de2e6bca89eb54c2860338ab1f600f08
Merge: 8582fc6 7f1bdc8
Author: intrigeri <intrigeri at boum.org>
Date:   Fri Jun 27 21:31:13 2014 +0000

    Merge tag 'debian/0.26-1' into wheezy-backports
    
    libtest-bdd-cucumber-perl Debian release 0.26-1
    
    Conflicts:
    	debian/changelog
    	debian/control

 CHANGES                                            |  4 ++
 MANIFEST                                           |  5 +-
 META.yml                                           |  3 +-
 Makefile.PL                                        |  4 +-
 README                                             |  2 +-
 TODO                                               | 15 +-----
 bin/pherkin                                        |  2 +-
 debian/changelog                                   |  9 ++++
 debian/control                                     |  2 +
 debian/upstream/metadata                           |  6 +++
 dist.ini                                           |  3 +-
 .../features/step_definitions/calculator_steps.pl  |  2 +-
 .../features/step_definitions/basic_steps.pl       |  6 +--
 .../features/step_definitions/calculator_steps.pl  |  2 +-
 .../features/step_definitions/basic_steps.pl       |  2 +-
 lib/App/pherkin.pm                                 |  4 +-
 lib/Test/BDD/Cucumber.pm                           |  4 +-
 lib/Test/BDD/Cucumber/Errors.pm                    |  4 +-
 lib/Test/BDD/Cucumber/Executor.pm                  |  4 +-
 lib/Test/BDD/Cucumber/Harness.pm                   |  4 +-
 lib/Test/BDD/Cucumber/Harness/Data.pm              |  4 +-
 lib/Test/BDD/Cucumber/Harness/TermColor.pm         | 63 ++++++++++++++--------
 lib/Test/BDD/Cucumber/Harness/TestBuilder.pm       |  4 +-
 lib/Test/BDD/Cucumber/I18N/Data.pm                 |  4 +-
 lib/Test/BDD/Cucumber/I18n.pm                      |  4 +-
 lib/Test/BDD/Cucumber/Loader.pm                    |  4 +-
 lib/Test/BDD/Cucumber/Manual/Architecture.pod      |  4 +-
 lib/Test/BDD/Cucumber/Manual/Integration.pod       |  4 +-
 lib/Test/BDD/Cucumber/Manual/Steps.pod             |  4 +-
 lib/Test/BDD/Cucumber/Manual/Tutorial.pod          |  4 +-
 lib/Test/BDD/Cucumber/Model/Document.pm            |  4 +-
 lib/Test/BDD/Cucumber/Model/Feature.pm             |  4 +-
 lib/Test/BDD/Cucumber/Model/Line.pm                |  4 +-
 lib/Test/BDD/Cucumber/Model/Result.pm              |  4 +-
 lib/Test/BDD/Cucumber/Model/Scenario.pm            |  4 +-
 lib/Test/BDD/Cucumber/Model/Step.pm                |  4 +-
 lib/Test/BDD/Cucumber/Model/TagSpec.pm             |  4 +-
 lib/Test/BDD/Cucumber/Parser.pm                    |  4 +-
 lib/Test/BDD/Cucumber/StepContext.pm               |  4 +-
 lib/Test/BDD/Cucumber/StepFile.pm                  |  4 +-
 lib/Test/BDD/Cucumber/Util.pm                      |  4 +-
 ...calized-features.t => 240_localized_features.t} |  0
 t/{250-i18n-json.t => 250_i18n_json.t}             |  0
 t/800_regressions_020_term_color_skipped_steps.t   | 58 ++++++++++++++++++++
 .../010_greedy_table_parsing/test_steps.pl         |  2 +-
 45 files changed, 192 insertions(+), 98 deletions(-)

diff --cc debian/changelog
index f2aba1e,619def8..af88bba
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,12 +1,21 @@@
+ libtest-bdd-cucumber-perl (0.26-1) unstable; urgency=medium
+ 
+   * New upstream release.
+   * Add new {runtime,build}-dependency on libio-stringy-perl,
+     that provides IO::Scalar.
+   * Add debian/upstream/metadata.
+ 
+  -- intrigeri <intrigeri at debian.org>  Sat, 21 Jun 2014 12:08:53 +0200
+ 
 +libtest-bdd-cucumber-perl (0.25-1~bpo70+1) wheezy-backports; urgency=medium
 +
 +  * Rebuild for wheezy-backports.
 +  * New (backport specific) patch: use JSON::XS instead of JSON::MaybeXS.
 +  * Adjust {build,runtime}-dependencies: replace libjson-maybexs-perl
 +    with libjson-xs-perl.
 +
 + -- intrigeri <intrigeri at debian.org>  Thu, 19 Jun 2014 11:59:21 +0200
 +
  libtest-bdd-cucumber-perl (0.25-1) unstable; urgency=medium
  
    * Team upload.
diff --cc debian/control
index 75e7d90,9189496..e3de0bb
--- a/debian/control
+++ b/debian/control
@@@ -8,7 -8,8 +8,8 @@@ Build-Depends-Indep: libclone-perl
                       libfile-find-rule-perl,
                       libfile-slurp-perl,
                       libfindbin-libs-perl,
+                      libio-stringy-perl,
 -                     libjson-maybexs-perl,
 +                     libjson-xs-perl,
                       liblist-moreutils-perl,
                       libmodule-runtime-perl,
                       libmoose-perl,
@@@ -30,7 -31,8 +31,8 @@@ Depends: ${misc:Depends}
           libfile-find-rule-perl,
           libfile-slurp-perl,
           libfindbin-libs-perl,
+          libio-stringy-perl,
 -         libjson-maybexs-perl,
 +         libjson-xs-perl,
           liblist-moreutils-perl,
           libmodule-runtime-perl,
           libmoose-perl,

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libtest-bdd-cucumber-perl.git