From 1143e824c66c0ccb472a3845c5d71d3b62a9d6ab Mon Sep 17 00:00:00 2001
From: Rafael Garcia-Suarez <rgarciasuarez@mandriva.org>
Date: Wed, 5 Apr 2006 13:51:16 +0000
Subject: 4.8.18

---
 ChangeLog  | 26 +++++++++++++++++++++++---
 urpm.pm    |  2 +-
 urpmi.spec |  6 +++++-
 3 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index f35b6666..c6aee048 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,27 @@
-2006-04-02 22:53  Rafael Garcia-Suarez <rgarciasuarez at mandriva.com>
+2006-04-05 15:46  Rafael Garcia-Suarez <rgarciasuarez at mandriva.com>
 
-	* urpm.pm: More error messages should be reported on fatal download
-	  errors (bug #21813)
+	* po/pl.po: Oops, I committed backwards.
+
+2006-04-05 15:45  Rafael Garcia-Suarez <rgarciasuarez at mandriva.com>
+
+	* po/pl.po: Fix binding for Polish Y/N answers
+
+2006-04-05 15:10  Rafael Garcia-Suarez <rgarciasuarez at mandriva.com>
+
+	* urpm.pm: Revert previous change: some failures should be silent,
+	  since one retries afterwards
+
+2006-04-03 19:05  Shiva Huang <blueshiva at giga.net.tw>
+
+	* po/zh_TW.po: updated po file
+
+2006-04-03 12:28  Pjetur G. Hjaltason <pjetur at pjetur.net>
+
+	* po/is.po: Better translations
+
+2006-04-03 11:43  Rafael Garcia-Suarez <rgarciasuarez at mandriva.com>
+
+	* urpm.pm, urpmi.spec: 4.8.17
 
 2006-04-02 22:06  Rafael Garcia-Suarez <rgarciasuarez at mandriva.com>
 
diff --git a/urpm.pm b/urpm.pm
index 49a03e27..373b5211 100644
--- a/urpm.pm
+++ b/urpm.pm
@@ -11,7 +11,7 @@ use urpm::util;
 use urpm::sys;
 use urpm::cfg;
 
-our $VERSION = '4.8.17';
+our $VERSION = '4.8.18';
 our @ISA = qw(URPM);
 
 use URPM;
diff --git a/urpmi.spec b/urpmi.spec
index dfff8cf8..8923c6d7 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.17
+%define version	4.8.18
 %define release	%mkrel 1
 
 %define group %(perl -e 'print "%_vendor" =~ /\\bmandr/i ? "System/Configuration/Packaging" : "System Environment/Base"')
@@ -274,6 +274,10 @@ if (-e "/etc/urpmi/urpmi.cfg") {
 %ghost %_sys_macros_dir/urpmi.recover.macros
 
 %changelog
+* Wed Apr 05 2006 Rafael Garcia-Suarez <rgarciasuarez@mandriva.com> 4.8.18-1mdk
+- Fix noisy output on http media update
+- Translation updates
+
 * Mon Apr 03 2006 Rafael Garcia-Suarez <rgarciasuarez@mandriva.com> 4.8.17-1mdk
 - urpmi.recover --list-safe
 - proper handling of SIGINT in urpmi.addmedia
-- 
cgit v1.2.1