4.6.6-1mdk

3 files changed, 56 insertions, 24 deletions

diff --git a/ChangeLog b/ChangeLog
index 39fd382e..cb529867 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,53 @@
+2004-12-07 18:34  Rafael Garcia-Suarez <rgarciasuarez@mandrakesoft.com>
+
+	* man/C/urpmi.8: Update manpage
+
+2004-12-07 18:25  Rafael Garcia-Suarez <rgarciasuarez@mandrakesoft.com>
+
+	* urpm/msg.pm: Remove GUI messages.
+
+2004-12-07 18:22  Rafael Garcia-Suarez <rgarciasuarez@mandrakesoft.com>
+
+	* urpmi.bash-completion: Remove --X from bash completion
+
+2004-12-07 18:20  Rafael Garcia-Suarez <rgarciasuarez@mandrakesoft.com>
+
+	* urpmi, urpm/args.pm: Remove support for urpmi -X
+
+2004-12-07 18:09  Rafael Garcia-Suarez <rgarciasuarez@mandrakesoft.com>
+
+	* gurpmi: gurpmi, the next generation.
+
+2004-12-07 12:08  Rafael Garcia-Suarez <rgarciasuarez@mandrakesoft.com>
+
+	* urpmi: Remove obsolete comment
+
+2004-12-07 12:00  Rafael Garcia-Suarez <rgarciasuarez@mandrakesoft.com>
+
+	* urpmi, urpm/util.pm: Move untaint() into urpm::util.	Fix a
+	  comment in urpmi.
+
+2004-12-07 11:55  Rafael Garcia-Suarez <rgarciasuarez@mandrakesoft.com>
+
+	* urpm.pm: Remove gurpmi special case for README.urpmi files
+
+2004-12-06 14:25  Rafael Garcia-Suarez <rgarciasuarez@mandrakesoft.com>
+
+	* urpm/args.pm: Fix loading of urpm::msg::N() in urpm::args, and
+	  urpmi's --no-locale option
+
+2004-12-04 18:17  Funda Wang <fundawang@linux.net.cn>
+
+	* po/zh_CN.po: Updated Simplified Chinese translation
+
+2004-12-04 15:05  José JORGE <jjorge@free.fr>
+
+	* po/pt.po: melo
+
+2004-12-03 18:25  Rafael Garcia-Suarez <rgarciasuarez@mandrakesoft.com>
+
+	* urpm.pm, urpmi.spec: 4.6.5-1mdk
+
 2004-12-03 17:58  Rafael Garcia-Suarez <rgarciasuarez@mandrakesoft.com>
 
 	* urpmi.bash-completion: Add new options to bash completion
diff --git a/urpm.pm b/urpm.pm
index e5fa284a..1adf1ecd 100644
--- a/urpm.pm
+++ b/urpm.pm
@@ -11,7 +11,7 @@ use urpm::util;
 use urpm::sys;
 use urpm::cfg;
 
-our $VERSION = '4.6.5';
+our $VERSION = '4.6.6';
 our @ISA = qw(URPM);
 
 use URPM;
diff --git a/urpmi.spec b/urpmi.spec
index 4542e4a5..2c1fef45 100644
--- a/urpmi.spec
+++ b/urpmi.spec
@@ -7,7 +7,7 @@
 ##################################################################
 
 %define name	urpmi
-%define version	4.6.5
+%define version	4.6.6
 %define release 1mdk
 
 %define group %(perl -e 'printf "%%s\\n", "%_vendor" =~ /mandrake/i ? "System/Configuration/Packaging" : "System Environment/Base"')
@@ -60,14 +60,6 @@ Provides:	grpmi
 gurpmi is a graphical front-end to urpmi.
 %endif
 
-#%package -n autoirpm
-#Summary: Auto install of rpm on demand
-#Requires: sh-utils urpmi gurpmi xtest gmessage gurpmi perl
-#Group: %{group}
-#
-#%description -n autoirpm
-#Auto install of rpm on demand
-
 %package -n urpmi-parallel-ka-run
 Summary:	Parallel extensions to urpmi using ka-run
 Requires:	urpmi >= %{version}-%{release} ka-run >= 2.0-15mdk
@@ -230,20 +222,6 @@ $urpm->update_media(nolock => 1, nopubkey => 1);
 %{compat_perl_vendorlib}/gurpm.pm
 %endif
 
-#%files -n autoirpm
-#%defattr(-,root,root)
-#%dir /var/lib/urpmi/autoirpm.scripts
-#%config(noreplace) /etc/urpmi/autoirpm.deny
-#%{_sbindir}/autoirpm.*
-#%{_mandir}/man?/autoirpm*
-## find_lang isn't able to find man pages yet...
-#%lang(cs) %{_mandir}/cs/man?/autoirpm*
-#%lang(eu) %{_mandir}/eu/man?/autoirpm*
-#%lang(fr) %{_mandir}/fr/man?/autoirpm*
-#%lang(ru) %{_mandir}/ru/man?/autoirpm*
-#%{_bindir}/_irpm
-#%doc README-autoirpm-icons autoirpm.README
-
 %files -n urpmi-parallel-ka-run
 %defattr(-,root,root)
 %doc urpm/README.ka-run
@@ -257,6 +235,10 @@ $urpm->update_media(nolock => 1, nopubkey => 1);
 %{compat_perl_vendorlib}/urpm/parallel_ssh.pm
 
 %changelog
+* Tue Dec 07 2004 Rafael Garcia-Suarez <rgarciasuarez@mandrakesoft.com> 4.6.6-1mdk
+- gurpmi has been reimplemented as a standalone gtk2 program.
+- As a consequence, urpmi --X doesn't work any longer.
+
 * Fri Dec 03 2004 Rafael Garcia-Suarez <rgarciasuarez@mandrakesoft.com> 4.6.5-1mdk
 - Add --ignore and -­no-ignore options to urpmi.update
 - Reduce urpmi redundant verbosity