4.6.22-1mdk

3 files changed, 23 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index da1bc3d8..0879ae2f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,20 @@
+2005-03-08 12:12  Rafael Garcia-Suarez <rgarciasuarez at mandrakesoft.com>
+
+	* urpm.pm: Fix addition of media with passwords
+
+2005-03-08 09:54  Rafael Garcia-Suarez <rgarciasuarez at mandrakesoft.com>
+
+	* urpm.pm: More verifications on local list files
+
+2005-03-07 17:27  Rafael Garcia-Suarez <rgarciasuarez at mandrakesoft.com>
+
+	* urpm.pm: Patch by Michael Scherer to optionnally load media from
+	  LDAP (currently inactive)
+
+2005-03-07 11:51  Rafael Garcia-Suarez <rgarciasuarez at mandrakesoft.com>
+
+	* urpm.pm, urpmi.spec: 4.6.21-1mdk
+
 2005-03-07 11:11  Rafael Garcia-Suarez <rgarciasuarez at mandrakesoft.com>
 
 	* urpm.pm: Some options don't belong to urpmi.cfg
diff --git a/urpm.pm b/urpm.pm
index 8fb716bc..90676f5d 100644
--- a/urpm.pm
+++ b/urpm.pm
@@ -11,7 +11,7 @@ use urpm::util;
 use urpm::sys;
 use urpm::cfg;
 
-our $VERSION = '4.6.21';
+our $VERSION = '4.6.22';
 our @ISA = qw(URPM);
 
 use URPM;
diff --git a/urpmi.spec b/urpmi.spec
index 9ac3cae7..2456570d 100644
--- a/urpmi.spec
+++ b/urpmi.spec
@@ -7,7 +7,7 @@
 ##################################################################
 
 %define name	urpmi
-%define version	4.6.21
+%define version	4.6.22
 %define release 1mdk
 
 %define group %(perl -e 'printf "%%s\\n", "%_vendor" =~ /mandrake/i ? "System/Configuration/Packaging" : "System Environment/Base"')
@@ -234,6 +234,10 @@ if (-e "/etc/urpmi/urpmi.cfg") {
 %{compat_perl_vendorlib}/urpm/parallel_ssh.pm
 
 %changelog
+* Tue Mar 08 2005 Rafael Garcia-Suarez <rgarciasuarez@mandrakesoft.com> 4.6.22-1mdk
+- Fix addition of media with passwords
+- More verifications on local list files
+
 * Mon Mar 07 2005 Rafael Garcia-Suarez <rgarciasuarez@mandrakesoft.com> 4.6.21-1mdk
 - Output log messages to stdout, not stderr.
 - Fix spurious tags appearing in urpmi.cfg