Imported Upstream version 1.06upstream/1.06

7 files changed, 108 insertions, 12 deletions

diff --git a/MANIFEST b/MANIFEST
new file mode 100644
index 0000000..9604b91
--- /dev/null
+++ b/MANIFEST
@@ -0,0 +1,15 @@
+gettext.pm
+gettext.xs
+Makefile.PL
+README
+t/bind.t
+t/frconvert.t
+t/jaconvert.t
+t/raw.t
+t/use.t
+test_data/foo.po
+test_data/gen_test_data.pl
+test_data/jaeuc.po
+MANIFEST
+META.yml                                 Module YAML meta-data (added by MakeMaker)
+META.json                                Module JSON meta-data (added by MakeMaker)
diff --git a/META.json b/META.json
new file mode 100644
index 0000000..fd26a1f
--- /dev/null
+++ b/META.json
@@ -0,0 +1,47 @@
+{
+   "abstract" : "Perl bindings for POSIX i18n gettext functions",
+   "author" : [
+      "Kim Vandry <vandry.ORG>"
+   ],
+   "dynamic_config" : 1,
+   "generated_by" : "ExtUtils::MakeMaker version 6.66, CPAN::Meta::Converter version 2.120921",
+   "license" : [
+      "perl_5"
+   ],
+   "meta-spec" : {
+      "url" : "http://search.cpan.org/perldoc?CPAN::Meta::Spec",
+      "version" : "2"
+   },
+   "name" : "Locale-gettext",
+   "no_index" : {
+      "directory" : [
+         "t",
+         "inc"
+      ]
+   },
+   "prereqs" : {
+      "build" : {
+         "requires" : {
+            "ExtUtils::MakeMaker" : "0"
+         }
+      },
+      "configure" : {
+         "requires" : {
+            "ExtUtils::MakeMaker" : "0"
+         }
+      },
+      "runtime" : {
+         "requires" : {}
+      }
+   },
+   "release_status" : "stable",
+   "resources" : {
+      "license" : [
+         "http://dev.perl.org/licenses/"
+      ],
+      "repository" : {
+         "url" : "https://github.com/vandry/Perl-Locale-gettext"
+      }
+   },
+   "version" : "1.06"
+}
diff --git a/META.yml b/META.yml
new file mode 100644
index 0000000..1ef332e
--- /dev/null
+++ b/META.yml
@@ -0,0 +1,24 @@
+---
+abstract: 'Perl bindings for POSIX i18n gettext functions'
+author:
+  - 'Kim Vandry <vandry.ORG>'
+build_requires:
+  ExtUtils::MakeMaker: 0
+configure_requires:
+  ExtUtils::MakeMaker: 0
+dynamic_config: 1
+generated_by: 'ExtUtils::MakeMaker version 6.66, CPAN::Meta::Converter version 2.120921'
+license: perl
+meta-spec:
+  url: http://module-build.sourceforge.net/META-spec-v1.4.html
+  version: 1.4
+name: Locale-gettext
+no_index:
+  directory:
+    - t
+    - inc
+requires: {}
+resources:
+  license: http://dev.perl.org/licenses/
+  repository: https://github.com/vandry/Perl-Locale-gettext
+version: 1.06
diff --git a/Makefile.PL b/Makefile.PL
index e1f7d45..bd82428 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -35,6 +35,15 @@ WriteMakefile(
     NAME => "Locale::gettext",
     LIBS => ($libs eq '') ? [] : [$libs],
     VERSION_FROM => 'gettext.pm', 
+    META_MERGE => {
+        resources => {
+            repository => 'https://github.com/vandry/Perl-Locale-gettext',
+            license => 'http://dev.perl.org/licenses/',
+        },
+    },
+    ABSTRACT => "Perl bindings for POSIX i18n gettext functions",
+    AUTHOR => "Kim Vandry <vandry@TZoNE.ORG>",
+    LICENSE => 'perl',
 );
 
 sub conftest {
@@ -50,7 +59,7 @@ sub conftest {
 	close TEST;
 	open(SAVE, ">&STDERR");
 	open(STDERR, ">/dev/null");
-	system($cc . " -o conftest " . $libs . " conftest.c");
+	system($cc . " -o conftest " . " conftest.c " . $libs);
 	my $exitstatus = $?;
 	open(STDERR, ">&SAVE");
 	if ($exitstatus != 0) {
diff --git a/README b/README
index 2293af5..cd06a9d 100644
--- a/README
+++ b/README
@@ -1,5 +1,5 @@
 Locale::gettext
-version 1.05
+version 1.06
 
 This is a perl5 module quickly written to gain access to
 the C library functions for internatialization. They
@@ -8,7 +8,7 @@ work just like the C versions.
 As of version 1.04, an object oriented interface more
 suitable to native Perl programs is available.
 
-Locale::gettext is Copyright 1996..2005 by Phillip Vandry
+Locale::gettext is Copyright 1996..2005 by Kim Vandry
 <vandry@TZoNE.ORG>. All rights reserved.
 
 This library is free software; you may distribute under the terms
@@ -18,6 +18,10 @@ specified in the Perl README file.
 Changes
 -------
 
+1.06	Bugfix: #104667	Makefile.PL libaries need to be listed after .o files
+	Bugfix: #104668	ensure availability of locale API, correct typo in documentation
+	Add META.yml (Fixes #91921)
+
 1.05	Bugfix: [cpan #13042] useless #ifdef should be #if
 	Bugfix: [cpan #13044] make test fails when using POSIX locale
 
@@ -48,7 +52,7 @@ Note that your vendor's implementation of these functions
 may be a bit different, but I think that in general these
 are quite standard POSIX functions.
 
-Phillip Vandry <vandry@TZoNE.ORG>
+Kim Vandry <vandry@TZoNE.ORG>
 Mlink Internet <http://www.Mlink.NET>
 July 1996
 
diff --git a/config.h b/config.h
deleted file mode 100644
index 2f6619c..0000000
--- a/config.h
+++ /dev/null
@@ -1,4 +0,0 @@
-/* Generated automatically by Makefile.PL. Do not edit */
-#define HAVE_DGETTEXT
-#define HAVE_NGETTEXT
-#define HAVE_BIND_TEXTDOMAIN_CODESET
diff --git a/gettext.pm b/gettext.pm
index fa2465a..d0a5af0 100644
--- a/gettext.pm
+++ b/gettext.pm
@@ -32,6 +32,7 @@ to internationalize software.
 =cut
 
 use Carp;
+use POSIX qw(:locale_h);
 
 require Exporter;
 require DynaLoader;
@@ -45,7 +46,7 @@ BEGIN {
 	import Encode if ($encode_available);
 }
 
-$VERSION = "1.05" ;
+$VERSION = "1.06" ;
 
 %EXPORT_TAGS = (
 
@@ -235,7 +236,7 @@ sub DESTROY {
 gettext(), dgettext(), and dcgettext() attempt to retrieve a string
 matching their C<msgid> parameter within the context of the current
 locale. dcgettext() takes the message's category and the text domain
-as parameters while dcgettext() defaults to the LC_MESSAGES category
+as parameters while dgettext() defaults to the LC_MESSAGES category
 and gettext() defaults to LC_MESSAGES and uses the current text domain.
 If the string is not found in the database, then C<msgid> is returned.
 
@@ -267,7 +268,7 @@ not provide it.
 
 =head1 VERSION
 
-1.05.
+1.06.
 
 =head1 SEE ALSO
 
@@ -275,7 +276,7 @@ gettext(3i), gettext(1), msgfmt(1)
 
 =head1 AUTHOR
 
-Phillip Vandry <vandry@TZoNE.ORG>
+Kim Vandry <vandry@TZoNE.ORG>
 
 =cut