4.6.17-1mdk

3 files changed, 73 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 0c9ee96c..9d8be404 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,68 @@
+2005-02-16 11:43  willysr
+
+	* po/id.po: Updated
+
+2005-02-16 11:36  Rafael Garcia-Suarez <rgarciasuarez@mandrakesoft.com>
+
+	* urpm/download.pm: Remove curl 7.12.2 bug workaround
+
+2005-02-16 01:23  Youcef Rabah Rahal <rahal@arabeyes.org>
+
+	* po/ar.po: Arabic translation (sync with arabeyes CVS)
+
+2005-02-15 21:57  Thierry Vignaud <tvignaud@mandrakesoft.com>
+
+	* po/: az.po, bg.po, el.po, fi.po, hr.po, is.po, it.po, pl.po,
+	  ro.po, sr.po, sr@Latn.po, tg.po, tr.po, uk.po: update
+
+2005-02-15 20:37  Rafael Garcia-Suarez <rgarciasuarez@mandrakesoft.com>
+
+	* urpm.pm: Fix parsing of hdlists file when adding media with
+	  --distrib (bug 13644)
+
+2005-02-15 19:20  Thierry Vignaud <tvignaud@mandrakesoft.com>
+
+	* po/: af.po, mn.po: update
+
+2005-02-15 19:00  Pablo Saratxaga <pablo@mandrakesoft.com>
+
+	* po/pt_BR.po: updated po file
+
+2005-02-15 17:50  Per Øyvind Karlsen <peroyvind@linux-mandrake.com>
+
+	* po/nb.po: Even more fixes:)
+
+2005-02-15 12:04  Pablo Saratxaga <pablo@mandrakesoft.com>
+
+	* po/urpmi.pot: updated pot file
+
+2005-02-15 10:53  Rafael Garcia-Suarez <rgarciasuarez@mandrakesoft.com>
+
+	* urpmi, 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/uz.po, po/uz@Latn.po, po/vi.po, po/wa.po, po/zh_CN.po,
+	  po/zh_TW.po: Fix English grammar
+
+2005-02-15 04:22  Per Øyvind Karlsen <peroyvind@linux-mandrake.com>
+
+	* po/nb.po: Moremoremoremoremore fixes:)
+
+2005-02-14 20:11  Dovix <dovix2003@yahoo.com>
+
+	* po/he.po: [no log message]
+
+2005-02-14 15:17  Rafael Garcia-Suarez <rgarciasuarez@mandrakesoft.com>
+
+	* urpmi.spec: 4.6.16-2mdk
+
 2005-02-14 15:09  Rafael Garcia-Suarez <rgarciasuarez@mandrakesoft.com>
 
 	* urpm/cfg.pm: Avoid using rpm because of locking
diff --git a/urpm.pm b/urpm.pm
index 43de422c..bdf01cdc 100644
--- a/urpm.pm
+++ b/urpm.pm
@@ -11,7 +11,7 @@ use urpm::util;
 use urpm::sys;
 use urpm::cfg;
 
-our $VERSION = '4.6.16';
+our $VERSION = '4.6.17';
 our @ISA = qw(URPM);
 
 use URPM;
diff --git a/urpmi.spec b/urpmi.spec
index 90630572..8d1bc20b 100644
--- a/urpmi.spec
+++ b/urpmi.spec
@@ -7,8 +7,8 @@
 ##################################################################
 
 %define name	urpmi
-%define version	4.6.16
-%define release 2mdk
+%define version	4.6.17
+%define release 1mdk
 
 %define group %(perl -e 'printf "%%s\\n", "%_vendor" =~ /mandrake/i ? "System/Configuration/Packaging" : "System Environment/Base"')
 
@@ -38,6 +38,7 @@ BuildRoot:	%{_tmppath}/%{name}-buildroot
 BuildArch:	noarch
 Conflicts:	man-pages-fr < 1.58.0-8mdk
 Conflicts:	rpmdrake < 2.4-2mdk
+Conflicts:	curl < 7.13.0
 
 %description
 urpmi is Mandrakelinux's console-based software installation tool. You can
@@ -233,6 +234,10 @@ if (-e "/etc/urpmi/urpmi.cfg") {
 %{compat_perl_vendorlib}/urpm/parallel_ssh.pm
 
 %changelog
+* 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
+
 * Mon Feb 14 2005 Rafael Garcia-Suarez <rgarciasuarez@mandrakesoft.com> 4.6.16-2mdk
 - Don't call rpm during restart to avoid locking