[Bps-public-commit] Locale-Maketext-Simple branch, master, updated. 44b772297fc6e32dfdeb52053f0c42cc34420d5e

[jesse]

The branch, master has been updated
       via  44b772297fc6e32dfdeb52053f0c42cc34420d5e (commit)
       via  f9566b555691802b91a27ae243ecfa24105184b1 (commit)
       via  e08d365ce1a0bb7f0dc0fd17252f71ab2c40ee2a (commit)
      from  f4562b6b855a085d1791f8d1f33d4ac90acc6edd (commit)

Summary of changes:
 .gitignore                      |    4 ++--
 Changes                         |    5 ++++-
 MANIFEST                        |    9 ---------
 t/2-load_po_without_i_default.t |   12 +++++++++++-
 t/3-load_po_with_i_default.t    |   12 +++++++++++-
 5 files changed, 28 insertions(+), 14 deletions(-)

- Log -----------------------------------------------------------------
commit e08d365ce1a0bb7f0dc0fd17252f71ab2c40ee2a
Author: Tomas Doran <t0m at badger.state51.co.uk>
Date:   Sun Jul 12 12:29:06 2009 +0100

    Fix manifest now that we're not using Module::Install

diff --git a/MANIFEST b/MANIFEST
index 54901f6..709863f 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -1,13 +1,4 @@
 Changes
-inc/Module/Install.pm
-inc/Module/Install/Base.pm
-inc/Module/Install/Can.pm
-inc/Module/Install/Fetch.pm
-inc/Module/Install/Makefile.pm
-inc/Module/Install/Metadata.pm
-inc/Module/Install/Win32.pm
-inc/Module/Install/WriteAll.pm
-lib/Locale/Maketext/Simple.pm
 Makefile.PL
 MANIFEST			This list of files
 MANIFEST.SKIP

commit f9566b555691802b91a27ae243ecfa24105184b1
Author: Tomas Doran <t0m at badger.state51.co.uk>
Date:   Sun Jul 12 12:43:59 2009 +0100

    Fix test fails seen on CPANTs as I could reproduce on one of our non-perl servers :)

diff --git a/Changes b/Changes
index cffc871..524fe31 100644
--- a/Changes
+++ b/Changes
@@ -1,9 +1,12 @@
 
 [Changes for 0.21 - ]
 
-* MakeMaker Makefile.PL which takes into account the fact that 
+* MakeMaker Makefile.PL which takes into account the fact that
   we're now dual-lifed contributed by Jerry D. Hedden
 
+* Fix the i-default tests to skip if Local::Maketext::Lexicon is not
+  installed as they fail - Tomas Doran
+
 [Changes for 0.20 - 2009-07-08]
 
 * MANIFEST fixes (no code changes) - Tomas Doran
diff --git a/t/2-load_po_without_i_default.t b/t/2-load_po_without_i_default.t
index 2587ce5..47a9823 100755
--- a/t/2-load_po_without_i_default.t
+++ b/t/2-load_po_without_i_default.t
@@ -6,7 +6,17 @@ use Locale::Maketext::Simple (
 	Path => "$Bin/po_without_i_default",
 	Style => "gettext",
 );
- 
+
+eval {
+    require Locale::Maketext::Lexicon;
+    die unless Locale::Maketext::Lexicon->VERSION(0.20);
+    require File::Spec;
+};
+if ($@) {
+    plan skip_all => 'No soft dependencies, i_default will not work';
+    exit 0;
+}
+
 plan tests => 5;
 
 loc_lang("en");
diff --git a/t/3-load_po_with_i_default.t b/t/3-load_po_with_i_default.t
index f8a58c5..a880710 100755
--- a/t/3-load_po_with_i_default.t
+++ b/t/3-load_po_with_i_default.t
@@ -6,7 +6,17 @@ use Locale::Maketext::Simple (
 	Path => "$Bin/po_with_i_default",
 	Style => "gettext",
 );
- 
+
+eval {
+    require Locale::Maketext::Lexicon;
+    die unless Locale::Maketext::Lexicon->VERSION(0.20);
+    require File::Spec;
+};
+if ($@) {
+    plan skip_all => 'No soft dependencies, i_default will not work';
+    exit 0;
+}
+
 plan tests => 6;
 
 loc_lang("en");

commit 44b772297fc6e32dfdeb52053f0c42cc34420d5e
Author: Tomas Doran <t0m at badger.state51.co.uk>
Date:   Sun Jul 12 12:45:12 2009 +0100

    Update .gitignore

diff --git a/.gitignore b/.gitignore
index 7b01dee..dd3069c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,6 @@
 MANIFEST.bak
 META.yml
 Makefile
-inc/
-blib/
+blib
 pm_to_blib
+*.swp

-----------------------------------------------------------------------