4.8.20

3 files changed, 66 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 8675bbca..9232d610 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,56 @@
+2006-06-12 09:47  Rafael Garcia-Suarez <rgarciasuarez at mandriva.com>
+
+	* pod/urpmi.addmedia.8.pod: Document the two new options in the
+	  urpmi.addmedia man page.
+
+2006-06-12 09:43  Rafael Garcia-Suarez <rgarciasuarez at mandriva.com>
+
+	* urpm.pm, urpmi.addmedia: Make options --interactive and
+	  --all-media independent in urpmi.addmedia.
+	  Plus spelling fixes.
+
+2006-06-11 18:40  Olivier Thauvin <thauvin at aerov.jussieu.fr>
+
+	* urpm/args.pm, urpmi.addmedia: - restore old behavior of
+	  urpmi.addmedia, add --all-media and --interactive options
+
+2006-06-11 18:31  Olivier Thauvin <thauvin at aerov.jussieu.fr>
+
+	* urpm/args.pm: - fix r36644, ensure urpm::args::parse_cmdline()
+	  return true if there is no error
+
+2006-06-10 02:11  Olivier Thauvin <thauvin at aerov.jussieu.fr>
+
+	* urpm.pm, urpmi.addmedia: - make urpmi.addmedia asking media by
+	  media if they should be installed
+
+2006-06-10 00:56  Olivier Thauvin <thauvin at aerov.jussieu.fr>
+
+	* pod/urpmi.addmedia.8.pod, urpm.pm: - use MDV::Distribconf for
+	  --distrib option, use media.cfg instead hdlists
+
+2006-06-07 09:52  Rafael Garcia-Suarez <rgarciasuarez at mandriva.com>
+
+	* gurpmi.pm, urpm/args.pm, urpm/cfg.pm, urpm/download.pm,
+	  urpm/ldap.pm, urpm/msg.pm, urpm/parallel_ka_run.pm,
+	  urpm/parallel_ssh.pm, urpm/prompt.pm, urpm/sys.pm, urpm/util.pm:
+	  Use revision number as version numbers for internal modules.
+	  For gurpmi.pm, use the same version number as urpm.
+
+2006-06-07 09:28  Rafael Garcia-Suarez <rgarciasuarez at mandriva.com>
+
+	* urpmi.logrotate: We don't need urpmi.logrotate anymore, now that
+	  urpmi logs through syslog
+
+2006-06-07 09:27  Rafael Garcia-Suarez <rgarciasuarez at mandriva.com>
+
+	* .cvsignore: Remove cvsignore file, no longer needed
+
+2006-06-07 09:16  Rafael Garcia-Suarez <rgarciasuarez at mandriva.com>
+
+	* ChangeLog, Makefile.PL: Update makefile to use svn2cl, and
+	  regenerate ChangeLog.
+
 2006-06-06 16:26  Thierry Vignaud <tvignaud at mandriva.com>
 
 	* urpmi: let be nicer with translators (we should never
diff --git a/urpm.pm b/urpm.pm
index e9ae2516..80ac42bc 100644
--- a/urpm.pm
+++ b/urpm.pm
@@ -12,7 +12,7 @@ use urpm::sys;
 use urpm::cfg;
 use MDV::Distribconf;
 
-our $VERSION = '4.8.19';
+our $VERSION = '4.8.20';
 our @ISA = qw(URPM);
 
 use URPM;
diff --git a/urpmi.spec b/urpmi.spec
index 53948523..6c6bdb8d 100644
--- a/urpmi.spec
+++ b/urpmi.spec
@@ -12,7 +12,7 @@
 %{?!makeinstall_std: %define makeinstall_std() make DESTDIR=%{?buildroot:%{buildroot}} install}
 
 %define name	urpmi
-%define version	4.8.19
+%define version	4.8.20
 %define release	%mkrel 1
 
 %define group %(perl -e 'print "%_vendor" =~ /\\bmandr/i ? "System/Configuration/Packaging" : "System Environment/Base"')
@@ -274,6 +274,17 @@ if (-e "/etc/urpmi/urpmi.cfg") {
 %ghost %_sys_macros_dir/urpmi.recover.macros
 
 %changelog
+* Mon Jun 12 2006 Rafael Garcia-Suarez <rgarciasuarez@mandriva.com> 4.8.20-1mdv2007.0
+- New options to urpmi.addmedia: --interactive and --all-media (Olivier Thauvin)
+- urpmi.addmedia --distrib now uses media.cfg instead of hdlists (Olivier Thauvin)
+- Use global proxy settings when adding a media (Vincent Panel, bug #22000)
+- New urpmf option: -I. Also, make it handle "--" on command line
+- Don't restart urpmi when started with --root (bug #22509)
+- Misc. fixes to urpmi --bug
+- Misc. fixes to gurpmi
+- Don't sync to disk when closing rpmdb
+- Doc fixes
+
 * Thu Apr 20 2006 Rafael Garcia-Suarez <rgarciasuarez@mandriva.com> 4.8.19-1mdk
 - Fix running rurpmi with curl/wget, could have tainting errors
 - Repackaging counter is prettier