From c66e777b6dc629472dd5de314e572b1e8f4ffd48 Mon Sep 17 00:00:00 2001
From: Rafael Garcia-Suarez <rgarciasuarez@mandriva.org>
Date: Thu, 8 Dec 2005 16:24:12 +0000
Subject: 4.8.4-1mdk

---
 ChangeLog  | 65 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 urpm.pm    |  2 +-
 urpmi.spec |  8 +++++++-
 3 files changed, 73 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 9671b406..9eae160f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,68 @@
+2005-12-08 17:17  Rafael Garcia-Suarez <rgarciasuarez at mandriva.com>
+
+	* urpmi.removemedia: urpmi.removemedia should remove proxy settings
+	  too
+
+2005-12-08 16:55  Rafael Garcia-Suarez <rgarciasuarez at mandriva.com>
+
+	* urpm/download.pm: urpmi.addmedia with proxy did erase the
+	  previous proxy settings (bug 20108)
+
+2005-12-08 15:28  Rafael Garcia-Suarez <rgarciasuarez at mandriva.com>
+
+	* gurpmi2, urpm.pm, urpmi: Fix a regression (introduced in urpm.pm
+	  revision 1.579) : the packages that obsoleted older packages were
+	  installed as 'install', not as 'upgrade', thus rpm wasn't
+	  attempting to deinstall the old package.
+
+2005-12-08 11:50  Thierry Vignaud <tvignaud at mandriva.com>
+
+	* po/br.po: update
+
+2005-12-08 11:48  Thierry Vignaud <tvignaud at mandriva.com>
+
+	* po/br.po: typo fixes
+
+2005-12-06 15:47  Rafael Garcia-Suarez <rgarciasuarez at mandriva.com>
+
+	* t/01compile.t, urpm/parallel_ka_run.pm, urpm/parallel_ssh.pm: The
+	  parallel handlers define the same function. This could lead to
+	  warnings; silence them.
+
+2005-12-06 15:45  Rafael Garcia-Suarez <rgarciasuarez at mandriva.com>
+
+	* urpm/download.pm: Fix compilation warning
+
+2005-12-06 12:24  Rafael Garcia-Suarez <rgarciasuarez at mandriva.com>
+
+	* urpmi.bash-completion, urpmi.spec, urpmq, pod/urpmq.8.pod,
+	  urpm/args.pm: Drop the urpmq --headers options (and the
+	  requirement on rpmtools). It was only used by the late rpminst.
+
+2005-12-06 00:13  Michael Scherer <mscherer at mandrake.org>
+
+	* urpmi.spec: - use mkrel
+
+2005-12-05 18:56  Rafael Garcia-Suarez <rgarciasuarez at mandriva.com>
+
+	* urpmq: One of the calls to rpm2header still used PATH
+
+2005-12-05 14:34  Rafael Garcia-Suarez <rgarciasuarez at mandriva.com>
+
+	* .cvsignore: Add a cvsignore file
+
+2005-12-05 13:59  Shiva Huang <blueshiva at giga.net.tw>
+
+	* po/zh_TW.po: updated po file
+
+2005-12-05 13:53  Rafael Garcia-Suarez <rgarciasuarez at mandriva.com>
+
+	* gurpmi.pm: Add version number
+
+2005-12-05 12:07  Rafael Garcia-Suarez <rgarciasuarez at mandriva.com>
+
+	* urpm.pm, urpmi.spec: 4.8.3-1mdk
+
 2005-12-05 11:33  Rafael Garcia-Suarez <rgarciasuarez at mandriva.com>
 
 	* urpm.pm: More error checking when generating names file
diff --git a/urpm.pm b/urpm.pm
index 87d9245d..d0a3a130 100644
--- a/urpm.pm
+++ b/urpm.pm
@@ -11,7 +11,7 @@ use urpm::util;
 use urpm::sys;
 use urpm::cfg;
 
-our $VERSION = '4.8.3';
+our $VERSION = '4.8.4';
 our @ISA = qw(URPM);
 
 use URPM;
diff --git a/urpmi.spec b/urpmi.spec
index 05e8850b..14f38940 100644
--- a/urpmi.spec
+++ b/urpmi.spec
@@ -7,7 +7,7 @@
 ##################################################################
 
 %define name	urpmi
-%define version	4.8.3
+%define version	4.8.4
 %define release	%mkrel 1
 
 %define group %(perl -e 'print "%_vendor" =~ /\\bmandr/i ? "System/Configuration/Packaging" : "System Environment/Base"')
@@ -246,6 +246,12 @@ if (-e "/etc/urpmi/urpmi.cfg") {
 %{compat_perl_vendorlib}/urpm/ldap.pm
 
 %changelog
+* Thu Dec 08 2005 Rafael Garcia-Suarez <rgarciasuarez@mandriva.com> 4.8.4-1mdk
+- urpmi.addmedia doesn't reset proxy settings anymore
+- urpmi.removemedia now removes corresponding proxy settings
+- Fix installation of packages that provide and obsolete older ones
+- Remove the urpmq --headers option
+
 * Mon Dec 05 2005 Rafael Garcia-Suarez <rgarciasuarez@mandriva.com> 4.8.3-1mdk
 - New configuration option, default-media
 - New options --wget-options, --curl-options and --rsync-options
-- 
cgit v1.2.1