no_comment

7 files changed, 17 insertions, 10 deletions

diff --git a/Makefile b/Makefile
index 707353d24..49e8bdc13 100644
--- a/Makefile
+++ b/Makefile
@@ -53,12 +53,12 @@ clean:
 	for i in $(DIRS); do make -C $$i clean; done
 	find . -name "*~" -o -name ".#*" | xargs rm -f
 
-upload: tar install
-	touch /tmp/mdkinst_done
-	cd $(ROOTDEST)/Mandrake ; tar cfz mdkinst.tgz mdkinst
+upload: #tar install
+#	touch /tmp/mdkinst_done
+#	cd $(ROOTDEST)/Mandrake ; tar cfz mdkinst.tgz mdkinst
 
-	lftp -c "open -u distrib mandrakesoft.com; cd $(UPLOAD_DEST)/images ; mput $(ROOTDEST)/images/*.img"
-	lftp -c "open -u distrib mandrakesoft.com; cd ~/tmp ; put $(ROOTDEST)/Mandrake/mdkinst.tgz ; put /tmp/mdkinst_done ; cd $(UPLOAD_DEST)/Mandrake/base ; lcd $(ROOTDEST)/Mandrake/base ; put mdkinst_stage2.gz compss compssList compssUsers ; cd $(UPLOAD_DEST)/misc ; lcd ~/gi/tools/ ; put make_mdkinst_stage2 build_archive genhdlist" #,gendepslist,rpm2header"
+#	lftp -c "open -u distrib mandrakesoft.com; cd $(UPLOAD_DEST)/images ; mput $(ROOTDEST)/images/*.img"
+	lftp -c "open -u distrib mandrakesoft.com; cd ~/tmp ; cd $(UPLOAD_DEST)/Mandrake/base ; lcd $(ROOTDEST)/Mandrake/base ; put mdkinst_stage2.gz compss compssList compssUsers ; cd $(UPLOAD_DEST)/misc ; lcd ~/gi/tools/ ; put make_mdkinst_stage2 build_archive genhdlist" #,gendepslist,rpm2header"
 	lftp -c "open -u distrib mandrakesoft.com; cd $(UPLOAD_DEST)/dosutils/autoboot/mdkinst ; put $(ROOTDEST)/dosutils/autoboot/mdkinst/vmlinuz ; mput $(ROOTDEST)/dosutils/autoboot/mdkinst/initrd.*"
 	lftp -c "open -u distrib mandrakesoft.com; cd $(UPLOAD_DEST)/lnx4win ; lcd $(ROOTDEST)/lnx4win ; put initrd.gz vmlinuz"
 #	lftp -c "open -u distrib mandrakesoft.com; cd $(UPLOAD_DEST_CONTRIB)/others/src ; put ../gi.tar.bz2"
diff --git a/docs/TODO b/docs/TODO
index a1c936655..36ad1932a 100644
--- a/docs/TODO
+++ b/docs/TODO
@@ -48,6 +48,9 @@ redémarrage, le boot manager de Be apparaît et il est impossible de
 démarrer Linux.
 Pourquoi ne pas installer LILO si on supprime toutes les partitions ?
 
+missing feature in lilo configuration: can't give hda2 with /boot/vmlinuz if
+already hda1 with /boot/vmlinuz
+
 > Here I go into the printer configuration select 'HP Deskjet 722C Colour',
 > print a test ASCII page, pressing 'No' when prompted to indicate the page did
 > not print OK and then hitting cancel when prompted to choose a printer type
diff --git a/perl-install/Xconfigurator_consts.pm b/perl-install/Xconfigurator_consts.pm
index aae59790f..4cb0d8730 100644
--- a/perl-install/Xconfigurator_consts.pm
+++ b/perl-install/Xconfigurator_consts.pm
@@ -149,8 +149,8 @@ $default_monitor = "High Frequency SVGA, 1024x768 at 70 Hz";
 %lines = (
 #-    'Cirrus Logic|GD 5446' => [ '	Option "no_bitblt"' ],
       'Silicon Integrated Systems [SiS]|86C326' => [ '	Option "noaccel"' ],
-      'Trident Microsystems|Cyber 9525' => [ '	Option "noaccel"' ],
-      'S3 Inc.|86c368 [Trio 3D/2X]' => [ '	ChipID  0x8a10' ],
+#-      'Trident Microsystems|Cyber 9525' => [ '	Option "noaccel"' ],
+#-      'S3 Inc.|86c368 [Trio 3D/2X]' => [ '	ChipID  0x8a10' ],
 );
 
 #- most usefull server options have to be accessible at the beginning, since
