4.6.18-1mdk

3 files changed, 72 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 9d8be404..4c5e4dae 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,68 @@
+2005-02-17 17:10  Rafael Garcia-Suarez <rgarciasuarez@mandrakesoft.com>
+
+	* urpm/download.pm: Work around bug 13685, bug in display of curl
+	  progress
+
+2005-02-17 16:56  Rafael Garcia-Suarez <rgarciasuarez@mandrakesoft.com>
+
+	* urpm.pm: Fix bug #13644, urpmi.addmedia --distrib was broken due
+	  to misc's patches.
+
+2005-02-17 16:15  Pablo Saratxaga <pablo@mandrakesoft.com>
+
+	* po/el.po: updated po file
+
+2005-02-17 16:01  Rafael Garcia-Suarez <rgarciasuarez@mandrakesoft.com>
+
+	* urpmi.addmedia, man/C/urpmi.addmedia.8, urpm/args.pm: Remove
+	  obsoleted and broken --distrib-XXX command-line option
+
+2005-02-17 15:26  Rafael Garcia-Suarez <rgarciasuarez@mandrakesoft.com>
+
+	* urpmi.addmedia, po/af.po, po/ar.po, po/az.po, po/bg.po, po/bn.po,
+	  po/br.po, po/bs.po, po/ca.po, po/cs.po, po/cy.po, po/da.po,
+	  po/de.po, po/el.po, po/eo.po, po/es.po, po/et.po, po/eu.po,
+	  po/fa.po, po/fi.po, po/fr.po, po/fur.po, po/ga.po, po/gl.po,
+	  po/he.po, po/hi.po, po/hr.po, po/hu.po, po/id.po, po/is.po,
+	  po/it.po, po/ja.po, po/ka.po, po/ko.po, po/ky.po, po/lt.po,
+	  po/lv.po, po/mk.po, po/mn.po, po/ms.po, po/mt.po, po/nb.po,
+	  po/nl.po, po/nn.po, po/pl.po, po/pt.po, po/pt_BR.po, po/ro.po,
+	  po/ru.po, po/sk.po, po/sl.po, po/sq.po, po/sr.po, po/sr@Latn.po,
+	  po/sv.po, po/tg.po, po/th.po, po/tl.po, po/tr.po, po/uk.po,
+	  po/urpmi.pot, po/uz.po, po/uz@Latn.po, po/vi.po, po/wa.po,
+	  po/zh_CN.po, po/zh_TW.po: Misformatted error message
+
+2005-02-16 17:21  Pablo Saratxaga <pablo@mandrakesoft.com>
+
+	* po/id.po: fixed syntax error
+
+2005-02-16 16:30  willysr
+
+	* po/id.po: added a little updates
+
+2005-02-16 16:27  willysr
+
+	* po/id.po: fixed Rgarciasuarez and Pablo's updates
+
+2005-02-16 15:37  Rafael Garcia-Suarez <rgarciasuarez@mandrakesoft.com>
+
+	* urpmi: Fix precedence nit with verify-rpm option set per media
+
+2005-02-16 13:57  Pablo Saratxaga <pablo@mandrakesoft.com>
+
+	* po/: af.po, az.po, bg.po, el.po, fi.po, ga.po, he.po, hr.po,
+	  id.po, is.po, it.po, ko.po, lt.po, lv.po, mn.po, ms.po, pl.po,
+	  ro.po, sq.po, sr.po, sr@Latn.po, th.po, tr.po, uk.po, uz.po,
+	  uz@Latn.po: automerging
+
+2005-02-16 12:30  Rafael Garcia-Suarez <rgarciasuarez@mandrakesoft.com>
+
+	* urpm.pm, urpmi.spec: 4.6.17-1mdk
+
+2005-02-16 12:19  Rafael Garcia-Suarez <rgarciasuarez@mandrakesoft.com>
+
+	* po/id.po: Fix end of lines errors
+
 2005-02-16 11:43  willysr
 
 	* po/id.po: Updated
diff --git a/urpm.pm b/urpm.pm
index 29f83931..55bdd07a 100644
--- a/urpm.pm
+++ b/urpm.pm
@@ -11,7 +11,7 @@ use urpm::util;
 use urpm::sys;
 use urpm::cfg;
 
-our $VERSION = '4.6.17';
+our $VERSION = '4.6.18';
 our @ISA = qw(URPM);
 
 use URPM;
diff --git a/urpmi.spec b/urpmi.spec
index 8d1bc20b..9fa5215b 100644
--- a/urpmi.spec
+++ b/urpmi.spec
@@ -7,7 +7,7 @@
 ##################################################################
 
 %define name	urpmi
-%define version	4.6.17
+%define version	4.6.18
 %define release 1mdk
 
 %define group %(perl -e 'printf "%%s\\n", "%_vendor" =~ /mandrake/i ? "System/Configuration/Packaging" : "System Environment/Base"')
@@ -234,6 +234,11 @@ if (-e "/etc/urpmi/urpmi.cfg") {
 %{compat_perl_vendorlib}/urpm/parallel_ssh.pm
 
 %changelog
+* Thu Feb 17 2005 Rafael Garcia-Suarez <rgarciasuarez@mandrakesoft.com> 4.6.18-1mdk
+- Work around bug 13685, bug in display of curl progress
+- Fix bug 13644, urpmi.addmedia --distrib was broken
+- Remove obsoleted and broken --distrib-XXX command-line option
+
 * Wed Feb 16 2005 Rafael Garcia-Suarez <rgarciasuarez@mandrakesoft.com> 4.6.17-1mdk
 - Remove curl 7.2.12 bug workaround, and require at least curl 7.13.0
 - Fix parsing of hdlists file when adding media with --distrib