Permalink
Browse files

resolve ext/B/B.pm merge conflict

  • Loading branch information...
2 parents de31604 + f6e302c commit 3204ca7c32b9e1de9e0e0730b507a718046d2215 @rurban committed Feb 8, 2012
Showing with 11,034 additions and 3,834 deletions.
  1. +3 −0 Configure
  2. +7 −0 MANIFEST
  3. +8 −8 Makefile.SH
  4. +4 −3 Porting/Maintainers.pl
  5. +22 −7 Porting/bisect-runner.pl
  6. +1 −0 Porting/checkAUTHORS.pl
  7. +2 −0 Porting/pod_lib.pl
  8. +19 −25 Porting/release_schedule.pod
  9. +1 −1 config_h.SH
  10. +4 −4 cpan/CPAN-Meta-YAML/lib/CPAN/Meta/YAML.pm
  11. +15 −0 cpan/CPAN-Meta/Changes
  12. +2 −2 cpan/CPAN-Meta/lib/CPAN/Meta.pm
  13. +15 −12 cpan/CPAN-Meta/lib/CPAN/Meta/Converter.pm
  14. +2 −2 cpan/CPAN-Meta/lib/CPAN/Meta/Feature.pm
  15. +3 −3 cpan/CPAN-Meta/lib/CPAN/Meta/History.pm
  16. +2 −2 cpan/CPAN-Meta/lib/CPAN/Meta/Prereqs.pm
  17. +2 −2 cpan/CPAN-Meta/lib/CPAN/Meta/Requirements.pm
  18. +5 −5 cpan/CPAN-Meta/lib/CPAN/Meta/Spec.pm
  19. +2 −2 cpan/CPAN-Meta/lib/CPAN/Meta/Validator.pm
  20. +1 −1 cpan/DB_File/t/db-btree.t
  21. +1 −1 cpan/List-Util/ListUtil.xs
  22. +8 −0 cpan/Version-Requirements/Changes
  23. +6 −3 cpan/Version-Requirements/lib/Version/Requirements.pm
  24. +1 −1 cpan/autodie/t/backcompat.t
  25. +20 −9 dist/Carp/lib/Carp.pm
  26. +1 −1 dist/Carp/lib/Carp/Heavy.pm
  27. +13 −13 dist/Carp/t/Carp.t
  28. +5 −1 dist/Carp/t/heavy.t
  29. +5 −0 dist/Carp/t/swash.t
  30. +6 −11 dist/Carp/t/vivify_gv.t
  31. +9 −0 dist/Carp/t/vivify_stash.t
  32. +9 −0 dist/Carp/t/with_warnings.t
  33. +2 −1 dist/Cwd/Cwd.pm
  34. +5 −4 dist/Data-Dumper/Dumper.pm
  35. +7 −4 dist/Data-Dumper/Dumper.xs
  36. +18 −2 dist/Data-Dumper/t/dumper.t
  37. +24 −0 dist/Data-Dumper/t/qr.t
  38. +34 −0 ext/B/t/pollute.t
  39. +1 −1 ext/Hash-Util/t/Util.t
  40. +17 −12 ext/PerlIO-scalar/t/scalar.t
  41. +145 −36 ext/Pod-Html/lib/Pod/Html.pm
  42. +3 −0 ext/Pod-Html/t/cache.pod
  43. +71 −0 ext/Pod-Html/t/cache.t
  44. +1 −0 ext/Pod-Html/t/pod2html-lib.pl
  45. +22 −31 ext/XS-Typemap/Typemap.xs
  46. +65 −45 ext/XS-Typemap/t/Typemap.t
  47. +1 −5 ext/re/re.pm
  48. +10 −1 ext/re/t/re.t
  49. +2 −2 l1_char_class_tab.h
  50. +0 −7 lib/ExtUtils/typemap
  51. +294 −213 lib/Unicode/UCD.pm
  52. +229 −134 lib/Unicode/UCD.t
  53. +43 −427 lib/_charnames.pm
  54. +24 −113 lib/charnames.pm
  55. +13 −4 lib/charnames.t
  56. +167 −120 lib/unicore/ArabicShaping.txt
  57. +21 −7 lib/unicore/BidiMirroring.txt
  58. +14 −3 lib/unicore/Blocks.txt
  59. +4 −3 lib/unicore/CJKRadicals.txt
  60. +17 −4 lib/unicore/CaseFolding.txt
  61. +6 −7 lib/unicore/CompositionExclusions.txt
  62. +128 −8 lib/unicore/DAge.txt
  63. +726 −180 lib/unicore/DCoreProperties.txt
  64. +321 −60 lib/unicore/DNormalizationProps.txt
  65. +737 −7 lib/unicore/EastAsianWidth.txt
  66. +6 −3 lib/unicore/EmojiSources.txt
  67. +3 −3 lib/unicore/HangulSyllableType.txt
  68. +29 −3 lib/unicore/Index.txt
  69. +32 −4 lib/unicore/IndicMatraCategory.txt
  70. +44 −5 lib/unicore/IndicSyllabicCategory.txt
  71. +8 −8 lib/unicore/Jamo.txt
  72. +862 −132 lib/unicore/LineBreak.txt
  73. +486 −18 lib/unicore/NameAliases.txt
  74. +10 −3 lib/unicore/NamedSequences.txt
  75. +4 −9 lib/unicore/NamedSqProv.txt
  76. +1,361 −42 lib/unicore/NamesList.txt
  77. +5 −5 lib/unicore/NormalizationCorrections.txt
  78. +120 −39 lib/unicore/PropList.txt
  79. +859 −757 lib/unicore/PropValueAliases.txt
  80. +120 −118 lib/unicore/PropertyAliases.txt
  81. +3 −3 lib/unicore/ReadMe.txt
  82. +44 −9 lib/unicore/ScriptExtensions.txt
  83. +186 −64 lib/unicore/Scripts.txt
  84. +6 −4 lib/unicore/SpecialCasing.txt
  85. +229 −7 lib/unicore/StandardizedVariants.txt
  86. +765 −34 lib/unicore/UnicodeData.txt
  87. +100 −50 lib/unicore/auxiliary/GCBTest.txt
  88. +52 −39 lib/unicore/auxiliary/GraphemeBreakProperty.txt
  89. +125 −32 lib/unicore/auxiliary/SentenceBreakProperty.txt
  90. +112 −24 lib/unicore/auxiliary/WordBreakProperty.txt
  91. +201 −72 lib/unicore/extracted/DBidiClass.txt
  92. +5 −5 lib/unicore/extracted/DBinaryProperties.txt
  93. +193 −94 lib/unicore/extracted/DCombiningClass.txt
  94. +48 −13 lib/unicore/extracted/DDecompositionType.txt
  95. +133 −50 lib/unicore/extracted/DEastAsianWidth.txt
  96. +230 −103 lib/unicore/extracted/DGeneralCategory.txt
  97. +29 −13 lib/unicore/extracted/DJoinGroup.txt
  98. +38 −9 lib/unicore/extracted/DJoinType.txt
  99. +196 −93 lib/unicore/extracted/DLineBreak.txt
  100. +19 −6 lib/unicore/extracted/DNumType.txt
  101. +79 −22 lib/unicore/extracted/DNumValues.txt
  102. +588 −294 lib/unicore/mktables
  103. +1 −1 lib/unicore/version
  104. +10 −9 lib/version.pod
  105. +8 −7 lib/version/t/07locale.t
  106. +2 −1 lib/warnings.pm
  107. +1 −1 make_ext.pl
  108. +212 −4 pod/perldelta.pod
  109. +1 −1 pod/perlfunc.pod
  110. +10 −2 pod/perlgit.pod
  111. +6 −5 pod/perlrun.pod
  112. +2 −1 regen/warnings.pl
  113. +1 −1 t/lib/warnings/2use
  114. +32 −32 t/lib/warnings/9enabled
  115. +3 −1 t/op/svleak.t
  116. +1 −1 t/porting/authors.t
  117. +3 −1 t/porting/known_pod_issues.dat
  118. +1 −1 t/re/pat_advanced.t
  119. +7 −1 universal.c
  120. +26 −14 utf8.c
  121. +1 −1 util.c
