[SCM] Debian packaging of libmarc-charset-perl branch, master, updated. a7679785c45c4307d9ea47e67fd6e182ec324786

gregor herrmann gregoa at debian.org
Wed Aug 17 17:53:25 UTC 2011


The following commit has been merged in the master branch:
commit dd1ebcfe03e32c97986606bcb4c9f4d271816c9d
Author: gregor herrmann <gregoa at debian.org>
Date:   Wed Aug 17 19:25:23 2011 +0200

    Imported Upstream version 1.33

diff --git a/Changes b/Changes
index f8441da..f7fee7f 100644
--- a/Changes
+++ b/Changes
@@ -1,5 +1,13 @@
 Revision history for MARC::Charset
 
+1.33 Thu Aug  4 23:25:14 EDT 2011
+    - move build_db() to separate .PL script so that module can be
+      built even if Class::Accessor and other dependencies aren't
+      available before Makefile.PL is run.
+    - list GDBM_File as an explicit dependency, assome distributions
+      like ActivePerl don't include it even though it is a
+      core module.
+
 1.32 Thu Jun 30 16:38:32 EDT 2011
     - make sure utf8 flag set in output of marc8_to_utf8
 
diff --git a/MANIFEST b/MANIFEST
index 460a824..02056b5 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -1,5 +1,6 @@
 bin/compile_table
 bin/print_table
+build_db.PL
 Changes
 etc/additional-iii-characters.xml
 etc/codetables.xml
diff --git a/META.yml b/META.yml
index b3015f5..b7bfa7a 100644
--- a/META.yml
+++ b/META.yml
@@ -1,6 +1,6 @@
 --- #YAML:1.0
 name:               MARC-Charset
-version:            1.32
+version:            1.33
 abstract:           convert MARC-8 encoded strings to UTF-8
 author:
     - Ed Summers <ehs at pobox.com>
@@ -12,6 +12,7 @@ build_requires:
     ExtUtils::MakeMaker:  0
 requires:
     Class::Accessor:     0
+    GDBM_File:           0
     Test::More:          0
     Unicode::Normalize:  0
     XML::SAX:            0
diff --git a/Makefile.PL b/Makefile.PL
index 4cc5ad2..bf04cf6 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -1,9 +1,6 @@
 use 5.8.0;
 use ExtUtils::MakeMaker;
 
-# try to build the character mapping db
-build_db();
-
 WriteMakefile(
     NAME            => 'MARC::Charset',
     DISTNAME        => 'MARC-Charset',
@@ -16,20 +13,6 @@ WriteMakefile(
                             'XML::SAX'              => 0,
                             'Class::Accessor'       => 0,
                             'Unicode::Normalize'    => 0,
+                            'GDBM_File'             => 0,
                        },
 );
-
-# build_db will return immediately if we can't use
-# MARC::Charset::Compiler which will typically 
-# happen when dependencies aren't met
-
-sub build_db
-{
-    eval('use lib "lib"; use MARC::Charset::Compiler');
-    return if $@;
-
-    print "compiling marc8/utf8 database, please be patient\n";
-    my $compiler = MARC::Charset::Compiler->new();
-    $compiler->compile('etc/codetables.xml');
-    $compiler->compile('etc/additional-iii-characters.xml');
-}
diff --git a/build_db.PL b/build_db.PL
new file mode 100644
index 0000000..d243b1d
--- /dev/null
+++ b/build_db.PL
@@ -0,0 +1,5 @@
+use MARC::Charset::Compiler;
+print "compiling marc8/utf8 database, please be patient\n";
+my $compiler = MARC::Charset::Compiler->new();
+$compiler->compile('etc/codetables.xml');
+$compiler->compile('etc/additional-iii-characters.xml');
diff --git a/lib/MARC/Charset.pm b/lib/MARC/Charset.pm
index 203c4d1..dee6920 100644
--- a/lib/MARC/Charset.pm
+++ b/lib/MARC/Charset.pm
@@ -1,6 +1,6 @@
 package MARC::Charset;
 
-our $VERSION = '1.32';
+our $VERSION = '1.33';
 use strict;
 use warnings;
 
diff --git a/t/pod.t b/t/pod.t
old mode 100755
new mode 100644

-- 
Debian packaging of libmarc-charset-perl



More information about the Pkg-perl-cvs-commits mailing list