diff --git a/perl-install/install2.pm b/perl-install/install2.pm
index e111c9043..6c7f6d784 100644
--- a/perl-install/install2.pm
+++ b/perl-install/install2.pm
@@ -352,7 +352,7 @@ sub choosePackages {
     if ($_[1] > 1 || !$o->{isUpgrade} || $::expert) {
 	if ($_[1] == 1) { 
 	    $o->{compssUsersChoice}{$_} = 1 foreach @{$o->{compssUsersSorted}}, 'Miscellaneous';
-	    $o->{compssUsersChoice}{KDE} = 0 if $o->{lang} =~ /ja|ko|th|vi|zh/; #- gnome handles much this fonts much better
+	    $o->{compssUsersChoice}{KDE} = 0 if $o->{lang} =~ /ja|el|ko|th|vi|zh/; #- gnome handles much this fonts much better
 
 	}
 	$o->choosePackages($o->{packages}, $o->{compss}, 
diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm
index 8ab9d4073..72a442c3f 100644
--- a/perl-install/install_any.pm
+++ b/perl-install/install_any.pm
@@ -648,9 +648,13 @@ sub kdeicons_postinstall($) {
 	} elsif (m|^/dev/(\S+)\s+(/mnt/DOS_\S*)\s+|) {
 	    my %toreplace = ( device => $1, id => $1, mntpoint => $2 );
 	    template2userfile($prefix, "/usr/share/Dos_.kdelnk.in", "Desktop/Dos_$1.kdelnk", 1, %toreplace);
+	    symlink "hd_umount.xpm", "$prefix/usr/share/icons/hd_unmount.xpm";
+	    symlink "hd_umount.xpm", "$prefix/usr/share/icons/large/hd_unmount.xpm";
 	} elsif (m|^/dev/(\S+)\s+(\S*)\s+vfat\s+|) {
 	    my %toreplace = ( device => $1, id => $1, mntpoint => $2 );
 	    template2userfile($prefix, "/usr/share/Dos_.kdelnk.in", "Desktop/Dos_$1.kdelnk", 1, %toreplace);
+	    symlink "hd_umount.xpm", "$prefix/usr/share/icons/hd_unmount.xpm";
+	    symlink "hd_umount.xpm", "$prefix/usr/share/icons/large/hd_unmount.xpm";
 	}
     }
 
diff --git a/perl-install/share/compssList b/perl-install/share/compssList
index 4a106ed16..e135fe17e 100644
--- a/perl-install/share/compssList
+++ b/perl-install/share/compssList
@@ -385,7 +385,7 @@ ispell-nl                                    -15   -15   -15
 ispell-no                                    -15   -15   -15
 ispell-pl                                    -15   -15   -15
 ispell-pt                                    -15   -15   -15
-ispell-pt_BR                                 -15   -15   -51
+ispell-pt_BR                                 -15   -15   -15
 ispell-ro                                    -15   -15   -15
 ispell-ru                                    -15   -15   -15
 ispell-sl                                    -15   -15   -15
@@ -884,7 +884,6 @@ transfig                                      16     0    14
 tree                                          40    25    10
 trn                                           46     0    41
 trojka                                        54     0    48
-ttfonts                                       87     0    80
 tunelp                                        24    15    28
 ucd-snmp                                       0    70    45
 ucd-snmp-devel                                 0    25    45
diff --git a/perl-install/timezone.pm b/perl-install/timezone.pm
index 0154277ac..a25dcf36c 100644
--- a/perl-install/timezone.pm
+++ b/perl-install/timezone.pm
@@ -50,6 +50,7 @@ my %l2t = (
 'French (Canada)' => 'Canada/Atlantic', # or Newfoundland ? or Eastern ?
 'Gaeilge (Ireland)' => 'Europe/Dublin',
 'German (Germany)' => 'Europe/Berlin',
+'Greek (Greece)' => 'Europe/Athens',
 'Hungarian (Hungary)' => 'Europe/Budapest',
 'Icelandic (Iceland)' => 'Atlantic/Reykjavik',
 'Indonesian (Indonesia)' => 'Asia/Jakarta',