View
@@ -819,6 +819,7 @@ d_semctl_semun=''
d_union_semun=''
d_unordered=''
d_unsetenv=''
+d_userelocatableinc=''
d_usleep=''
d_usleepproto=''
d_ustat=''
@@ -6161,6 +6162,7 @@ y|Y) val="$define" ;;
esac
set userelocatableinc
eval $setvar
+d_userelocatableinc="$userelocatableinc"
initialinstalllocation="$binexp"
: Default prefix is now "up one level from where the binaries are"
@@ -23186,6 +23188,7 @@ d_uname='$d_uname'
d_union_semun='$d_union_semun'
d_unordered='$d_unordered'
d_unsetenv='$d_unsetenv'
+d_userelocatableinc='$d_userelocatableinc'
d_usleep='$d_usleep'
d_usleepproto='$d_usleepproto'
d_ustat='$d_ustat'
View
@@ -3051,7 +3051,10 @@ dist/Carp/lib/Carp.pm Error message extension
dist/Carp/Makefile.PL makefile writer for Carp
dist/Carp/t/Carp.t See if Carp works
dist/Carp/t/heavy.t See if Carp::Heavy works
+dist/Carp/t/swash.t See if Carp avoids breaking swash loading
dist/Carp/t/vivify_gv.t See if Carp leaves utf8:: stuff alone
+dist/Carp/t/vivify_stash.t See if Carp leaves utf8:: stash alone
+dist/Carp/t/with_warnings.t See if Carp plays nicely with warnings
dist/constant/lib/constant.pm For "use constant"
dist/constant/t/constant.t See if compile-time constants work
dist/constant/t/utf8.t Test Unicode constants under utf8 pragma
@@ -3086,6 +3089,7 @@ dist/Data-Dumper/Todo Data pretty printer, futures
dist/Data-Dumper/t/overload.t See if Data::Dumper works for overloaded data
dist/Data-Dumper/t/pair.t See if Data::Dumper pair separator works
dist/Data-Dumper/t/perl-74170.t Regression test for stack reallocation
+dist/Data-Dumper/t/qr.t See if Data::Dumper works with qr|/|
dist/Data-Dumper/t/terse.t See if Data::Dumper terse option works
dist/Devel-SelfStubber/lib/Devel/SelfStubber.pm Generate stubs for SelfLoader.pm
dist/Devel-SelfStubber/t/Devel-SelfStubber.t See if Devel::SelfStubber works
@@ -3646,6 +3650,7 @@ ext/B/t/optree_sort.t inplace sort optimization regression
ext/B/t/optree_specials.t BEGIN, END, etc code
ext/B/t/optree_varinit.t my,our,local var init optimization
ext/B/t/o.t See if O works
+ext/B/t/pollute.t constants may not pollute the compiler
ext/B/t/pragma.t See if user pragmas work.
ext/B/t/showlex.t See if B::ShowLex works
ext/B/t/terse.t See if B::Terse works
@@ -3801,6 +3806,8 @@ ext/PerlIO-via/via.pm PerlIO layer for layers in perl
ext/PerlIO-via/via.xs PerlIO layer for layers in perl
ext/Pod-Html/bin/pod2html Translator to turn pod into HTML
ext/Pod-Html/lib/Pod/Html.pm Convert POD data to HTML
+ext/Pod-Html/t/cache.pod
+ext/Pod-Html/t/cache.t
ext/Pod-Html/t/crossref.pod
ext/Pod-Html/t/crossref.t
ext/Pod-Html/testdir/perlpodspec-copy.pod
View
@@ -1202,16 +1202,16 @@ manicheck: FORCE
# DynaLoader may be needed for extensions that use Makefile.PL.
$(DYNALOADER): $(MINIPERL_EXE) lib/buildcustomize.pl preplibrary FORCE $(nonxs_ext)
- $(MINIPERL) make_ext.pl $@ MAKE=$(MAKE) LIBPERL_A=$(LIBPERL) LINKTYPE=static $(STATIC_LDFLAGS)
+ $(MINIPERL) make_ext.pl $@ MAKE="$(MAKE)" LIBPERL_A=$(LIBPERL) LINKTYPE=static $(STATIC_LDFLAGS)
d_dummy $(dynamic_ext): $(MINIPERL_EXE) lib/buildcustomize.pl preplibrary makeppport $(DYNALOADER) FORCE $(PERLEXPORT)
- $(MINIPERL) make_ext.pl $@ MAKE=$(MAKE) LIBPERL_A=$(LIBPERL) LINKTYPE=dynamic
+ $(MINIPERL) make_ext.pl $@ MAKE="$(MAKE)" LIBPERL_A=$(LIBPERL) LINKTYPE=dynamic
s_dummy $(static_ext): $(MINIPERL_EXE) lib/buildcustomize.pl preplibrary makeppport $(DYNALOADER) FORCE
- $(MINIPERL) make_ext.pl $@ MAKE=$(MAKE) LIBPERL_A=$(LIBPERL) LINKTYPE=static $(STATIC_LDFLAGS)
+ $(MINIPERL) make_ext.pl $@ MAKE="$(MAKE)" LIBPERL_A=$(LIBPERL) LINKTYPE=static $(STATIC_LDFLAGS)
n_dummy $(nonxs_ext): $(MINIPERL_EXE) lib/buildcustomize.pl preplibrary FORCE
- $(MINIPERL) make_ext.pl $@ MAKE=$(MAKE) LIBPERL_A=$(LIBPERL)
+ $(MINIPERL) make_ext.pl $@ MAKE="$(MAKE)" LIBPERL_A=$(LIBPERL)
!NO!SUBS!
$spitshell >>$Makefile <<EOF
@@ -1269,7 +1269,7 @@ _tidy:
-cd x2p; $(LDLIBPTH) $(MAKE) clean
-rm -f lib/Config_git.pl git_version.h
-@for x in $(DYNALOADER) $(dynamic_ext) $(static_ext) $(nonxs_ext) ; do \
- $(MINIPERL) make_ext.pl --target=clean $$x MAKE=$(MAKE) ; \
+ $(MINIPERL) make_ext.pl --target=clean $$x MAKE="$(MAKE)" ; \
done
_cleaner1:
@@ -1279,7 +1279,7 @@ _cleaner1:
-cd x2p; $(LDLIBPTH) $(MAKE) $(CLEAN)
-@if test -f $(MINIPERL_EXE) ; then \
for x in $(DYNALOADER) $(dynamic_ext) $(static_ext) $(nonxs_ext) ; do \
- $(MINIPERL) make_ext.pl --target=$(CLEAN) $$x MAKE=$(MAKE) ; \
+ $(MINIPERL) make_ext.pl --target=$(CLEAN) $$x MAKE="$(MAKE)" ; \
done ; \
else \
sh $(CLEAN).sh ; \
@@ -1378,7 +1378,7 @@ config.h: config_h.SH config.sh
.PHONY: depend
depend: makedepend
- sh ./makedepend MAKE=$(MAKE)
+ sh ./makedepend MAKE="$(MAKE)"
cd x2p; $(MAKE) depend
# Cannot postpone this until $firstmakefile is ready ;-)
@@ -1413,7 +1413,7 @@ test_prep test-prep: test_prep_pre $(MINIPERL_EXE) $(unidatafiles) $(PERL_EXE) \
cd t && (rm -f $(PERL_EXE); $(LNS) ../$(PERL_EXE) $(PERL_EXE))
test_prep_reonly: $(MINIPERL_EXE) $(PERL_EXE) $(dynamic_ext_re) $(TEST_PERL_DLL)
- $(MINIPERL) make_ext.pl $(dynamic_ext_re) MAKE=$(MAKE) LIBPERL_A=$(LIBPERL) LINKTYPE=dynamic
+ $(MINIPERL) make_ext.pl $(dynamic_ext_re) MAKE="$(MAKE)" LIBPERL_A=$(LIBPERL) LINKTYPE=dynamic
cd t && (rm -f $(PERL_EXE); $(LNS) ../$(PERL_EXE) $(PERL_EXE))
test check: test_prep
@@ -481,7 +481,7 @@ package Maintainers;
'CPAN::Meta' => {
'MAINTAINER' => 'dagolden',
- 'DISTRIBUTION' => 'RJBS/CPAN-Meta-2.113640.tar.gz',
+ 'DISTRIBUTION' => 'DAGOLDEN/CPAN-Meta-2.120351.tar.gz',
'FILES' => q[cpan/CPAN-Meta],
'EXCLUDED' => [
qw(t/00-compile.t),
@@ -493,9 +493,10 @@ package Maintainers;
'CPAN::Meta::YAML' => {
'MAINTAINER' => 'dagolden',
- 'DISTRIBUTION' => 'DAGOLDEN/CPAN-Meta-YAML-0.005.tar.gz',
+ 'DISTRIBUTION' => 'DAGOLDEN/CPAN-Meta-YAML-0.006.tar.gz',
'FILES' => q[cpan/CPAN-Meta-YAML],
'EXCLUDED' => [
+ 't/00-compile.t',
't/04_scalar.t', # requires YAML.pm
qr{^xt},
],
@@ -1959,7 +1960,7 @@ package Maintainers;
'Version::Requirements' => {
'MAINTAINER' => 'rjbs',
- 'DISTRIBUTION' => 'RJBS/Version-Requirements-0.101021.tar.gz',
+ 'DISTRIBUTION' => 'RJBS/Version-Requirements-0.101022.tar.gz',
'FILES' => q[cpan/Version-Requirements],
'EXCLUDED' => ['t/release-pod-syntax.t'],
'UPSTREAM' => 'cpan',
@@ -53,15 +53,14 @@
(
usedevel => '',
optimize => '-g',
- cc => (`ccache --version`, $?) ? 'cc' : 'ccache cc',
ld => 'cc',
($linux64 ? (libpth => \@paths) : ()),
);
unless(GetOptions(\%options,
'target=s', 'make=s', 'jobs|j=i', 'expect-pass=i',
'expect-fail' => sub { $options{'expect-pass'} = 0; },
- 'clean!', 'one-liner|e=s', 'l', 'w', 'match=s',
+ 'clean!', 'one-liner|e=s', 'c', 'l', 'w', 'match=s',
'no-match=s' => sub {
$options{match} = $_[1];
$options{'expect-pass'} = 0;
@@ -88,7 +87,7 @@
@ARGV = ('sh', '-c', 'cd t && ./perl TEST base/*.t')
if $options{validate} && !@ARGV;
-pod2usage(exitval => 0, verbose => 1) if $options{usage};
+pod2usage(exitval => 0, verbose => 2) if $options{usage};
pod2usage(exitval => 255, verbose => 1)
unless @ARGV || $match || $options{'test-build'} || defined $options{'one-liner'};
pod2usage(exitval => 255, verbose => 1)
@@ -284,6 +283,12 @@ =head1 OPTIONS
=item *
+-c
+
+Add C<-c> to the command line, to cause perl to exit after syntax checking.
+
+=item *
+
-l
Add C<-l> to the command line with C<-e>
@@ -300,8 +305,8 @@ =head1 OPTIONS
Add C<-w> to the command line with C<-e>
-It's not valid to pass C<-l> or C<-w> to C<bisect.pl> unless you are also
-using C<-e>
+It's not valid to pass C<-c>, C<-l> or C<-w> to C<bisect.pl> unless you are
+also using C<-e>
=item *
@@ -512,6 +517,15 @@ =head1 OPTIONS
die "$0: Can't build $target" if defined $target && !grep {@targets} $target;
+unless (exists $defines{cc}) {
+ # If it fails, the heuristic of 63f9ec3008baf7d6 is noisy, and hence
+ # confusing. Additionally, it doesn't correctly cope with ccache 2.4
+ # FIXME - really it should be replaced with a proper test of
+ # "can we build something?" and a helpful diagnostic if we can't.
+ # For now, simply move it here.
+ $defines{cc} = (`ccache --version`, $?) ? 'cc' : 'ccache cc';
+}
+
$j = "-j$j" if $j =~ /\A\d+\z/;
if (exists $options{make}) {
@@ -1045,8 +1059,9 @@ sub match_and_exit {
if (defined $options{'one-liner'}) {
my $exe = $target =~ /^(?:perl$|test)/ ? 'perl' : 'miniperl';
unshift @ARGV, '-e', $options{'one-liner'};
- unshift @ARGV, '-l' if $options{l};
- unshift @ARGV, '-w' if $options{w};
+ foreach (qw(c l w)) {
+ unshift @ARGV, "-$_" if $options{$_};
+ }
unshift @ARGV, "./$exe", '-Ilib';
}
@@ -681,6 +681,7 @@ sub _raw_address {
lutherh\100stratcom.com lutherh\100infinet.com
mab\100wdl.loral.com markb\100rdcf.sm.unisys.com
marcel\100codewerk.com gr\100univie.ac.at
+marcgreen\100cpan.org marcgreen\100wpi.edu
mark.p.lutz\100boeing.com tecmpl1\100triton.ca.boeing.com
marnix\100gmail.com pttesac!marnix!vanam
marty+p5p\100kasei.com marty\100martian.org
View
@@ -86,6 +86,7 @@ sub pods_to_install {
sub is_duplicate_pod {
my $file = shift;
+ local $_;
# Initialise the list of possible source files on the first call.
unless (%Lengths) {
@@ -229,6 +230,7 @@ sub get_pod_metadata {
my $permit_missing_generated = shift;
# Do they want a consistency report?
my $callback = shift;
+ local $_;
__prime_state() unless $state{master};
return \%state unless $callback;
@@ -26,20 +26,20 @@ Release schedule (with release manager):
Release schedule (with release managers):
2011-05-14 5.14.0 (final) Jesse Vincent
- 2011-06-16 5.14.1 Jesse Vincent
- 2011-09-14 5.14.2 Florian Ragwitz
- 2012-0?-?? 5.14.3 Ricardo Signes
+ 2011-06-16 5.14.1 Jesse Vincent
+ 2011-09-14 5.14.2 Florian Ragwitz
+ 2012-0?-?? 5.14.3 Ricardo Signes
????-??-?? 5.14.4 ??
=head2 Perl 5.12
Release schedule (with release managers):
- 2010-04-12 5.12.0 Jesse Vincent
- 2010-05-16 5.12.1 Jesse Vincent
- 2010-09-06 5.12.2 Jesse Vincent
- 2011-01-21 5.12.3 Ricardo Signes
- 2011-06-20 5.12.4 Leon Brocard
+ 2010-04-12 5.12.0 Jesse Vincent
+ 2010-05-16 5.12.1 Jesse Vincent
+ 2010-09-06 5.12.2 Jesse Vincent
+ 2011-01-21 5.12.3 Ricardo Signes
+ 2011-06-20 5.12.4 Leon Brocard
????-??-?? 5.12.5 ??
=head1 DEVELOPMENT RELEASE SCHEDULE
@@ -60,23 +60,24 @@ you should reset the version numbers to the next blead series.
Release schedule (with release managers and code freeze points):
- 2011-06-20 5.15.0 David Golden
- 2011-07-20 5.15.1 Zefram
- 2011-08-20 5.15.2 Ricardo Signes
- 2011-09-20 5.15.3 Stevan Little
- 2011-10-20 5.15.4 Florian Ragwitz
- 2011-11-20 5.15.5 Steve Hay
- 2011-12-20 5.15.6 Dave Rolsky (Contentious code freeze)
- 2012-01-20 5.15.7 Chris Williams
+ 2011-06-20 5.15.0 David Golden
+ 2011-07-20 5.15.1 Zefram
+ 2011-08-20 5.15.2 Ricardo Signes
+ 2011-09-20 5.15.3 Stevan Little
+ 2011-10-20 5.15.4 Florian Ragwitz
+ 2011-11-20 5.15.5 Steve Hay
+ 2011-12-20 5.15.6 Dave Rolsky (Contentious code freeze)
+ 2012-01-20 5.15.7 Chris Williams
2012-02-20 5.15.8 Max Maischein (User-visible code freeze)
2012-03-20 5.15.9 Abigail (Full code freeze)
+
+=head2 Perl 5.17
+
2012-04-20 5.17.0 Dave Cross
2012-05-20 5.17.1
2012-06-20 5.17.2
2012-07-20 5.17.3
-
-
=head1 VICTIMS
The following porters have all consented to do at least
@@ -106,13 +107,6 @@ Abigail <abigail@abigail.be>
Max Maischein <corion@cpan.org>
Dave Cross <dave@perlhacks.com>
-=head2 Reticent victims
-
-These folks have said that they'd be willing to release Perl but would
-prefer that others have the opportunity before they pitch in:
-
-(none at this time)
-
=head1 AUTHOR
Jesse Vincent <jesse@cpan.org>
View
@@ -995,7 +995,7 @@ sed <<!GROK!THIS! >$CONFIG_H -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un
*/
#define BIN "$bin" /**/
#define BIN_EXP "$binexp" /**/
-#define PERL_RELOCATABLE_INC "$userelocatableinc" /**/
+#$d_userelocatableinc PERL_RELOCATABLE_INC /**/
/* INTSIZE:
* This symbol contains the value of sizeof(int) so that the C
@@ -1,6 +1,6 @@
package CPAN::Meta::YAML;
{
- $CPAN::Meta::YAML::VERSION = '0.005';
+ $CPAN::Meta::YAML::VERSION = '0.006';
}
use strict;
@@ -643,11 +643,11 @@ END_PERL
=head1 NAME
-CPAN::Meta::YAML - Read and write a subset of YAML for CPAN Meta files
+CPAN::Meta::YAML
=head1 VERSION
-version 0.005
+version 0.006
=head1 SYNOPSIS
@@ -674,7 +674,7 @@ This module implements a subset of the YAML specification for use in reading
and writing CPAN metadata files like F<META.yml> and F<MYMETA.yml>. It should
not be used for any other general YAML parsing or generation task.
-NOTE: META.yml (and MYMETA.yml) files should be UTF-8 encoded. Users are
+NOTE: F<META.yml> (and F<MYMETA.yml>) files should be UTF-8 encoded. Users are
responsible for proper encoding and decoding. In particular, the C<read> and
C<write> methods do B<not> support UTF-8 and should not be used.
@@ -1,7 +1,22 @@
Revision history for CPAN-Meta
+2.120351 2012-02-03 23:01:45 America/New_York
+
+ [OTHER]
+
+ - Fixed CPAN packaging errors
+
+2.120350 2012-02-03 22:46:59 America/New_York
+
+ [BUGFIX]
+
+ - Work around a memory leak bug involving version objects
+ in boolean context.
+
2.113640 2011-12-30 15:19:46 America/New_York
+ [OTHER]
+
- Version::Requirements has now been merged as CPAN::Meta::Requirements,
rendering Version::Requirements itself redundant
Oops, something went wrong.

0 comments on commit 3204ca7

Please sign in to comment.