4.6.11

3 files changed, 77 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index cbed6d7f..082d8de4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,72 @@
+2005-01-10 11:42  Rafael Garcia-Suarez <rgarciasuarez@mandrakesoft.com>
+
+	* urpmi: Always select STDOUT by default, plus some code
+	  factorisation
+
+2005-01-10 10:34  Rafael Garcia-Suarez <rgarciasuarez@mandrakesoft.com>
+
+	* urpmi, urpm/args.pm: Remove unused vars
+
+2005-01-10 09:39  Rafael Garcia-Suarez <rgarciasuarez@mandrakesoft.com>
+
+	* urpmf: "urpmf --summary" doesn't need a hdlist file (patch by
+	  Michael Scherer)
+
+2005-01-10 09:37  Rafael Garcia-Suarez <rgarciasuarez@mandrakesoft.com>
+
+	* urpmi, urpm/args.pm: Add an option to urpmi, --expect-install,
+	  that tells urpmi to return with an exit status of 15 if it
+	  installed nothing.
+
+2005-01-09 22:35  José JORGE <jjorge@free.fr>
+
+	* po/pt.po: melo
+
+2005-01-08 19:44  Funda Wang <fundawang@linux.net.cn>
+
+	* po/zh_CN.po: Updated Simplified Chinese translation
+
+2005-01-08 18:57  Albert Astals Cid <astals11@terra.es>
+
+	* po/ca.po: Small updates
+
+2005-01-08 04:02  Keld Jørn Simonsen <keld@dkuug.dk>
+
+	* po/da.po: update soft/urpmi/po/da.po
+
+2005-01-07 19:39  Pablo Saratxaga <pablo@mandrakesoft.com>
+
+	* po/ja.po: updated po file
+
+2005-01-07 14:30  Pablo Saratxaga <pablo@mandrakesoft.com>
+
+	* po/et.po: updated po file
+
+2005-01-07 11:30  Rafael Garcia-Suarez <rgarciasuarez@mandrakesoft.com>
+
+	* urpmi.spec: Don't fail in post-install when urpmi wasn't
+	  previously installed
+
+2005-01-07 10:15  Rafael Garcia-Suarez <rgarciasuarez@mandrakesoft.com>
+
+	* po/fr.po: Missing space
+
+2005-01-06 22:53  Pablo Saratxaga <pablo@mandrakesoft.com>
+
+	* po/: af.po, ar.po, az.po, bg.po, bn.po, br.po, bs.po, ca.po,
+	  cs.po, cy.po, da.po, de.po, el.po, eo.po, es.po, et.po, eu.po,
+	  fa.po, fi.po, fr.po, fur.po, ga.po, gl.po, he.po, hi.po, hr.po,
+	  hu.po, id.po, is.po, it.po, ja.po, ka.po, ko.po, ky.po, lt.po,
+	  lv.po, mk.po, mn.po, ms.po, mt.po, nb.po, nl.po, nn.po, pl.po,
+	  pt.po, pt_BR.po, ro.po, ru.po, sk.po, sl.po, sq.po, sr.po,
+	  sr@Latn.po, sv.po, tg.po, th.po, tl.po, tr.po, uk.po, uz.po,
+	  uz@Latn.po, vi.po, wa.po, zh_CN.po, zh_TW.po: rescued some
+	  translations
+
+2005-01-06 16:29  Rafael Garcia-Suarez <rgarciasuarez@mandrakesoft.com>
+
+	* urpm.pm, urpmi.spec: 4.6.10-1mdk
+
 2005-01-06 15:57  Rafael Garcia-Suarez <rgarciasuarez@mandrakesoft.com>
 
 	* po/fr.po: French translation update
diff --git a/urpm.pm b/urpm.pm
index 3aa91f13..07342f35 100644
--- a/urpm.pm
+++ b/urpm.pm
@@ -11,7 +11,7 @@ use urpm::util;
 use urpm::sys;
 use urpm::cfg;
 
-our $VERSION = '4.6.10';
+our $VERSION = '4.6.11';
 our @ISA = qw(URPM);
 
 use URPM;
diff --git a/urpmi.spec b/urpmi.spec
index dd36b418..555f42af 100644
--- a/urpmi.spec
+++ b/urpmi.spec
@@ -7,7 +7,7 @@
 ##################################################################
 
 %define name	urpmi
-%define version	4.6.10
+%define version	4.6.11
 %define release 1mdk
 
 %define group %(perl -e 'printf "%%s\\n", "%_vendor" =~ /mandrake/i ? "System/Configuration/Packaging" : "System Environment/Base"')
@@ -229,6 +229,12 @@ if (-e "/etc/urpmi/urpmi.cfg") {
 %{compat_perl_vendorlib}/urpm/parallel_ssh.pm
 
 %changelog
+* Mon Jan 10 2005 Rafael Garcia-Suarez <rgarciasuarez@mandrakesoft.com> 4.6.11-1mdk
+- Add an option to urpmi, --expect-install, that tells urpmi to return with an
+  exit status of 15 if it installed nothing.
+- Fix 'urpmf --summary' (Michael Scherer)
+- Language updates
+
 * Thu Jan 06 2005 Rafael Garcia-Suarez <rgarciasuarez@mandrakesoft.com> 4.6.10-1mdk
 - Langage updates
 - urpmi now returns a non-zero exit status il all requested packages were