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

gregoa pushed a commit to annotated tag v0.22
in repository liblinux-distribution-perl.

commit 953169e1cca81c7c1dffe52231faaaa96b5dbe42
Author: Alexandr Ciornii <alexcho...@gmail.com>
Date:   Mon Nov 30 23:21:42 2009 +0200

    remove compat layer
---
 META.yml    | 40 ++++++++++++++++++++--------------------
 Makefile.PL | 25 +------------------------
 2 files changed, 21 insertions(+), 44 deletions(-)

diff --git a/META.yml b/META.yml
index e8b3cc8..f653de1 100644
--- a/META.yml
+++ b/META.yml
@@ -1,20 +1,20 @@
---- #YAML:1.0
-name:               Linux-Distribution
-version:            0.14_01
-abstract:           Perl extension to guess on which Linux distribution we are 
running.
-author:
-    - Alberto Re <albe...@accidia.net>
-license:            perl
-distribution_type:  module
-configure_requires:
-    ExtUtils::MakeMaker:  0
-requires:
-    perl:  5.006
-no_index:
-    directory:
-        - t
-        - inc
-generated_by:       ExtUtils::MakeMaker version 6.48
-meta-spec:
-    url:      http://module-build.sourceforge.net/META-spec-v1.4.html
-    version:  1.4
+--- #YAML:1.0
+name:               Linux-Distribution
+version:            0.14_01
+abstract:           Perl extension to guess on which Linux distribution we are 
running.
+author:
+    - Alberto Re <albe...@accidia.net>
+license:            perl
+distribution_type:  module
+configure_requires:
+    ExtUtils::MakeMaker:  0
+requires:
+    perl:  5.006
+no_index:
+    directory:
+        - t
+        - inc
+generated_by:       ExtUtils::MakeMaker version 6.48
+meta-spec:
+    url:      http://module-build.sourceforge.net/META-spec-v1.4.html
+    version:  1.4
diff --git a/Makefile.PL b/Makefile.PL
index 0951280..8750cac 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -3,7 +3,7 @@ use ExtUtils::MakeMaker;
 unless (lc $^O eq "linux") {
     die "OS unsupported\n";
 }
-WriteMakefile1(
+WriteMakefile(
     NAME              => 'Linux::Distribution',
     VERSION_FROM      => 'lib/Linux/Distribution.pm', # finds $VERSION
     PREREQ_PM         => {
@@ -14,26 +14,3 @@ WriteMakefile1(
     ($ExtUtils::MakeMaker::VERSION ge '6.48'? 
      ('LICENSE'        => 'perl', 'MIN_PERL_VERSION' => 5.006,) : ()),
 );
-
-sub WriteMakefile1 { #Written by Alexandr Ciornii
-        my %params=@_;
-        my $eumm_version=$ExtUtils::MakeMaker::VERSION;
-        $eumm_version=eval $eumm_version;
-        die "EXTRA_META is deprecated" if exists $params{EXTRA_META};
-        die "License not specified" if not exists $params{LICENSE};
-        if ($params{BUILD_REQUIRES}) { #and $eumm_version < 6.5503
-            #Should be modified in future when EUMM will
-            #correctly support BUILD_REQUIRES.
-            #EUMM 6.5502 has problems with BUILD_REQUIRES
-            $params{PREREQ_PM}={ %{$params{PREREQ_PM} || {}} , 
%{$params{BUILD_REQUIRES}} };
-            delete $params{BUILD_REQUIRES};
-        }
-        delete $params{CONFIGURE_REQUIRES} if $eumm_version < 6.52;
-        delete $params{MIN_PERL_VERSION} if $eumm_version < 6.48;
-        delete $params{META_MERGE} if $eumm_version < 6.46;
-        delete $params{META_ADD} if $eumm_version < 6.46;
-        delete $params{LICENSE} if $eumm_version < 6.31;
-        delete $params{AUTHOR} if $] < 5.005;
-        delete $params{ABSTRACT_FROM} if $] < 5.005;
-        WriteMakefile(%params);
-}

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

_______________________________________________
Pkg-perl-cvs-commits mailing list
Pkg-perl-cvs-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-perl-cvs-commits

Reply via email to