[SCM] Debian packaging of libperl5i-perl branch, master, updated. debian/2.6.1-2-9-g487a069

gregor herrmann gregoa at debian.org
Mon Sep 26 18:25:22 UTC 2011


The following commit has been merged in the master branch:
commit ebf1649b13a790cadd96544e4e30f27a5c35db49
Author: gregor herrmann <gregoa at debian.org>
Date:   Mon Sep 26 20:06:03 2011 +0200

    Remove 0001-Use-core-module-Digest-SHA-instead-of-Digest-SHA1.patch, applied
    upstream.

diff --git a/debian/patches/0001-Use-core-module-Digest-SHA-instead-of-Digest-SHA1.patch b/debian/patches/0001-Use-core-module-Digest-SHA-instead-of-Digest-SHA1.patch
deleted file mode 100644
index 338e737..0000000
--- a/debian/patches/0001-Use-core-module-Digest-SHA-instead-of-Digest-SHA1.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-Description: Use core module Digest::SHA instead of Digest::SHA1
-Bug: https://github.com/schwern/perl5i/issues/196
-Origin: https://github.com/doherty/perl5i/commit/184c211aff0c1d1ac6a1dbbab7f0b3d4572a1e72
-Forwarded: not-needed
-Author: Mike Doherty <doherty at cs.dal.ca>
-Reviewed-by: Salvatore Bonaccorso <carnil at debian.org>
-Last-Update: 2011-08-16
-
---- a/Build.PL
-+++ b/Build.PL
-@@ -43,7 +43,7 @@
-         indirect              => '0.22',
-         'JSON'                => '2.17',
-         'YAML::Any'           => '0.70',
--        'Digest::SHA1'        => '2.09',
-+        'Digest::SHA'         => '0',
-         'Digest::MD5'         => '2.36',
-         'Object::ID'          => '0.1.0',
-         "Devel::Declare::MethodInstaller::Simple"       => '0.006000',
---- a/META.json
-+++ b/META.json
-@@ -51,7 +51,7 @@
-             "DateTime::TimeZone::Tzfile" : "0.002",
-             "Devel::Declare::MethodInstaller::Simple" : "0.006000",
-             "Digest::MD5" : "2.36",
--            "Digest::SHA1" : "2.09",
-+            "Digest::SHA" : "0",
-             "File::chdir" : "0.1002",
-             "Hash::Merge::Simple" : "0.04",
-             "IPC::System::Simple" : "1.18",
---- a/META.yml
-+++ b/META.yml
-@@ -185,7 +185,7 @@
-   DateTime::TimeZone::Tzfile: 0.002
-   Devel::Declare::MethodInstaller::Simple: 0.006000
-   Digest::MD5: 2.36
--  Digest::SHA1: 2.09
-+  Digest::SHA: 0
-   File::chdir: 0.1002
-   Hash::Merge::Simple: 0.04
-   IPC::System::Simple: 1.18
---- a/lib/perl5i/1/Meta/Instance.pm
-+++ b/lib/perl5i/1/Meta/Instance.pm
-@@ -84,6 +84,7 @@
-     my %prefix = ( hex => 'hex', base64 => 'b64', binary => undef );
- 
-     my $module = 'Digest::' . uc $args{algorithm};
-+    $module = 'Digest::SHA' if $module eq 'Digest::SHA1'; # Use the core module - GH#196
-     my $digest = defined $prefix{ $args{format} } ? $prefix{ $args{format} } . 'digest' : 'digest';
- 
-     Module::Load::load($module);
---- a/lib/perl5i/2/Meta/Instance.pm
-+++ b/lib/perl5i/2/Meta/Instance.pm
-@@ -113,6 +113,7 @@
-     my %prefix = ( hex => 'hex', base64 => 'b64', binary => undef );
- 
-     my $module = 'Digest::' . uc $args{algorithm};
-+    $module = 'Digest::SHA' if $module eq 'Digest::SHA1'; # Use the core module - GH#196
-     my $digest = defined $prefix{ $args{format} } ? $prefix{ $args{format} } . 'digest' : 'digest';
- 
-     $module->require;
diff --git a/debian/patches/series b/debian/patches/series
index 4a5cc4b..5299247 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 spelling.patch
-0001-Use-core-module-Digest-SHA-instead-of-Digest-SHA1.patch

-- 
Debian packaging of libperl5i-perl



More information about the Pkg-perl-cvs-commits mailing list