[libtest-bdd-cucumber-perl] 04/06: Merge tag 'debian/0.25-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 b8fbd3237dfbeb414cff1768b15c553ac9a454fa
Merge: 3f74048 9e23f0e
Author: intrigeri <intrigeri at boum.org>
Date:   Thu Jun 19 09:56:56 2014 +0000

    Merge tag 'debian/0.25-1' into wheezy-backports
    
    tagging package libtest-bdd-cucumber-perl version debian/0.25-1
    
    Conflicts:
    	debian/changelog

 CHANGES                                       |  3 +
 MANIFEST                                      |  1 +
 META.yml                                      |  3 +-
 Makefile.PL                                   |  4 +-
 README                                        |  2 +-
 bin/pherkin                                   |  2 +-
 debian/changelog                              |  8 +++
 debian/control                                |  2 +
 dist.ini                                      |  3 +-
 lib/App/pherkin.pm                            |  4 +-
 lib/Test/BDD/Cucumber.pm                      |  4 +-
 lib/Test/BDD/Cucumber/Errors.pm               |  7 ++-
 lib/Test/BDD/Cucumber/Executor.pm             | 77 +++++++++++++++++++++---
 lib/Test/BDD/Cucumber/Harness.pm              |  9 ++-
 lib/Test/BDD/Cucumber/Harness/Data.pm         |  7 ++-
 lib/Test/BDD/Cucumber/Harness/TermColor.pm    | 26 ++++-----
 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 +-
 t/260_match_matcher.t                         | 84 +++++++++++++++++++++++++++
 36 files changed, 245 insertions(+), 77 deletions(-)

diff --cc debian/changelog
index 5fa05f4,9819424..8d507dd
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,11 +1,20 @@@
+ libtest-bdd-cucumber-perl (0.25-1) unstable; urgency=medium
+ 
+   * Team upload.
+   * New upstream release.
+   * Add (build) dependency on libnumber-range-perl.
+ 
+  -- gregor herrmann <gregoa at debian.org>  Thu, 12 Jun 2014 18:09:49 +0200
+ 
 +libtest-bdd-cucumber-perl (0.24-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>  Sat, 07 Jun 2014 23:42:15 +0200
 +
  libtest-bdd-cucumber-perl (0.24-1) unstable; urgency=medium
  
    * Team upload.

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