summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael Garcia-Suarez <rgarciasuarez@mandriva.org>2004-12-17 18:17:32 +0000
committerRafael Garcia-Suarez <rgarciasuarez@mandriva.org>2004-12-17 18:17:32 +0000
commit20c02abbc2c0da2aeebf4664d5160577ca17669e (patch)
tree850d7ea7d6cdfa450fe1fe4461d2bb5257889b62
parent09360f7683ce519adc800b1e348df98d97b53a51 (diff)
downloadurpmi-20c02abbc2c0da2aeebf4664d5160577ca17669e.tar
urpmi-20c02abbc2c0da2aeebf4664d5160577ca17669e.tar.gz
urpmi-20c02abbc2c0da2aeebf4664d5160577ca17669e.tar.bz2
urpmi-20c02abbc2c0da2aeebf4664d5160577ca17669e.tar.xz
urpmi-20c02abbc2c0da2aeebf4664d5160577ca17669e.zip
4.6.9-1mdk
-rw-r--r--ChangeLog60
-rw-r--r--urpm.pm2
-rw-r--r--urpmi.spec8
3 files changed, 68 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 0bab7a09..51473594 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,58 @@
+2004-12-17 18:59 Rafael Garcia-Suarez <rgarciasuarez@mandrakesoft.com>
+
+ * urpmi: Fix a stupid typo that prevented urpmi --skip to work. /me
+ sux
+
+2004-12-17 17:09 Rafael Garcia-Suarez <rgarciasuarez@mandrakesoft.com>
+
+ * urpm.pm: Trim obsolete documentation
+
+2004-12-16 14:42 Rafael Garcia-Suarez <rgarciasuarez@mandrakesoft.com>
+
+ * po/fr.po: Remove spurious space
+
+2004-12-16 13:57 Thierry Vignaud <tvignaud@mandrakesoft.com>
+
+ * po/fr.po: update (neoclust)
+
+2004-12-16 10:45 Rafael Garcia-Suarez <rgarciasuarez@mandrakesoft.com>
+
+ * urpm.pm: It's better to iterate over keys here
+
+2004-12-16 10:21 Rafael Garcia-Suarez <rgarciasuarez@mandrakesoft.com>
+
+ * urpme: Tell number of packages that will be removed by urpme
+
+2004-12-15 15:59 Thierry Vignaud <tvignaud@mandrakesoft.com>
+
+ * po/fr.po: update (stef, neoclust)
+
+2004-12-15 15:58 Thierry Vignaud <tvignaud@mandrakesoft.com>
+
+ * po/: br.po, es.po, et.po, hu.po, ja.po, pt.po, zh_CN.po: update
+
+2004-12-15 11:54 Rafael Garcia-Suarez <rgarciasuarez@mandrakesoft.com>
+
+ * gurpm.pm: Remove gurpm.pm, now unused
+
+2004-12-15 11:32 Rafael Garcia-Suarez <rgarciasuarez@mandrakesoft.com>
+
+ * urpmi.spec: Remove gurpm.pm from the urpmi package
+
+2004-12-14 12:06 Rafael Garcia-Suarez <rgarciasuarez@mandrakesoft.com>
+
+ * urpmi: Remove unused variables
+
+2004-12-13 22:13 Keld Jørn Simonsen <keld@dkuug.dk>
+
+ * po/da.po: updates soft/drakpxelinux/po/da.po
+ soft/rpmdrake/po/da.po soft/urpmi/po/da.po
+ gi/perl-install/share/po/da.po
+
+2004-12-13 18:45 Rafael Garcia-Suarez <rgarciasuarez@mandrakesoft.com>
+
+ * urpm.pm, urpmi.spec: 4.6.8-1mdk
+
2004-12-13 16:48 Thierry Vignaud <tvignaud@mandrakesoft.com>
* po/br.po: update
@@ -7,6 +62,11 @@
* urpmi.update: let perl_checker be able to update translation
catalogs
+2004-12-13 16:48 Thierry Vignaud <tvignaud@mandrakesoft.com>
+
+ * urpmi.update: let perl_checker be able to update translation
+ catalogs
+
2004-12-13 13:51 Rafael Garcia-Suarez <rgarciasuarez@mandrakesoft.com>
* urpm.pm: Adding a media should not fail when there is no pubkey
diff --git a/urpm.pm b/urpm.pm
index c38e7d13..8ca8b55f 100644
--- a/urpm.pm
+++ b/urpm.pm
@@ -11,7 +11,7 @@ use urpm::util;
use urpm::sys;
use urpm::cfg;
-our $VERSION = '4.6.8';
+our $VERSION = '4.6.9';
our @ISA = qw(URPM);
use URPM;
diff --git a/urpmi.spec b/urpmi.spec
index e0c57499..529d619d 100644
--- a/urpmi.spec
+++ b/urpmi.spec
@@ -7,7 +7,7 @@
##################################################################
%define name urpmi
-%define version 4.6.8
+%define version 4.6.9
%define release 1mdk
%define group %(perl -e 'printf "%%s\\n", "%_vendor" =~ /mandrake/i ? "System/Configuration/Packaging" : "System Environment/Base"')
@@ -37,6 +37,7 @@ BuildRequires: gettext
BuildRoot: %{_tmppath}/%{name}-buildroot
BuildArch: noarch
Conflicts: man-pages-fr < 1.58.0-8mdk
+Conflicts: rpmdrake < 2.4-2mdk
%description
urpmi is Mandrakelinux's console-based software installation tool. You can
@@ -226,6 +227,11 @@ $urpm->update_media(nolock => 1, nopubkey => 1);
%{compat_perl_vendorlib}/urpm/parallel_ssh.pm
%changelog
+* Fri Dec 17 2004 Rafael Garcia-Suarez <rgarciasuarez@mandrakesoft.com> 4.6.9-1mdk
+- Fix urpmi --skip
+- Tell number of packages that will be removed by urpme
+- Remove gurpm module, conflict with older rpmdrakes
+
* Mon Dec 13 2004 Rafael Garcia-Suarez <rgarciasuarez@mandrakesoft.com> 4.6.8-1mdk
- Adding a media should not fail when there is no pubkey file available
(bug #12646)