[libmarpa-r2-perl] 06/12: Work on libmarpa version #: config changes

[Jonas Smedegaard]

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

js pushed a commit to annotated tag Marpa-R2-2.085_002
in repository libmarpa-r2-perl.

commit 44ae13c7e5d93ed0436efa45ab14f6dad3c520c5
Author: Jeffrey Kegler <JKEGL at cpan.org>
Date:   Tue Apr 15 18:59:38 2014 -0700

    Work on libmarpa version #: config changes
---
 cpan/MANIFEST                     | 2 --
 cpan/inc/Marpa/R2/License.pm      | 2 --
 cpan/libmarpa/ac/configure.ac     | 2 +-
 cpan/libmarpa/ac_doc/configure.ac | 2 +-
 cpan/xs/R2.xs                     | 2 +-
 5 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/cpan/MANIFEST b/cpan/MANIFEST
index 008abf0..9b8e052 100644
--- a/cpan/MANIFEST
+++ b/cpan/MANIFEST
@@ -152,8 +152,6 @@ libmarpa/obs/marpa_obs.c
 libmarpa/obs/marpa_obs.h
 libmarpa/public/.gitignore
 libmarpa/public/Makefile
-libmarpa/public/VERSION
-libmarpa/public/marpa.h-version
 libmarpa/public/marpa.h.p10
 libmarpa/public/marpa.h.p90
 libmarpa/public/marpa_codes.c.p10
diff --git a/cpan/inc/Marpa/R2/License.pm b/cpan/inc/Marpa/R2/License.pm
index 282339a..3093c4a 100644
--- a/cpan/inc/Marpa/R2/License.pm
+++ b/cpan/inc/Marpa/R2/License.pm
@@ -281,12 +281,10 @@ my %files_by_type = (
     'html/t/fmt_t_data/score_expected2.html' => \&trivial,
     'html/t/no_tang.html'                    => \&ignored,
     'html/t/test.html'                       => \&ignored,
-    'libmarpa/public/VERSION'                       => \&trivial,
     'libmarpa/shared/do_not_edit.c'                    => \&trivial,
     'libmarpa/public/marpa_codes.c.p10' => \&trivial,
     'libmarpa/public/marpa_slif.h.p20' => \&trivial,
     'libmarpa/public/marpa.h.p10' => \&trivial,
-    'libmarpa/public/marpa.h-version' => \&trivial,
     'libmarpa/public/marpa.h.p90' => \&trivial,
     'libmarpa/dev/README'                    => \&trivial,
     'libmarpa_dist/VERSION'                 => \&trivial,
diff --git a/cpan/libmarpa/ac/configure.ac b/cpan/libmarpa/ac/configure.ac
index 205a8ef..3f2ed9d 100644
--- a/cpan/libmarpa/ac/configure.ac
+++ b/cpan/libmarpa/ac/configure.ac
@@ -23,7 +23,7 @@ dnl ***********************************
 
 m4_define(marpa_configure_in)
 
-m4_define([marpa_major_version], [3])
+m4_define([marpa_major_version], [6])
 m4_define([marpa_minor_version], [0])
 m4_define([marpa_micro_version], [0])
 m4_define([marpa_version],
diff --git a/cpan/libmarpa/ac_doc/configure.ac b/cpan/libmarpa/ac_doc/configure.ac
index 1ffd487..729de12 100644
--- a/cpan/libmarpa/ac_doc/configure.ac
+++ b/cpan/libmarpa/ac_doc/configure.ac
@@ -23,7 +23,7 @@ dnl ***********************************
 
 m4_define(marpa_configure_in)
 
-m4_define([marpa_major_version], [3])
+m4_define([marpa_major_version], [6])
 m4_define([marpa_minor_version], [0])
 m4_define([marpa_micro_version], [0])
 m4_define([marpa_version],
diff --git a/cpan/xs/R2.xs b/cpan/xs/R2.xs
index 9b203ce..c9c3791 100644
--- a/cpan/xs/R2.xs
+++ b/cpan/xs/R2.xs
@@ -2368,7 +2368,7 @@ slr_es_span_to_literal_sv (Scanless_R * slr,
   return newSVpvn ("", 0);
 }
 
-#define EXPECTED_LIBMARPA_MAJOR 3
+#define EXPECTED_LIBMARPA_MAJOR 6
 #define EXPECTED_LIBMARPA_MINOR 0
 #define EXPECTED_LIBMARPA_MICRO 0
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libmarpa-r2-perl.git