[SCM] Debian packaging of libspreadsheet-parseexcel-perl branch, master, updated. 799ed096efda7f53c48b08d463ffd80e91749254
gregor herrmann
gregoa at debian.org
Fri Sep 23 16:48:04 UTC 2011
The following commit has been merged in the master branch:
commit 922624ffe4516e99d5d41812532bb92de9a29bc6
Author: gregor herrmann <gregoa at debian.org>
Date: Fri Sep 23 18:11:39 2011 +0200
Add a patch to use Digest::MD5 (in perl core) instead of packaging the pure
perl alternative Digest::Perl::MD5.
diff --git a/debian/changelog b/debian/changelog
index 4f52208..3050586 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,5 @@
libspreadsheet-parseexcel-perl (0.5900-1) UNRELEASED; urgency=low
- WAITS-FOR: libdigest-perl-md5-perl
- # <ansgar> gregoa: Do we really need libdigest-perl-md5-perl? Digest::MD5 is
- # in core after all
- --> they have the same interface (Digest::Perl::MD5 is just pure perl) --> patch
-
WAITS-FOR: libcrypt-rc4-perl
[ gregor herrmann ]
@@ -15,8 +10,7 @@ libspreadsheet-parseexcel-perl (0.5900-1) UNRELEASED; urgency=low
* Bump debhelper compatibility level to 8.
* Remove version from libtest-pod-perl build dependency, already satisfied
in oldstable.
- * Add new build and runtime dependencies: libcrypt-rc4-perl,
- libdigest-perl-md5-perl.
+ * Add new build and runtime dependency on libcrypt-rc4-perl.
[ Ansgar Burchardt ]
* debian/control: Convert Vcs-* fields to Git.
diff --git a/debian/control b/debian/control
index bda46af..30186d8 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,6 @@ Priority: optional
Build-Depends: debhelper (>= 8)
Build-Depends-Indep: perl,
libcrypt-rc4-perl,
- libdigest-perl-md5-perl,
libjcode-pm-perl,
libole-storage-lite-perl (>= 0.19),
libspreadsheet-writeexcel-perl,
@@ -27,7 +26,6 @@ Package: libspreadsheet-parseexcel-perl
Architecture: all
Depends: ${misc:Depends}, ${perl:Depends},
libcrypt-rc4-perl,
- libdigest-perl-md5-perl,
libjcode-pm-perl,
libole-storage-lite-perl (>= 0.19),
libspreadsheet-writeexcel-perl,
diff --git a/debian/patches/digest_md5.patch b/debian/patches/digest_md5.patch
new file mode 100644
index 0000000..4f4ceb6
--- /dev/null
+++ b/debian/patches/digest_md5.patch
@@ -0,0 +1,35 @@
+Description: use Digest::MD5 (in perl core) instead of packaging the pure perl alternative Digest::Perl::MD5
+Origin: vendor
+Forwarded: not needed
+Author: gregor herrmann <gregoa at debian.org>
+Last-Update: 2011-09-23
+
+--- a/lib/Spreadsheet/ParseExcel.pm
++++ b/lib/Spreadsheet/ParseExcel.pm
+@@ -20,7 +20,7 @@
+ use Config;
+
+ use Crypt::RC4;
+-use Digest::Perl::MD5;
++use Digest::MD5;
+
+ our $VERSION = '0.59';
+
+@@ -269,7 +269,7 @@
+ substr( $pwarray, 9, 1 ) = "\x80";
+ substr( $pwarray, 56, 1 ) = "\x48";
+
+- my $md5 = Digest::Perl::MD5->new();
++ my $md5 = Digest::MD5->new();
+ $md5->add( $pwarray );
+
+ my $s = md5state( $md5 );
+@@ -282,7 +282,7 @@
+
+ my $pwarray = "\0" x 64;
+ my $i;
+- my $md5 = Digest::Perl::MD5->new();
++ my $md5 = Digest::MD5->new();
+
+ for ( $i = 0 ; $i < length( $password ) ; $i++ ) {
+ my $o = ord( substr( $password, $i, 1 ) );
diff --git a/debian/patches/series b/debian/patches/series
index 0589906..f41431a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
10objref.patch
30rstring.patch
+digest_md5.patch
--
Debian packaging of libspreadsheet-parseexcel-perl
More information about the Pkg-perl-cvs-commits
mailing list