4.6.1-1mdk

3 files changed, 60 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 24755a25..5f499447 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,53 @@
+2004-11-19 12:12  Rafael Garcia-Suarez <rgarciasuarez@mandrakesoft.com>
+
+	* urpm/download.pm: Cope better with some strange curl output
+
+2004-11-19 11:25  Rafael Garcia-Suarez <rgarciasuarez@mandrakesoft.com>
+
+	* urpmi: Factorization
+
+2004-11-19 11:19  Rafael Garcia-Suarez <rgarciasuarez@mandrakesoft.com>
+
+	* urpm/download.pm: Take little terminals into account, too
+
+2004-11-19 11:10  Rafael Garcia-Suarez <rgarciasuarez@mandrakesoft.com>
+
+	* urpm/download.pm: Take into account terminal size to avoid
+	  messing up the display
+
+2004-11-18 16:19  Rafael Garcia-Suarez <rgarciasuarez@mandrakesoft.com>
+
+	* urpm.pm: Requires that a magic line appears in reconfig.urpmi
+	  (bug #12384)
+
+2004-11-18 15:53  Rafael Garcia-Suarez <rgarciasuarez@mandrakesoft.com>
+
+	* urpm.pm: Don't create symlinks in /var/lib/urpmi for media that
+	  happen to have the same hdlist or synthesis, because that could
+	  break later. (And I don't wan't to fiddle with hard links
+	  currently.) (bug #12391)
+
+2004-11-18 15:36  Rafael Garcia-Suarez <rgarciasuarez@mandrakesoft.com>
+
+	* urpm.pm: New warning when MD5SUM doesn't contain data for our
+	  files
+
+2004-11-18 11:41  Rafael Garcia-Suarez <rgarciasuarez@mandrakesoft.com>
+
+	* urpmi.addmedia: use proxy when downloading mirror list
+
+2004-11-18 11:40  Rafael Garcia-Suarez <rgarciasuarez@mandrakesoft.com>
+
+	* urpm.pm: A bit of factorization
+
+2004-11-12 21:02  Albert Astals Cid <astals11@terra.es>
+
+	* po/ca.po: Small updates
+
+2004-11-12 18:59  Rafael Garcia-Suarez <rgarciasuarez@mandrakesoft.com>
+
+	* urpmi.spec: 4.6-2mdk
+
 2004-11-12 12:13  Rafael Garcia-Suarez <rgarciasuarez@mandrakesoft.com>
 
 	* po/fr.po: French translation of new error message
diff --git a/urpm.pm b/urpm.pm
index 11b3bd23..a00383e4 100644
--- a/urpm.pm
+++ b/urpm.pm
@@ -11,7 +11,7 @@ use urpm::util;
 use urpm::sys;
 use urpm::cfg;
 
-our $VERSION = '4.6';
+our $VERSION = '4.6.1';
 our @ISA = qw(URPM);
 
 use URPM;
diff --git a/urpmi.spec b/urpmi.spec
index af7b73bb..fa63f438 100644
--- a/urpmi.spec
+++ b/urpmi.spec
@@ -7,8 +7,8 @@
 ##################################################################
 
 %define name	urpmi
-%define version	4.6
-%define release 2mdk
+%define version	4.6.1
+%define release 1mdk
 
 %define group %(perl -e 'printf "%%s\\n", "%_vendor" =~ /mandrake/i ? "System/Configuration/Packaging" : "System Environment/Base"')
 
@@ -256,6 +256,13 @@ $urpm->update_media(nolock => 1, nopubkey => 1);
 %{compat_perl_vendorlib}/urpm/parallel_ssh.pm
 
 %changelog
+* Fri Nov 19 2004 Rafael Garcia-Suarez <rgarciasuarez@mandrakesoft.com> 4.6.1-1mdk
+- reconfig.urpmi on mirrors must now begin with a magic line
+- don't create symlinks in /var/lib/urpmi, this used to mess up updates
+- warn when MD5SUM file is empty/malformed
+- use proxy to download mirror list
+- Cleanup text mode progress output
+
 * Fri Nov 12 2004 Rafael Garcia-Suarez <rgarciasuarez@mandrakesoft.com> 4.6-2mdk
 - New error message: "The following packages can't be installed because they
   depend on packages that are older than the installed ones"