update

2 files changed, 247 insertions, 2 deletions

diff --git a/DrakConf.spec b/DrakConf.spec
index 021f8903..92888d7e 100644
--- a/DrakConf.spec
+++ b/DrakConf.spec
@@ -1,5 +1,5 @@
 # Changed by Makefile of cvs.
-%define version 0.60
+%define version 0.61
 %define name DrakConf
 
 Summary:	The Mandrake Control Center 
@@ -87,5 +87,250 @@ rm -rf $RPM_BUILD_ROOT
 %config(noreplace) %{_sysconfdir}/security/console.apps/DrakConf
 
 %changelog
+* Thu Feb  8 2001 dam's <damien@mandrakesoft.com> 0.61-1mdk
+- added application killing when leaving.
+
 * Thu Feb  8 2001 dam's <damien@mandrakesoft.com> 0.60-1mdk
 - new version. Should crash.
+
+* Fri Dec 29 2000 Pablo Saratxaga <pablo@mandrakesoft.com> 0.53-1mdk
+- this versions uses UTF-8 for the *.rc files, and does, if needed, the
+  conversion to the user's charset
+
+* Fri Oct  6 2000 DindinX <odin@mandrakesoft.com> 0.52-41mdk
+- Completly get rid of kdesu
+
+* Fri Oct  6 2000 Renaud Chaillat <rchaillat@mandrakesoft.com> 0.52-40mdk
+- added requirement for usermode
+
+* Fri Oct  6 2000 Renaud Chaillat <rchaillat@mandrakesoft.com> 0.52-39mdk
+- last update to consolehelper configuration (renaming of the original 
+  binary)
+
+* Thu Oct  5 2000 Renaud Chaillat <rchaillat@mandrakesoft.com> 0.52-38mdk
+- one more update for pam configuration, to allow the link 
+  to consolehelper be DrakConf with caps
+- fix rpmdrake calling path (fix 651)
+
+* Thu Oct  5 2000 DindinX <odin@mandrakesoft.com> 0.52-37mdk
+- fix menu entry to use drakconf-auth
+- update liveupdate description
+
+* Thu Oct  5 2000 Renaud Chaillat <rchaillat@mandrakesoft.com> 0.52-36mdk
+- corrected pam configuration (pam_authenticate has problems 
+  with caps in services names)
+- Added an rc for livedrake (fix 599)
+- s/Outils de démarrage/Gestion de démarrage/ (fix 627)
+
+* Wed Oct 04 2000 DindinX <odin@mandrakesoft.com> 0.52-35mdk
+- rc fixes
+- linuxconf launch /sbin/linuxconf
+- New icons from LN
+- back to kdesu, since pam does not want to work :(
+
+* Tue Oct 03 2000 DindinX <odin@mandrakesoft.com> 0.52-34mdk
+- resurect LinuxConf
+- small rc fix
+
+* Tue Oct 03 2000 DindinX <odin@mandrakesoft.com> 0.52-33mdk
+- Change some rc entry (suggestion from gc)
+- use pam instead of kdesu
+
+* Tue Oct 03 2000 DindinX <odin@mandrakesoft.com> 0.52-32mdk
+- change Mandrake to Linux-Mandrake in the rc files
+
+* Mon Oct 02 2000 DindinX <odin@mandrakesoft.com> 0.52-31mdk
+- fix menudrake calling (for system menu)
+- update some rc
+
+* Mon Oct 02 2000 DindinX <odin@mandrakesoft.com> 0.52-30mdk
+- fix french translation of draknet (fix bug 469)
+- update translations of other rc
+
+* Fri Sep 29 2000 DindinX <odin@mandrakesoft.com> 0.52-29mdk
+- new icons
+
+* Fri Sep 29 2000 DindinX <odin@mandrakesoft.com> 0.52-28mdk
+- Small rc fixes
+
+* Thu Sep 28 2000 DindinX <odin@mandrakesoft.com> 0.52-27mdk
+- change adduserdrake for userdrake
+
+* Thu Sep 28 2000 DindinX <odin@mandrakesoft.com> 0.52-26mdk
+- small UI changes
+- updated po
+
+* Fri Sep 15 2000 DindinX <odin@mandrakesoft.com> 0.52-25mdk
+- fix a problem with i18n of some language (Pablo)
+- updated po (Pablo)
+- work around a perl bug (Chmouel)
+
+* Mon Sep 11 2000 DindinX <odin@mandrakesoft.com> 0.52-24mdk
+- Small UI changes
+- Added menudrake, draknet and drakgw
+
+* Mon Aug 28 2000 DindinX <odin@mandrakesoft.com> 0.52-23mdk
+- use %%lang
+- use noreplace with %%config for rc files
+
+* Fri Aug 25 2000 DindinX <odin@mandrakesoft.com> 0.52-22mdk
+- Remove the border of the info notebook
+- po updates
+
+* Thu Aug 24 2000 David BAUDENS <baudens@mandrakesoft.com> 0.52-21mdk
+- Fix macro disaster
+
+* Sun Aug 13 2000 Guillaume Cottenceau <gc@mandrakesoft.com> 0.52-20mdk
+- fixing %post script
+
+* Tue Aug 08 2000 DindinX <odin@mandrakesoft.com> 0.52-19mdk
+- fix BuildRequires (Fred sucks)
+- BM
+- New harddrake.rc
+
+* Mon Aug 07 2000 Frederic Lepied <flepied@mandrakesoft.com> 0.52-18mdk
+- automatically added BuildRequires
+
+* Tue May  9 2000 Guillaume Cottenceau <gc@mandrakesoft.com> 0.52-17mdk
+- added require to kdesu
+
+* Wed May  3 2000 DindinX <odin@mandrakesoft.com> 0.52-16mdk
+- Added Mandrake Update
+
+* Fri Apr 28 2000 DindinX <odin@mandrakesoft.com> 0.52-15mdk
+- Added a 32x32 and a 48x48 icons
+
+* Fri Apr 28 2000 DindinX <odin@mandrakesoft.com> 0.52-14mdk
+- remove icon menu path
+
+* Thu Apr 20 2000 DindinX <odin@mandrakesoft.com> 0.52-13mdk
+- Put a better looking logo
+- Remove kpackage
+
+* Wed Apr 19 2000 warly <warlyn@mandrakesoft.com> 0.52-12mdk
+- remove this f****ng bl***y bast*** logo
+
+* Wed Apr 19 2000 warly <warlyn@mandrakesoft.com> 0.52-11mdk
+- really remove logo
+
+* Wed Apr 19 2000 warly <warly@mandrakesoft.com> 0.52-10mdk
+- remove some logos
+
+* Wed Apr 19 2000 DindinX <odin@mandrakesoft.com> 0.52-9mdk
+- remove drakbootdisk (merge with drakboot)
+
+* Tue Apr 18 2000 DindinX <odin@mandrakesoft.com> 0.52-8mdk
+- Added an entry drakboot
+
+* Mon Apr 17 2000 DindinX <odin@mandrakesoft.com> 0.52-7mdk
+- Added an entry for drakbootdisk
+- only read .rc files
+
+* Tue Apr 11 2000 DindinX <odin@mandrakesoft.com> 0.52-6mdk
+- Added nice icons from Hélène
+
+* Mon Apr 10 2000 DindinX <odin@mandrakesoft.com> 0.52-5mdk
+- Better handling of different resolutions
+
+* Sat Apr  8 2000 DindinX <odin@mandrakesoft.com> 0.52-4mdk
+- Fix the grammar in the Desc.
+- Added rpmdrake and drakfont.
+- rename lothar to harddrake.
+
+* Sat Apr  8 2000 DindinX <odin@mandrakesoft.com> 0.52-3mdk
+- Add a %config tag to make rpmlint happy
+
+* Fri Mar 31 2000 DindinX <odin@mandrakesoft.com> 0.52-2mdk
+- Menu group back to /Configuration/Other :(
+
+* Fri Mar 31 2000 DindinX <odin@mandrakesoft.com> 0.52-1mdk
+- New version w/ support for 640x480 screens
+- Spec update
+- Change Group
+- Add menu
+
+* Mon Mar 13 2000 Chmouel Boudjnah <chmouel@mandrakesoft.com> 0.51-1mdk
+- Requires true perl when using Getopt::Long.
+
+* Sun Mar 12 2000 Chmouel Boudjnah <chmouel@mandrakesoft.com> 0.51-1mdk
+- DrakConf.pm (usage): parse arguments with Getopt::Long;
+- DrakConf.pm: Now use a directory and one config file for entry.
+
+* Tue Feb 29 2000 DindinX <odin@mandrakesoft.com> 0.50-1mdk
+- Use a more usefull version number...
+
+* Mon Feb 28 2000 DindinX <odin@mandrakesoft.com> 0.34-2mdk
+- Added a "close" button
+
+* Tue Jan 25 2000 Chmouel Boudjnah <chmouel@mandrakesoft.com> 0.37-1mdk
+- po/lothar.rc: Exclusivearchs: i386
+- DrakConf.pm (get_arch): add ability to do Exclusivearchs for 
+  certain program.
+
+* Wed Jan 12 2000 François PONS <fpons@mandrakesoft.com>
+- remove provide control-panel.
+
+* Fri Jan  7 2000 Pixel <pixel@mandrakesoft.com>
+- DrakConf.c (main): add setlocale call for i18n
+
+* Tue Jan  4 2000 Chmouel Boudjnah <chmouel@mandrakesoft.com> 0.34-10mdk
+- respawn with kdesu if launching as user.
+
+* Mon Jan  3 2000 Chmouel Boudjnah <chmouel@mandrakesoft.com>
+- Remove Obsoletes and Provides control-panel.
+
+* Mon Jan 03 2000 Chmouel Boudjnah <chmouel@mandrakesoft.com>
+- po/*lothar*: add blank line in the end of file.
+
+* Mon Dec 27 1999 Chmouel Boudjnah <chmouel@mandrakesoft.com>
+- create the temporary file in ~tmp/ for obvious
+  security reasons, also fix an improbable but possible
+  race conditions.
+
+* Mon Dec 27 1999 Chmouel Boudjnah <chmouel@mandrakesoft.com>
+- po/*: adjust & change.
+- diskdrake.pm: can do eval of perl code in config files.
+- DrakConf.pm: Try better to find the language.
+- pics/*diskdrake: new icon.
+- DrakConf.c: create a temporary file when 'exec'ing a tool (dinx)
+- DrakConf.c: fix a very stupid bug in the tests for existing tools (dinx).
+
+* Fri Dec 24 1999 Pixel <pixel@mandrakesoft.com>
+- add obsoletes control-panel
+
+* Mon Dec 20 1999 Chmouel Boudjnah <chmouel@mandrakesoft.com>
+- DrakConf.c: remove the obsolete translation of '§' into ' '
+- DrakConf.rc: Add a lot of i18n translations from pablo
+- DrakConf.rc: s|/sbin/netconf|/bin/netconf|;
+- DrakConf.rc: remove the §.
+- DrakConf.pm: fix bad call.
+- pics/*mouse*.xpm: new icon from helene.
+- pics/*keyboard*.xpm: new icon from helene.
+- pics/*drake*.xpm: new icon from helene.
+- pics/*lothar*.xpm: new icon from helene.
+- DrakConf.pm: Parse better arguments.
+
+* Sun Dec 19 1999 Chmouel Boudjnah <chmouel@mandrakesoft.com>
+- French and Spanish Description (camille).
+- strip binaries.
+
+* Sat Dec 18 1999 Chmouel Boudjnah <chmouel@mandrakesoft.com> 
+- Makefile: dist rpm.
+- DrakConf.pm: Rewrite the parser.
+- DrakConf.(c|pm): add a test mode.
+- pics/*: clean name and add icones (helene).
+- DrakConf.rc: cleaning.
+
+* Thu Dec 16 1999 Pixel <pixel@mandrakesoft.com>
+- Makefile (dis): changed to ignore pics/unused
+- DrakConf.rc: many change
+- pics/*: additions and modifications
+
+* Thu Dec 16 1999 Chmouel Boudjnah <chmouel@mandrakesoft.com>
+- Add many changes (see the ChangeLog).
+
+* Fri Dec 10 1999 Chmouel Boudjnah <chmouel@mandrakesoft.com>
+
+- First spec file.
+
+# end of file
diff --git a/control-center3 b/control-center3
index 997d779e..cc335a97 100755
--- a/control-center3
+++ b/control-center3
@@ -178,7 +178,7 @@ map {
 
 map {
     create_tree_item($treeitem_sub[int($_->[2])],$_->[0], "$xpm_path/$_->[1]",0);
-} (['Drakboot','item.xpm',5] , ['Drakfloppy', 'item.xpm',5] , ['Drakelogo', 'item.xpm',5],
+} (['Boot Loader','item.xpm',5] , ['Boot Disk', 'item.xpm',5] , ['Boot Logo', 'item.xpm',5],
    ['XFDrake','item.xpm',4] , ['Hardrake','item.xpm',4] , ['Mousedrake', 'item.xpm',4] , ['Printerdrake','item.xpm',4] , ['Keyboarddrake', 'item.xpm',4],
    ['Userdrake','item.xpm',3] ,
    ['Draknet' , 'item.xpm',2] , ['Drakgw','item.xpm',2],