From 33e0d8afbee04077997433015255d2548fc3c3b1 Mon Sep 17 00:00:00 2001
From: Rafael Garcia-Suarez <rgarciasuarez@mandriva.org>
Date: Mon, 7 Mar 2005 10:51:53 +0000
Subject: 4.6.21-1mdk

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

diff --git a/ChangeLog b/ChangeLog
index 1fa63a63..da1bc3d8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,91 @@
+2005-03-07 11:11  Rafael Garcia-Suarez <rgarciasuarez at mandrakesoft.com>
+
+	* urpm.pm: Some options don't belong to urpmi.cfg
+
+2005-03-06 11:18  José JORGE <jjorge at free.fr>
+
+	* po/pt.po: melo
+
+2005-03-04 14:47  Pablo Saratxaga <pablo at mandrakesoft.com>
+
+	* po/fr.po: updated po file
+
+2005-03-03 20:57  Karl Ove Hufthammer <karl at huftis.org>
+
+	* po/nn.po: Updated Norwegian Nynorsk translation.
+
+2005-03-03 16:19  Rafael Garcia-Suarez <rgarciasuarez at mandrakesoft.com>
+
+	* urpm.pm: Comment rewrite
+
+2005-03-03 10:07  Rafael Garcia-Suarez <rgarciasuarez at mandrakesoft.com>
+
+	* po/fr.po: Fix translation for rpmdb. Fix inconsistencies in the
+	  translation for "source rpm".
+
+2005-03-03 09:24  Pablo Saratxaga <pablo at mandrakesoft.com>
+
+	* po/fr.po: updated po file
+
+2005-03-02 18:23  Rafael Garcia-Suarez <rgarciasuarez at mandrakesoft.com>
+
+	* urpmi.spec: gurpmi menu fix by Frederic Crozat
+
+2005-03-02 18:04  Dovix <dovix2003 at yahoo.com>
+
+	* po/he.po: [no log message]
+
+2005-03-02 17:22  Rafael Garcia-Suarez <rgarciasuarez at mandrakesoft.com>
+
+	* urpm.pm: Add empty destructor and update copyright
+
+2005-03-02 15:17  Pablo Saratxaga <pablo at mandrakesoft.com>
+
+	* po/it.po: updated po file
+
+2005-03-02 14:24  Rafael Garcia-Suarez <rgarciasuarez at mandrakesoft.com>
+
+	* man/C/urpmi.8: The --no-verify-rpm option wasn't displayed in the
+	  urpmi manpage
+
+2005-03-01 15:15  Rafael Garcia-Suarez <rgarciasuarez at mandrakesoft.com>
+
+	* urpm.pm: Make the error "The following packages contain %s" more
+	  explicitly an error.
+
+2005-03-01 14:53  Rafael Garcia-Suarez <rgarciasuarez at mandrakesoft.com>
+
+	* urpm.pm, urpmi: Change the default log function to output to
+	  STDOUT, not STDERR.  (bug 13037)
+
+2005-03-01 12:50  Rafael Garcia-Suarez <rgarciasuarez at mandrakesoft.com>
+
+	* urpm.pm: Silence a warning
+
+2005-03-01 10:15  Pablo Saratxaga <pablo at mandrakesoft.com>
+
+	* po/: he.po, it.po: updated po file
+
+2005-03-01 05:11  Dovix <dovix2003 at yahoo.com>
+
+	* po/he.po: [no log message]
+
+2005-02-28 12:13  Youcef Rabah Rahal <rahal at arabeyes.org>
+
+	* po/ar.po: QA for Arabic
+
+2005-02-28 09:16  Pablo Saratxaga <pablo at mandrakesoft.com>
+
+	* po/sl.po: updated po file
+
+2005-02-25 17:14  Rafael Garcia-Suarez <rgarciasuarez at mandrakesoft.com>
+
+	* skip.list: Add an example in skiplist
+
+2005-02-25 14:48  Rafael Garcia-Suarez <rgarciasuarez at mandrakesoft.com>
+
+	* urpm.pm, urpmi.spec: 4.6.20-1mdk
+
 2005-02-25 14:39  Rafael Garcia-Suarez <rgarciasuarez at mandrakesoft.com>
 
 	* urpm/cfg.pm: Use generic release file
diff --git a/urpm.pm b/urpm.pm
index 2f8ac05d..6cec12f5 100644
--- a/urpm.pm
+++ b/urpm.pm
@@ -11,7 +11,7 @@ use urpm::util;
 use urpm::sys;
 use urpm::cfg;
 
-our $VERSION = '4.6.20';
+our $VERSION = '4.6.21';
 our @ISA = qw(URPM);
 
 use URPM;
diff --git a/urpmi.spec b/urpmi.spec
index 8066d005..9ac3cae7 100644
--- a/urpmi.spec
+++ b/urpmi.spec
@@ -7,7 +7,7 @@
 ##################################################################
 
 %define name	urpmi
-%define version	4.6.20
+%define version	4.6.21
 %define release 1mdk
 
 %define group %(perl -e 'printf "%%s\\n", "%_vendor" =~ /mandrake/i ? "System/Configuration/Packaging" : "System Environment/Base"')
@@ -234,6 +234,12 @@ if (-e "/etc/urpmi/urpmi.cfg") {
 %{compat_perl_vendorlib}/urpm/parallel_ssh.pm
 
 %changelog
+* Mon Mar 07 2005 Rafael Garcia-Suarez <rgarciasuarez@mandrakesoft.com> 4.6.21-1mdk
+- Output log messages to stdout, not stderr.
+- Fix spurious tags appearing in urpmi.cfg
+- Documentation nits and translations
+- Menu fix for gurpmi (Frederic Crozat)
+
 * Fri Feb 25 2005 Rafael Garcia-Suarez <rgarciasuarez@mandrakesoft.com> 4.6.20-1mdk
 - Output takes now into account the locale's charset
 - Don't require drakxtools anymore
-- 
cgit v1.2.1