3 files changed, 34 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index a13b815c..67fcc5e2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,30 @@
+2004-11-29 19:24  Rafael Garcia-Suarez <rgarciasuarez@mandrakesoft.com>
+
+	* urpm.pm, urpmi: Factorize code that sets default values for some
+	  options
+
+2004-11-29 17:13  Thierry Vignaud <tvignaud@mandrakesoft.com>
+
+	* po/ja.po: update (Yukiko Bando)
+
+2004-11-29 15:19  Rafael Garcia-Suarez <rgarciasuarez@mandrakesoft.com>
+
+	* urpm.pm: Look for the description files in the media_info
+	  directory by default
+
+2004-11-29 12:19  Rafael Garcia-Suarez <rgarciasuarez@mandrakesoft.com>
+
+	* urpm.pm: Nicer without parens
+
+2004-11-29 12:07  Rafael Garcia-Suarez <rgarciasuarez@mandrakesoft.com>
+
+	* urpm.pm: Display total number of packages along with progress
+	  bars in urpmi (see bug #12514)
+
+2004-11-26 15:29  Rafael Garcia-Suarez <rgarciasuarez@mandrakesoft.com>
+
+	* urpm.pm, urpmi.spec: 4.6.3-1mdk
+
 2004-11-26 15:02  Rafael Garcia-Suarez <rgarciasuarez@mandrakesoft.com>
 
 	* man/C/urpmq.8: Remove obsolete caveat.
diff --git a/urpm.pm b/urpm.pm
index ce5d7074..fe26511e 100644
--- a/urpm.pm
+++ b/urpm.pm
@@ -11,7 +11,7 @@ use urpm::util;
 use urpm::sys;
 use urpm::cfg;
 
-our $VERSION = '4.6.3';
+our $VERSION = '4.6.4';
 our @ISA = qw(URPM);
 
 use URPM;
diff --git a/urpmi.spec b/urpmi.spec
index 42b1146c..c8115b47 100644
--- a/urpmi.spec
+++ b/urpmi.spec
@@ -7,7 +7,7 @@
 ##################################################################
 
 %define name	urpmi
-%define version	4.6.3
+%define version	4.6.4
 %define release 1mdk
 
 %define group %(perl -e 'printf "%%s\\n", "%_vendor" =~ /mandrake/i ? "System/Configuration/Packaging" : "System Environment/Base"')
@@ -257,6 +257,11 @@ $urpm->update_media(nolock => 1, nopubkey => 1);
 %{compat_perl_vendorlib}/urpm/parallel_ssh.pm
 
 %changelog
+* Mon Nov 29 2004 Rafael Garcia-Suarez <rgarciasuarez@mandrakesoft.com> 4.6.4-1mdk
+- From now on, look for descriptions files in the media_info subdirectory.
+  This will be used by the 10.2 update media.
+- Recall total number of packages when installing.
+
 * Fri Nov 26 2004 Rafael Garcia-Suarez <rgarciasuarez@mandrakesoft.com> 4.6.3-1mdk
 - urpmq -i now works as non root
 - translations and man pages updated