4.6-2mdk

2 files changed, 45 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 4e5edce3..24755a25 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,42 @@
+2004-11-12 12:13  Rafael Garcia-Suarez <rgarciasuarez@mandrakesoft.com>
+
+	* po/fr.po: French translation of new error message
+
+2004-11-10 22:36  José JORGE <jjorge@free.fr>
+
+	* po/pt.po: melo
+
+2004-11-10 18:18  Rafael Garcia-Suarez <rgarciasuarez@mandrakesoft.com>
+
+	* urpmi: If some packages have been deselected during dependency
+	  resolution, because they depended on some for which newer ones
+	  were installed, but if those first packages weren't actually
+	  installed, warn the user about them.	(bug #12306)
+
+2004-11-09 23:16  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, urpmi.pot,
+	  uz.po, uz@Latn.po, vi.po, wa.po, zh_CN.po, zh_TW.po: updated pot
+	  file
+
+2004-11-09 21:09  José JORGE <jjorge@free.fr>
+
+	* po/pt.po: melo
+
+2004-11-09 19:32  Thierry Vignaud <tvignaud@mandrakesoft.com>
+
+	* po/br.po: typo fix
+
+2004-11-09 15:28  Rafael Garcia-Suarez <rgarciasuarez@mandrakesoft.com>
+
+	* urpmi.spec: 4.6-1mdk
+
 2004-11-09 15:19  Rafael Garcia-Suarez <rgarciasuarez@mandrakesoft.com>
 
 	* urpm.pm: Version bump
diff --git a/urpmi.spec b/urpmi.spec
index fc0ddac5..af7b73bb 100644
--- a/urpmi.spec
+++ b/urpmi.spec
@@ -8,7 +8,7 @@
 
 %define name	urpmi
 %define version	4.6
-%define release 1mdk
+%define release 2mdk
 
 %define group %(perl -e 'printf "%%s\\n", "%_vendor" =~ /mandrake/i ? "System/Configuration/Packaging" : "System Environment/Base"')
 
@@ -30,7 +30,7 @@ Source0:	%{name}.tar.bz2
 Summary:	User mode rpm install
 URL:		http://cvs.mandrakesoft.com/cgi-bin/cvsweb.cgi/soft/urpmi
 Requires:	%{req_webfetch} eject gnupg
-PreReq:		perl-Locale-gettext >= 1.01-7 rpmtools >= 4.5 perl-URPM >= 1.03-2mdk
+PreReq:		perl-Locale-gettext >= 1.01-7 rpmtools >= 4.5 perl-URPM >= 1.04
 BuildRequires:	%{buildreq_locale} bzip2-devel rpm-devel >= 4.0.3 
 BuildRequires:	gettext
 BuildRoot:	%{_tmppath}/%{name}-buildroot
@@ -256,6 +256,10 @@ $urpm->update_media(nolock => 1, nopubkey => 1);
 %{compat_perl_vendorlib}/urpm/parallel_ssh.pm
 
 %changelog
+* Fri Nov 12 2004 Rafael Garcia-Suarez <rgarciasuarez@mandrakesoft.com> 4.6-2mdk
+- New error message: "The following packages can't be installed because they
+  depend on packages that are older than the installed ones"
+
 * Tue Nov 09 2004 Rafael Garcia-Suarez <rgarciasuarez@mandrakesoft.com> 4.6-1mdk
 - New option --norebuild to urpmi, urpmi.update and urpmi.addmedia.
 - New --strict-arch option to urpmi