diff options
| author | Florian Ragwitz <rafl@debian.org> | 2010-08-22 10:43:37 +0200 |
|---|---|---|
| committer | Florian Ragwitz <rafl@debian.org> | 2010-09-05 16:33:07 +0200 |
| commit | 37ee6528ceb851db13e05a01624da3118149a953 (patch) | |
| tree | 00b909d2acee56c51bc2a6404dcc064d6a89e831 /pod | |
| parent | 8e7870e793b7ed3fb14a2fd89a50e51657403695 (diff) | |
| download | perl-37ee6528ceb851db13e05a01624da3118149a953.tar.gz | |
Move the latest perldelta to pod/perldelta.pod
This way patches including perldelta entries will apply properly, no matter when
they are applied. If there's conflicts, they'll at least be in the right file.
Diffstat (limited to 'pod')
| -rw-r--r-- | pod/.gitignore | 2 | ||||
| -rw-r--r-- | pod/buildtoc | 8 | ||||
| -rw-r--r-- | pod/perldelta.pod (renamed from pod/perl5135delta.pod) | 0 |
3 files changed, 5 insertions, 5 deletions
diff --git a/pod/.gitignore b/pod/.gitignore index 61b9c7bbac..60ee9b7c6d 100644 --- a/pod/.gitignore +++ b/pod/.gitignore @@ -59,6 +59,6 @@ /podselect.bat # generated -/perldelta.pod +/perl5135delta.pod /perlapi.pod /perlintern.pod diff --git a/pod/buildtoc b/pod/buildtoc index 12cbc94592..018db12ffb 100644 --- a/pod/buildtoc +++ b/pod/buildtoc @@ -111,11 +111,11 @@ foreach (<MASTER>) { $flags{aux} = 1 if $flags =~ tr/a//d; if ($flags =~ tr/D//d) { - $flags{perlpod_omit} = 1; + $flags{manifest_omit} = 1; $delta_source = "$filename.pod"; } if ($flags =~ tr/d//d) { - $flags{manifest_omit} = 1; + $flags{perlpod_omit} = 1; $delta_target = "$filename.pod"; } $Generated{"$filename.pod"}++ if $flags =~ tr/g//d; @@ -713,8 +713,8 @@ sub do_unix { sort keys %Copies, grep {!/perltoc/} keys %Generated }mge; -# pod/perldelta.pod: pod/perl511delta.pod -# cd pod && $(LNS) perl511delta.pod perldelta.pod +# pod/perl511delta.pod: pod/perldelta.pod +# cd pod && $(LNS) perldelta.pod perl511delta.pod $makefile_SH =~ s!( pod/perl[a-z0-9_]+\.pod: pod/perl[a-z0-9_]+\.pod diff --git a/pod/perl5135delta.pod b/pod/perldelta.pod index 45eab58812..45eab58812 100644 --- a/pod/perl5135delta.pod +++ b/pod/perldelta.pod |