summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVlad Glagolev2015-05-01 10:02:33 +0300
committerVlad Glagolev2015-05-02 09:50:30 +0300
commit0d203942852745b178f8668cac4465ce23d8a37e (patch)
tree6f37f1d1c42349ea64a64d6c857f66a369b126cf
parent0f0160f3a3ed7ce41cac0cd9a4ec17a2ae2166d0 (diff)
archive-tar: conflicts with modern perl
(cherry picked from commit 037b74e82db525f9ab047c63e91eeed27f8b6b9a)
-rwxr-xr-xperl-cpan/archive-tar/CONFLICTS1
-rw-r--r--perl-cpan/archive-tar/HISTORY3
2 files changed, 4 insertions, 0 deletions
diff --git a/perl-cpan/archive-tar/CONFLICTS b/perl-cpan/archive-tar/CONFLICTS
new file mode 100755
index 0000000000..9ae5303388
--- /dev/null
+++ b/perl-cpan/archive-tar/CONFLICTS
@@ -0,0 +1 @@
+conflicts perl y
diff --git a/perl-cpan/archive-tar/HISTORY b/perl-cpan/archive-tar/HISTORY
index 3bcd5ac86d..78bd97c359 100644
--- a/perl-cpan/archive-tar/HISTORY
+++ b/perl-cpan/archive-tar/HISTORY
@@ -1,3 +1,6 @@
+2015-05-01 Vlad Glagolev <stealth@sourcemage.org>
+ * CONFLICTS: added, included with perl core since 5.10.0
+
2008-01-07 Vlad Glagolev <stealth@sourcemage.org>
* DETAILS: cleaned up, updated to 1.38
* BUILD, CONFLICTS: useless