* Use Digest::MD5 instead of MD5.

* Prepare 2.2.6 release.

debian/changelog

@@ -1,9 +1,10 @@
 debian-cd (2.2.6) unstable; urgency=medium
 
-  * UNRELEASED
   * Updated tasks/base-woody to be in sync with debootstrap 0.1.15.
   * Improved documentation about Official images. Closes: #101578
   * Build woody CD set by default now. Updated CONF.sh accordingly.
+  * Use Digest::MD5 instead of MD5. Depends on libdigest-md5-perl
+    instead of "libdigest-md5-perl | libmd5-perl". Closes: #104184
 
  -- Raphael Hertzog <hertzog@debian.org>  Tue, 19 Jun 2001 00:43:04 +0200
 

debian/control

@@ -7,7 +7,7 @@ Standards-Version: 3.5.2
 
 Package: debian-cd
 Architecture: all
-Depends: perl5 | perl, libdigest-md5-perl | libmd5-perl, sysutils, apt (>= 0.3.11.1), dpkg-dev (>= 1.4.1.6), dpkg-multicd, make, mkhybrid | mkisofs, lynx, grep-dctrl
+Depends: perl5 | perl, libdigest-md5-perl, sysutils, apt (>= 0.3.11.1), dpkg-dev (>= 1.4.1.6), dpkg-multicd, make, mkhybrid | mkisofs, lynx, grep-dctrl
 Recommends: lha, unzip, hfsutils, debianutils (>= 1.6)
 Description: Tools for building (Official) Debian CD set
  This package was formerly called YACS (for Yet Another CD
@@ -17,6 +17,3 @@ Description: Tools for building (Official) Debian CD set
  .
  Its goal is to facilitate the creation of customized Debian
  CD set.
- .
- You will need unzip for building i386 images, lha for m68k 
- images, and hfsutils for powerpc images.

tools/mirror_check

@@ -1,6 +1,6 @@
 #!/usr/bin/perl -w 
 
-use MD5;
+use Digest::MD5;
 
 my $mirror = shift || $ENV{'MIRROR'};
 my $nonus = shift || $ENV{'NONUS'};
@@ -39,7 +39,7 @@ while (defined($_ = <>)) {
 
 	# Compute the MD5sum
 	open(FILE, "< $file") || die "Can't open $file : $!\n";
-	$ctx = MD5->new;
+	$ctx = Digest::MD5->new;
 	$ctx->addfile(*FILE);
 	$digest = $ctx->hexdigest;
 	undef $ctx;