sync to prepapre a new mes5.2 iso

24 files changed, 1376 insertions, 565 deletions

diff --git a/BCD/Isolinux.pm b/BCD/Isolinux.pm
index e172ef0..6b0d8df 100644
--- a/BCD/Isolinux.pm
+++ b/BCD/Isolinux.pm
@@ -32,7 +32,7 @@ sub switch_theme {
             my $binary = "/usr/share/bootsplash/scripts/make-boot-splash-raw";
             -x $binary or die "$LOG you need $binary which is available in bootsplash >= 3.2.3\n";
 	    my $cmd;
-	    if ($isoconf->{based_on} gt "2009.1") {
+	    if ($isoconf->{based_on} gt "2009.1" && $isoconf->{based_on} ne "mes5") {
             	$cmd = "$binary $initrd $theme";
     		} else {
 		# old script use a resolution parameter
@@ -71,6 +71,20 @@ sub add_entry {
     }
 }
 
+sub use_firmware {
+    print_color("$LOG copy fw.gz to $build_isolinux_dir/alt0/", $color);
+    my $syslinuxcfg = "$build_isolinux_dir/isolinux.cfg";
+    open (IN, "+<$syslinuxcfg");
+    @file = <IN>;
+    seek IN,0,0;
+    foreach (@file){
+	$_ =~ s|alt0/all.rdz|alt0/all.rdz,alt0/fw.gz|g;
+        print IN $_;
+    }
+    close IN;
+    system("cp -v /usr/lib*/drakx-installer-images/isolinux/alt0/fw.gz $build_isolinux_dir/alt0/")
+}
+
 sub copy_files {
 	foreach my $file (@{$isoconf->{isolinux}{tocopy}}) {
 		$file->{name} or next;
@@ -93,6 +107,9 @@ sub main_isolinux {
     print_color("$LOG copy $repo_isolinux to $build_isolinux_dir", $color);
     dircopy($repo_isolinux, $build_isolinux_dir) or die $!;
     add_entry;
+    if ($isoconf->{isolinux}{firmware} eq "yes") {
+	    use_firmware;
+    }
     copy_files;
     switch_theme;
 }
diff --git a/BCD/Media.pm b/BCD/Media.pm
index 3e9de7b..3b5878a 100644
--- a/BCD/Media.pm
+++ b/BCD/Media.pm
@@ -9,11 +9,13 @@ use Data::Dumper;
 use MDK::Common;
 use File::Glob ':glob';
 use Parallel::ForkManager;
+use Data::Dumper;
 
-use BCD::Common qw(:DEFAULT $isoconf $wd $name $arch $version $based_on $repo $builddir $distrib_path $error_color $DISTRIB $THEME $tmp_rpmsrate $NB_FORK $dir_deps);
+use BCD::Common qw(:DEFAULT $isoconf $wd $name $arch $version $based_on $repo $builddir $distrib_path $error_color $DISTRIB $THEME $tmp_rpmsrate $NB_FORK $dir_deps @list_of_removed);
 
 our @ISA = qw(Exporter);
-our @EXPORT = qw(main_media list_media use_gendistrib list_medias_available check_repo_hdlist rpmcheck_launch solve_doble_issue);
+our @EXPORT = qw(main_media list_media use_gendistrib list_medias_available check_repo_hdlist rpmcheck_launch solve_doble_issue clean_urpmq_log get_srpms_list find_all_kernel, create_mediacfg);
+our @EXPORT_OK = qw($rpmcheck_list_pkg $file_rpmcheck_log);
 
 my $verbose;
 my $LOG="MEDIA -";
@@ -29,8 +31,10 @@ if (defined($isoconf->{mediainfo}{fullpath})) {
 } else {
 	$mediainfo_sourcedir = "$repo/$based_on/$arch/$isoconf->{mediainfo}{mediainfo_dir}";
 }
+
 my $chroot_path = "/tmp/$isoconf->{nameid}-$version-$isoconf->{arch}";
-my $rpmcheck_list_pkg = "/tmp/rpmcheck_list_pkg_to_add_$isoconf->{nameid}-$version-$isoconf->{arch}";
+our $rpmcheck_list_pkg = "/tmp/rpmcheck_list_pkg_to_add_$isoconf->{nameid}-$version-$isoconf->{arch}";
+our $file_rpmcheck_log = "/tmp/rpmcheck_failure_$isoconf->{nameid}-$version-$isoconf->{arch}";
 
 sub create_media {
     print_color("$LOG Create the media dir in $builddir", $color);
@@ -86,6 +90,7 @@ sub use_gendistrib {
 	system("rm -vf $builddir/media/media_info/*.cz");
 	foreach my $media (@{$isoconf->{media}{list}}) {
 	    $media->{name} or next;
+	    $media->{destmedia} or next;
 	    if ($destmedia eq $media->{destmedia}) { next }
 	    $destmedia = $media->{destmedia};
 	    system("rm -vf $builddir/media/$destmedia/media_info/*.cz");
@@ -95,11 +100,12 @@ sub use_gendistrib {
     	print_color("$LOG gendistrib --mediacfg $builddir/$isoconf->{iso}{mediacfg} $builddir", $color);
 	my $cmd = "gendistrib --mediacfg $builddir/$isoconf->{iso}{mediacfg} $builddir";
     	system($cmd) == 0 or die "$LOG system $cmd failed: $?\n";
-	if ($isoconf->{based_on} lt "2009.1") {
+	if ($isoconf->{based_on} lt "2009.1" || $isoconf->{based_on} eq "mes5") {
 		foreach my $media (@{$isoconf->{media}{list}}) {
 		$media->{name} or next;
 		if ($destmedia eq $media->{destmedia}) { next }
 		$destmedia = $media->{destmedia};
+		print_color("$LOG < 2009.1 or mes5 detected", $color);
 		print_color("$LOG move hdlists and synthesys from $builddir/media/$destmedia/media_info to $builddir/media/media_info/", $color);
 		system("rm -vf $builddir/media/media_info/*_$media->{name}.cz");
 		system("rm -vf $builddir/media/media_info/pubkey_$media->{name}");
@@ -119,14 +125,15 @@ sub copy_rpm {
 
 sub create_mediacfg {
     print_color("$LOG $builddir/$isoconf->{iso}{mediacfg}", $color);
-    system("rm -rf $builddir/$isoconf->{mediainfo}{mediainfo_dir}");
+    system("rm -vrf $builddir/$isoconf->{mediainfo}{mediainfo_dir}");
     create_needed_dir("$builddir/$isoconf->{mediainfo}{mediainfo_dir}");
     my $media_cfg = "$builddir/$isoconf->{iso}{mediacfg}";
     open my $MEDIACFG, ">$media_cfg";
     print $MEDIACFG "\n";
     print $MEDIACFG "[media_info]\n";
     print $MEDIACFG "version=$version\n";
-    if ($isoconf->{based_on} gt "2009.1") {
+    if ($isoconf->{based_on} gt "2009.1" && $isoconf->{based_on} ne "mes5") {
+        print_color("$LOG > 2009.1 or not a mes5 product", $color);
     	print $MEDIACFG "mediacfg_version=2\n";
     }
     print $MEDIACFG "branch=$isoconf->{iso}{branch}\n";
@@ -147,7 +154,8 @@ sub create_mediacfg {
 	$media->{name} or next;
 	if ($destmedia eq $media->{destmedia}) { next }
 	$destmedia = $media->{destmedia};
-	if ($isoconf->{based_on} lt "2009.1") {
+	if ($isoconf->{based_on} =~ "mes5" || $isoconf->{based_on} lt "2009.1") {
+        print_color("$LOG < 2009.1 or mes5 detected", $color);
 	print $MEDIACFG "
 
 [$media->{destmedia}]
@@ -228,7 +236,7 @@ sub mini_chroot {
 	my $cmd = "LC_ALL=C sudo urpmi --quiet --no-suggests --auto --no-verify-rpm --use-distrib $repo/$based_on/$arch --urpmi-root $chroot_path";
 	#  sudo urpmi --no-verify-rpm --auto --urpmi-root /tmp/mk --use-distrib /mnt/BIG/dis/2009.0/i586/ basesystem-minimal urpmi --test
 	#
-	system("LC_ALL=C sudo urpmi --test --no-suggests --auto --no-verify-rpm --use-distrib $repo/$based_on/$arch --urpmi-root /tmp/$isoconf->{nameid}-$version-$isoconf->{arch} urpmi basesystem-minimal bash basesystem > $chroot_path/$isoconf->{tocopy_file}_TODO_chroot");
+	system("LC_ALL=C sudo urpmi --test --no-suggests --auto --no-verify-rpm --use-distrib $repo/$based_on/$arch --urpmi-root /tmp/$isoconf->{nameid}-$version-$isoconf->{arch} --media 'Main,Main Updates' --excludemedia 'Main Testing,Main Backports' urpmi basesystem-minimal bash basesystem > $chroot_path/$isoconf->{tocopy_file}_TODO_chroot");
 	# install all those file to be able to use urpmi.XXXXXX
 	system("LC_ALL=C $cmd --prefer $DISTRIB,$THEME urpmi bash");
         system("sudo chroot $chroot_path mkdir -p $distrib_path");
@@ -255,25 +263,39 @@ sub mini_chroot {
 }
 
 sub add_media {
-	my ($name, $path) = @_;
+	my ($name, $path, $update) = @_;
 	print_color("$LOG add media $name from $path", $color);
 	system("sudo chroot $chroot_path mkdir -p /tmp/$name");
 	system("sudo mount -o bind $path $chroot_path/tmp/$name -o ro");
-        system("LC_ALL=C sudo chroot $chroot_path urpmi.addmedia $name /tmp/$name");
+	# check if path contain sub direcroty or not (media/release media/updates etc...)
+	if (-d "$path/release" and -d "$path/updates") {
+		print_color("$LOG This supp media contains release and updates sub-directory", $color);
+		system("LC_ALL=C sudo chroot $chroot_path urpmi.addmedia $name-release /tmp/$name/release");
+		if ($update =~ /yes/) {
+			system("LC_ALL=C sudo chroot $chroot_path urpmi.addmedia --update '$name Updates' /tmp/$name/updates");
+		}
+	} else {
+        	system("LC_ALL=C sudo chroot $chroot_path urpmi.addmedia $name /tmp/$name");
+	}
 	push @to_umount, "/tmp/$name";
 	push @add_media, "$name";
 }
 
+sub drop_media {
+ 	my ($name) = @_;
+ 	print_color("$LOG remove media $name from urpmi config", $color);
+ 	system("LC_ALL=C sudo chroot $chroot_path urpmi.removemedia $name");
+}
+
+
 
 my $listcopy = "$chroot_path/$isoconf->{tocopy_file}";
 sub generate_list_of_rpm_2_copy {
     my @toget;my @toexclude;my $extra;
-#    system("cp -vf /dev/null $tmp_filtre_from_rpmsrate");
     mini_chroot;
-#    system("sudo chroot $chroot_path cp /dev/null /tmp/filter_from_rpmsrate");
     foreach my $media (@{$isoconf->{media}{list}}) {
 	$media->{name} or next;
-	$media->{external}{name} and add_media($media->{external}{name}, $media->{external}{fullpath_mediadir});
+	$media->{external}{name} and add_media($media->{external}{name}, $media->{external}{fullpath_mediadir}, $media->{updates});
 	foreach my $input (@{$media->{input}}) {
 	    $input->{file} or next;
 	    -f $input->{file} or print_color("$LOG i can not find the $input->{file}, remove this list or fix...", $error_color);
@@ -289,8 +311,6 @@ sub generate_list_of_rpm_2_copy {
 	            my ($rates, $need_to_copy) = get_list_from_CAT($tmp_rpmsrate, $section, $poids);
 		    foreach my $data (@{$need_to_copy}) {
 			push @toget, $data;
-#			print "$LOG sudo chroot $chroot_path echo $data >> /tmp/filter_from_rpmsrate ";
-#                        system("sudo chroot $chroot_path echo $data >> /tmp/filter_from_rpmsrate");
 		    }
 		    next;
 		} else {
@@ -322,15 +342,20 @@ sub generate_list_of_rpm_2_copy {
 }
 
 sub rpmcheck_list {
-    print_color("$LOG calculate deps from the auto-generated rpmcheck list file", $error_color);
     my @toget = cat_($rpmcheck_list_pkg);
-    my $list_filename = "$isoconf->{tocopy_file}_todo_rpmcheck";
-    my $list = "$chroot_path/urpmq/$list_filename";
-    my $urpmq_options = "--requires-recursive -c --sources $isoconf->{mediainfo}{urpmi_option}";
-    my $pkgs;
-    foreach (@toget) { $_ or next ; chomp($_); $pkgs = "$_ " . $pkgs; }
-    my $cmd_do_it = "LC_ALL=C sudo -P chroot $chroot_path urpmq --prefer $DISTRIB,$THEME $urpmq_options --no-suggests";
-    do_fork($pkgs, $list_filename, $list, $cmd_do_it);
+    my $todo = @toget;
+    if ($todo ne "0") {
+	print_color("$LOG calculate deps from the auto-generated rpmcheck list file", $error_color);
+	    my $list_filename = "$isoconf->{tocopy_file}_todo_rpmcheck";
+	    my $list = "$chroot_path/urpmq/$list_filename";
+	    my $urpmq_options = "--requires-recursive -c --sources $isoconf->{mediainfo}{urpmi_option}";
+	    my $pkgs;
+	    foreach (@toget) { $_ or next ; chomp($_); $pkgs = "$_ " . $pkgs; }
+	    my $cmd_do_it = "LC_ALL=C sudo -P chroot $chroot_path urpmq --prefer $DISTRIB,$THEME $urpmq_options --no-suggests";
+	    do_fork($pkgs, $list_filename, $list, $cmd_do_it);
+    } else {
+	print_color("$LOG No rpmcheck error", $error_color);
+    }
 }
 
 sub remove_notpresent {
@@ -389,9 +414,9 @@ sub create_list {
     } else { $opt_sug = ""; } 
     # list of wanted RPM per media name
     my $list_filename = "$isoconf->{tocopy_file}_todo_$media->{name}";
-    my $list_filename_update = "$isoconf->{tocopy_file}_todo_$media->{name}_update";
+#    my $list_filename_update = "$isoconf->{tocopy_file}_todo_$media->{name}_update";
     my $list = "$chroot_path/urpmq/$list_filename";
-    my $list_update = "$chroot_path/urpmq/$list_filename_update";
+    my $list_update = "$chroot_path/urpmq/$list_filename" . "_update";
     system("sudo chroot $chroot_path mkdir -m 777 -p urpmq");
     # urpmq error file
     my $urpmq_error = "$chroot_path/$isoconf->{tocopy_file}_urpmi_error_$media->{name}";
@@ -401,7 +426,10 @@ sub create_list {
     my $tested_exclude;
     my $tested_wanted;
     foreach (@{$wanted}) { $tested_wanted = $tested_wanted . " $_" }
-    foreach (@{$exclude}) { $tested_exclude = $tested_exclude . " --skip $_"  };
+    foreach (@{$exclude}) { 
+	    $_ or next;
+	    $tested_exclude = $tested_exclude . " --skip $_"  
+    };
     print_color("$LOG remove unwanted mandriva-release, use $DISTRIB", $color);
     # urpmq options (with option in the xml file)
     my $urpmq_options = "--requires-recursive -c --sources $isoconf->{mediainfo}{urpmi_option}";
@@ -417,7 +445,7 @@ sub create_list {
 	    # urpmq error found, so we have to remove some entry in the list of wanted packages
 	    my $final_list_update = remove_notpresent($urpmq_error_update, $wanted);
 	    my $cmd_do_it_update = "LC_ALL=C sudo -P chroot $chroot_path urpmq --update -a --prefer $DISTRIB,$THEME $urpmq_options $urpmq_extra_opt $tested_exclude";
-	    do_fork($final_list_update, $list_filename_update, $list_update, $cmd_do_it_update);
+	    do_fork($final_list_update, "$list_filename" . "_update", $list_update, $cmd_do_it_update);
     }
 
     ###
@@ -446,12 +474,35 @@ sub do_fork {
 	$status++;
 	my $pid = $pm->start and next; 
 	back_and_print($status, $count);
-	# check an urpmq has been done before
-	if (-f "$dir_deps/$list_filename-$pkg") {
-	        my $pkg_found = `grep -P '\/$pkg-' /$dir_deps/$list_filename-$pkg`;
-		$pkg_found = basename($pkg_found);
-		$verbose and print_color("$LOG found the urpmq transaction for $pkg_found, i will use it $dir_deps/$list_filename-$pkg", $color);
-		system("cp -f $dir_deps/$list_filename-$pkg $list-$pkg");
+	# check an urpmq has been done before in an other media
+	foreach my $media (@{$isoconf->{media}{list}}) {
+		$media->{name} or next;
+		# $dir_deps/$isoconf->{tocopy_file}_todo_$media->{name}_update-$pkg"
+		my $previous_urqpm_querie;
+		if (-f "$dir_deps/$isoconf->{tocopy_file}_todo_$media->{name}_update-$pkg") {
+			$previous_urqpm_querie = "$dir_deps/$isoconf->{tocopy_file}_todo_$media->{name}_update-$pkg";
+		} elsif (-f "$dir_deps/$isoconf->{tocopy_file}_todo_$media->{name}-$pkg") {
+			$previous_urqpm_querie = "$dir_deps/$isoconf->{tocopy_file}_todo_$media->{name}-$pkg";
+		} else {
+			$previous_urqpm_querie = "EMPTY";
+			next;
+		}
+		if ($previous_urqpm_querie =~ /EMPTY/) {
+                        $verbose and  print_color("$LOG can't found the urpmq transaction for $pkg", $color);
+		} else {
+			$verbose and  print_color("$LOG found the urpmq transaction for $pkg, i will use $previous_urqpm_querie", $color);
+			system("touch $dir_deps/bypass-$pkg");
+			system("cp -f $previous_urqpm_querie $list-$pkg");
+			#system("cp -f $dir_deps/$isoconf->{tocopy_file}_todo_$media->{name}-$pkg $dir_deps/$list_filename-$pkg");
+		}
+		last;
+	}
+	# check an urpmq has been done before in this media
+	if (-f "$dir_deps/bypass-$pkg") {
+		#my $pkg_found = `grep -P '\/$pkg-' $dir_deps/$list_filename-$pkg`;
+		#$pkg_found = basename($pkg_found);
+		$verbose and print_color("$LOG found the urpmq transaction for $pkg, i will the previous one found in  $dir_deps directory", $color);
+		#system("cp -f $dir_deps/$list_filename-$pkg $list-$pkg");
 	} else {
 	    # match the case using --update option
 		my $cmd_do_it = "$cmd $pkg > $list-$pkg";
@@ -460,11 +511,11 @@ sub do_fork {
 			foreach (@result) {
 			    # exact match with --update option
 				$_ or next;
-				if ($_ =~ /^pkg/) {
+				if ($_ =~ /^$pkg/) {
 		    			system($cmd_do_it);
 					system("cp -f $list-$pkg $dir_deps/$list_filename-$pkg");
 					last;
-				} else { print "\n-DEBUG $pkg is not in update, it's a package that contains the string $pkg!\n"; last }
+				} else { $verbose and print "$LOG $pkg is not in update, it's a package that contains the string $pkg!\n"; last }
 			}
 		} else {
 	    		system($cmd_do_it);
@@ -487,6 +538,20 @@ sub back_and_print {
 
 
 sub concatenate_files {
+    # remove urpmq queries from excluded packages
+    print_color("$LOG remove urpmq queries from removed packages", $color);
+    foreach my $media (@{$isoconf->{media}{list}}) {
+    $media->{name} or next;
+    	foreach my $exclude (@{$media->{exclude}}) {
+           $exclude->{file} or next;
+           -f $exclude->{file} or print_color("$LOG i can not find the $exclude->{file}, remove this list or fix...", $error_color);
+           foreach my $totest (cat_($exclude->{file})) {
+		chomp($totest);
+		if (! $totest) { next };
+		system("rm -vf $chroot_path/urpmq/$isoconf->{tocopy_file}_todo_*$totest");
+		}
+	}
+    }
     print_color("$LOG create the final list: $listcopy", $color);
     system("cat $chroot_path/urpmq/$isoconf->{tocopy_file}_todo_* > $listcopy.tmp");
     system("sed -e 's|^\\w*\\s/|/|' $listcopy.tmp > $listcopy");
@@ -553,17 +618,26 @@ sub find_source_dest_media {
 	next;
     } else {
 	#external repository
-	#/tmp/u_xos
+	#/tmp/u_xos or /tmp/u_xos/release and /tmp/u_xos/updates
     	my ($source_media) = $todeal =~ /\/tmp\/(.*)/;
 	# find the dest media from source media
 	foreach my $media (@{$isoconf->{media}{list}}) {
 		# find a media or next one
-		$media->{name} or next;
-		if ($media->{name} eq $source_media) {
-		    #print "DEBUG todeal: $todeal DEBUG media->name: $media->{name} source_media: $source_media\n";
+		$media->{external}{name} or next;
+#		print Dumper($media);
+#		print "DEBUG todeal: $todeal DEBUG media->name: $media->{name} source_media: $source_media\n";
+#		print "$todeal from $source_media | external-fullpath_mediadir: $media->{external}{fullpath_mediadir}/ media/$media->{destmedia}\n";
+#		print "external-name $media->{external}{name}\n";
+		if ($source_media eq $media->{name}) {
 			# we have found the media so destmedia is $media->{destmedia}
 			# return the destmedia
 			return($media->{external}{fullpath_mediadir}, "media/$media->{destmedia}");
+		} elsif ($source_media eq "$media->{name}/release") {
+			return("$media->{external}{fullpath_mediadir}/release", "media/$media->{destmedia}");
+		} elsif ($source_media eq "$media->{name}/updates") {
+			return("$media->{external}{fullpath_mediadir}/updates", "media/$media->{destmedia}");
+		} else {
+			print "dont know what to do ....\n";
 		}
 		next;
     	}
@@ -579,7 +653,7 @@ sub parse_copy_link {
 	$action = "cp -fa";
     }
     my $total = count_nb_to_copy($listcopy);
-    print_color("$LOG $wichaction all wanted packages to $builddir/XXXX", $color);
+    print_color("$LOG $wichaction all wanted packages to $builddir/XXXX ($total packages)", $color);
     # chroot packages                                                                                                                                                                
     if (!-f "$chroot_path/$isoconf->{tocopy_file}_TODO_chroot") { exit 1 }
     foreach my $line (cat_("$chroot_path/$isoconf->{tocopy_file}_TODO_chroot")) {
@@ -689,6 +763,10 @@ sub remove_all_excluded {
     print_color("$LOG WARNING remove needed packages can break dependencies, check rpmcheck messages", $error_color);
     foreach my $media (@{$isoconf->{media}{list}}) {
         $media->{name} or next;
+        if ($media->{remove_noarch} =~ /yes/) {
+                print_color("$LOG remove noarch from media $media->{name} $builddir/media/$media->{destmedia}/", $color);
+                system("rm -rf $builddir/media/$media->{destmedia}/*.noarch.rpm");
+        }
         foreach my $exclude (@{$media->{exclude}}) {
             $exclude->{file} or next;
             -f $exclude->{file} or print_color("$LOG i can not find the $exclude->{file}, remove this list or fix...", $error_color);
@@ -718,19 +796,19 @@ sub remove_all_excluded {
 sub copy_filedeps {
     print_color("$LOG copy $mediainfo_sourcedir/$isoconf->{mediainfo}{filedeps} in $builddir/$isoconf->{mediainfo}{mediainfo_dir}", $color);
     -f "$mediainfo_sourcedir/$isoconf->{mediainfo}{filedeps}" or print "$LOG missing filedeps\n";
-    system("cp -vf $mediainfo_sourcedir/$isoconf->{mediainfo}{filedeps} $builddir/$isoconf->{mediainfo}{mediainfo_dir}/file-deps");
+    system("cp -vf $mediainfo_sourcedir/$isoconf->{mediainfo}{filedeps} $builddir/$isoconf->{mediainfo}{mediainfo_dir}/file-deps") == 0 or die "$LOG copy of $mediainfo_sourcedir/$isoconf->{mediainfo}{filedeps} failed: $?\n";
 }
 
 sub copy_rpmsrate {
     print_color("$LOG copy $mediainfo_sourcedir/$isoconf->{mediainfo}{rpmsrate} in $builddir/$isoconf->{mediainfo}{mediainfo_dir}", $color);
     -f "$mediainfo_sourcedir/$isoconf->{mediainfo}{rpmsrate}" or print "$LOG missing rpmsrate\n";
-    system("cp -vf $mediainfo_sourcedir/$isoconf->{mediainfo}{rpmsrate} $builddir/$isoconf->{mediainfo}{mediainfo_dir}/rpmsrate");
+    system("cp -vf $mediainfo_sourcedir/$isoconf->{mediainfo}{rpmsrate} $builddir/$isoconf->{mediainfo}{mediainfo_dir}/rpmsrate") == 0 or die "$LOG copy of $mediainfo_sourcedir/$isoconf->{mediainfo}{rpmsrate} failed: $?\n";
 }
 
 sub copy_compssusers {
     print_color("$LOG copy $mediainfo_sourcedir/$isoconf->{mediainfo}{compssusers} in $builddir/$isoconf->{mediainfo}{mediainfo_dir}", $color);
     -f "$mediainfo_sourcedir/$isoconf->{mediainfo}{compssusers}" or print "$LOG missing compssusers\n";
-    system("cp -vf $mediainfo_sourcedir/$isoconf->{mediainfo}{compssusers} $builddir/$isoconf->{mediainfo}{mediainfo_dir}/compssUsers.pl");
+    system("cp -vf $mediainfo_sourcedir/$isoconf->{mediainfo}{compssusers} $builddir/$isoconf->{mediainfo}{mediainfo_dir}/compssUsers.pl") == 0 or die "$LOG copy of $mediainfo_sourcedir/$isoconf->{mediainfo}{compssusers} failed: $?\n";;
 }
 
 sub use_genhdlist2 {
@@ -754,15 +832,15 @@ sub rpmcheck_launch {
     print_color("$LOG launch rpmcheck to check hdlists", $color);
 	foreach my $media (@{$isoconf->{media}{list}}) {
 		$media->{name} or next;
+ 		$media->{drop} =~ /yes/ and drop_media("$media->{name}-release");
 		if ($destmedia eq $media->{destmedia}) { next }
 		$destmedia = $media->{destmedia};
 		system("cp $builddir/media/$destmedia/media_info/hdlist.cz $builddir/media/media_info/hdlist_$media->{name}.cz");
 	}
     my $cmd = "zcat $builddir/media/media_info/hdlist*.cz | rpmcheck $options";
     print_color("$LOG $cmd", $color);
-    my $file_rpmcheck_log = "/tmp/rpmcheck_failure_$isoconf->{nameid}-$version-$isoconf->{arch}";
     system("$cmd 2> /dev/null > $file_rpmcheck_log") == 0 or die "$LOG system $cmd failed: $?\n";
-    open my $LIST_FAILURE, ">$rpmcheck_list_pkg";
+    open my $LIST_FAILURE, ">$rpmcheck_list_pkg.tmp";
     my @list_failure = cat_($file_rpmcheck_log);
     foreach my $package (@list_failure) {
 	    print "$package";
@@ -770,13 +848,14 @@ sub rpmcheck_launch {
           $package2 and print $LIST_FAILURE "$package2\n";
     }
     close $LIST_FAILURE;
+    system("cat $rpmcheck_list_pkg.tmp | sort | uniq > $rpmcheck_list_pkg");
     print_color("$LOG check this file $file_rpmcheck_log", $color);
     print_color("$LOG check this file $rpmcheck_list_pkg", $color);
 }
 
 sub remove_hdlist {
 	my $destmedia;
-	if ($isoconf->{based_on} gt "2009.1") {
+	if ($isoconf->{based_on} gt "2009.1" or $isoconf->{based_on} != "mes5") {
 		print_color("$LOG remove hdlists*.cz from $builddir/media/media_info", $color);
 		system("rm -vf $builddir/media/media_info/hdlist*.cz");
 		foreach my $media (@{$isoconf->{media}{list}}) {
@@ -829,20 +908,124 @@ sub umount_all_mountloop {
     }
 }
 
+sub get_srpms_list {
+	my $pm = new Parallel::ForkManager(20);
+	my $pkg_name; my @srpms; my @checked; my $already_done;
+	my $tmp_bs = "/tmp/list_BS-$isoconf->{nameid}-$version-$isoconf->{arch}";
+	system("mkdir $tmp_bs");
+	system("rm -f $tmp_bs/*");
+	foreach my $media (@{$isoconf->{media}{list}}) {
+		$media->{name} or next;
+		$media->{destmedia} or next;
+		foreach (@checked) { $_ or next ; $media->{destmedia} =~ /^$_$/ and $already_done = 1; };
+		$already_done and next;
+		push @checked, $media->{destmedia};
+		my @list_pkg = glob("$builddir/media/$media->{destmedia}/*.rpm");
+		my $list_srpm = "$tmp_bs/list_SRPM-$isoconf->{nameid}-$version-$isoconf->{arch}-$media->{name}-$media->{destmedia}";
+		my $list_buildreq = "$tmp_bs/list_BUILDREQ-$isoconf->{nameid}-$version-$isoconf->{arch}-$media->{name}-$media->{destmedia}";
+		my $total = @list_pkg;
+		my $status = "0";
+		print_color("$LOG i have to find $total SRPMS name in the media media/$media->{destmedia} ... be patient !!!!", $color);
+		foreach my $pkg (@list_pkg) {
+			$status++;
+			my $pid = $pm->start and next;
+                        $pkg_name = `rpm -qp --queryformat %{SOURCERPM} $pkg`;
+			# tostore somewhere
+			# $media->{name} $pkg_name
+			system("sudo chroot $chroot_path echo '$pkg_name' > $list_srpm-$pkg_name");
+	                back_and_print($status, $total);
+			$pm->finish;
+			$pm->wait_all_children;
+		}
+    		system("cat $tmp_bs/list_SRPM-* | sort | uniq > $list_srpm");
+		my @list_srpm = cat_($list_srpm);
+		$total = @list_srpm;
+		$status = "0";
+	    	print_color("$LOG get the buildrequires from SRPMS", $color);
+		foreach my $srpm (@list_srpm) {
+		        $srpm or next;
+			$status++;
+			chomp($srpm);
+			my $pid = $pm->start and next;
+			my $pkg = `basename $srpm .src.rpm`;
+			my $SRPMS_PATH;
+			# find the package in an official sub dir
+			my @struct = qw(release updates backport testing);
+	                back_and_print($status, $total);
+			my @data; my $q;
+			foreach (@struct) {
+				#print "$repo/$based_on/SRPMS/$media->{mediadir}/$_/$srpm";
+				if (-f "$repo/$based_on/SRPMS/$media->{mediadir}/$_/$srpm") {
+					$SRPMS_PATH="$repo/$based_on/SRPMS/$media->{mediadir}/$_/";
+					my $media="--sortmedia \"Main Updates,Main,Contrib Updates,Contrib\"";
+					system("LC_ALL=C urpmq --use-distrib $repo/$based_on/$arch $media --sources --requires-recursive --prefer $DISTRIB,$THEME,kernel-source-dekstop --no-suggests $SRPMS_PATH/$srpm >  $list_buildreq-$srpm");
+					last;
+				} else { 
+					#print "$repo/$based_on/SRPMS/$media->{mediadir}/$_/$srpm doesnt exist \n";
+					next;
+				}
+			}
+			$pm->finish;
+			$pm->wait_all_children;
+	    	}
+    		system("cat $tmp_bs/list_BUILDREQ-* | sort | uniq > $list_buildreq");
+    		system("cp $list_buildreq $chroot_path/list_ALL_BUILDREQ");
+		system("cp $list_srpm $chroot_path/list_ALL_SRPM");
+#		system("rm -f $tmp_bs/list_BUILDREQ-* $tmp_bs/list_SRPM-*");
+	}
+}
+
+
+sub extra_filter {
+        my ($filter) = @_;
+        print_color("$LOG compare versions of $filter and keep the latest one", $color);
+        my @l; my $keeped;
+        foreach my $media (@{$isoconf->{media}{list}}) {
+		$media->{name} or next;
+		$media->{destmedia} or next;
+                @l = glob("$builddir/media/$media->{destmedia}/$filter-*.rpm");
+                my $l = @l; $l eq "0" and last;
+                foreach (@l) {
+                        my $pkg = basename($_);
+                        # check it will be a number after the filter name
+                        $pkg =~ /$filter\-\d.*/ or next;
+                        $keeped or $keeped = $pkg;
+                        $pkg ne $keeped and print "$LOG COMPARE $pkg and $keeped:\n" or next;
+                        my $r = rpmVersionCompare($pkg, $keeped);
+                        if ($r eq "-1") {
+                                $keeped = $keeped;
+                                print "i will keep $keeped\n";
+                                system("rm -vf $builddir/media/$media->{destmedia}/$pkg");
+				next;
+                        } elsif ($r eq "1") {
+                                system("rm -vf $builddir/media/$media->{destmedia}/$keeped");
+                                $keeped = $pkg;
+                                print "i will keep $keeped\n";
+				next;
+                        };
+                }
+        }
+}
+
 sub solve_doble_issue {
 	my $pkg_name; my $pkg_version;
 	my @list_to_filter; my @todeal;
         my %already_seen; my @final_list;
 	my $keeped;
-	my $pm = new Parallel::ForkManager(50);
+	# 20 should not cause any trouble... NB_FORK is too small...
+	my $pm = new Parallel::ForkManager(20);
+	my @checked; my $already_done;
 	foreach my $media (@{$isoconf->{media}{list}}) {
 		$media->{name} or next;
 		$media->{destmedia} or next;
+		foreach (@checked) { $_ or next; $_ =~ /^\#/ and next ; $media->{destmedia} =~ /^$_$/ and $already_done = 1; };
+		$already_done and next;
+		push @checked, $media->{destmedia};
 		# get all rpm from the media dir
 		my @list_pkg = glob("$builddir/media/$media->{destmedia}/*.rpm");
 		my $total = @list_pkg; 
 		my $status = "0";
-    		print_color("$LOG i have to check $total doble ... be patient !!!!", $color);
+    		print_color("$LOG i have to check $total doble in the media media/$media->{destmedia} ... be patient !!!!", $color);
 		# parse all files in the media
 		foreach my $pkg (@list_pkg) {
 			$status++;
@@ -853,24 +1036,30 @@ sub solve_doble_issue {
 			my $l = @l; $l eq "0" and last;
 			foreach (@l) { 
 		    	#print_color("$LOG compare versions of $filter and keep the latest one", $color);
-				$_ or next;
+				$_ or next; my $found = 0;
 				my $pkg = basename($_);
+				foreach (cat_($isoconf->{mediainfo}{filter})) {
+				    if ($_ =~ /^$pkg_name/) { $found = 1; } #print "- skipping $_\n (from $isoconf->{mediainfo}{filter} file)" and $found = 1; }
+				}
+				#if ($_ =~ /kernel/) { print "- $pkg_name is a package relative to a kernel ! will be treated later\n";  }
+				$found eq "1" and next;
 				$pkg =~ /^$pkg_name\-\d.*/ or next;
 				# bypass special case like libwnck-1_22
-				$pkg =~ /^$pkg_name\-\d\_.*/ and next;
-				foreach (cat_($isoconf->{mediainfo}{filter})) { $pkg =~ /^$_/ and next }
+				$pkg =~ /^$pkg_name\-\d\_.*/ and print "- $pkg comparaison skipped... (bcd regexp)\n" and next;
 				# check it will be a number after the filter name
 				$keeped or $keeped = $pkg;
 				#print "$LOG COMPARE $pkg and $keeped: \n";
 				my $r = rpmVersionCompare($pkg, $keeped);
 				if ($r eq "-1") {
 					$keeped = $keeped;
-					$verbose and print "i will keep $keeped\n";
-					system("rm -vf $builddir/media/$media->{destmedia}/$pkg");
+					$verbose and print "i will keep $keeped and erase $builddir/media/$media->{destmedia}/$pkg\n";
+					system("rm -f $builddir/media/$media->{destmedia}/$pkg");
+					push @list_of_removed, "$builddir/media/$media->{destmedia}/$pkg";
 				} elsif ($r eq "1") {
-	                                system("rm -vf $builddir/media/$media->{destmedia}/$keeped");
+	                                system("rm -f $builddir/media/$media->{destmedia}/$keeped");
 					$keeped = $pkg;
-					$verbose and print "i will keep $keeped\n";
+					$verbose and print "i will keep $pkg and remove $builddir/media/$media->{destmedia}/$keeped\n";
+					push @list_of_removed, "$builddir/media/$media->{destmedia}/$keeped";
 				};
 			}
 	                back_and_print($status, $total);
@@ -881,6 +1070,23 @@ sub solve_doble_issue {
 	}
 }
 
+sub find_all_kernel {
+        print_color("$LOG kernel comparaison", $color);
+        foreach my $media (@{$isoconf->{media}{list}}) {
+		$media->{name} or next;
+		$media->{destmedia} or next;
+                my @l = glob("$builddir/media/$media->{destmedia}/kernel-*.rpm");
+                my $l = @l; $l eq "0" and last;
+	        foreach my $k (@l) {
+	                my ($kname, $kversion) = $k =~ m/kernel-([\w]+(?:\-[\w]+){0,3})-([0-9]+(?:\.[0-9]+){2,3})/;
+			$kname or next;
+			#print_color("$LOG i will compare all versions of kernel-$kname and keep the latest one", $color);
+			extra_filter("kernel-$kname");
+			next;
+	        }
+	}
+}
+
 sub process_list_link {
     my ($option) = @_;
     concatenate_files;
@@ -892,27 +1098,35 @@ sub process_list_link {
     }
     # remove packages listed in exclude list
     remove_all_excluded;
-    solve_doble_issue;
+    if ($option =~ /nodoble/) { print_color("$LOG skipping doble\n", $color); } else { solve_doble_issue; }
+    find_all_kernel;
+    copy_filedeps;
+    copy_rpmsrate;
+    copy_compssusers;
     use_gendistrib;
 ##    use_genhdlist2;
 }
 
-sub main_media {
+sub clean_urpmq_log {
     my ($option) = @_;
-    if ($option =~ /verbose/) {
-	$verbose = "1";
+    if ($option =~ /clean/) {
+	print_color("$LOG i will remove all previous urpmq log", $color);
+	system("rm -rf $dir_deps");
     }
+}
+
+sub main_media {
+    my ($option) = @_;
+    if ($option =~ /verbose/) { $verbose = "1"; }
     list_media;
     create_media;
-    copy_all_pubkey;
-
     create_mediacfg;
-
-    copy_filedeps;
-    copy_rpmsrate;
-    copy_compssusers;
+    copy_all_pubkey;
 
     create_needed_dir($chroot_path);
+    print_color("$LOG erase previous bypasss file", $color);
+    system("rm -f $dir_deps/bypass-*");
+    copy_rpmsrate;
     generate_list_of_rpm_2_copy;
     process_list_link($option);
     # target_size;
@@ -920,11 +1134,16 @@ sub main_media {
     rpmcheck_launch;
     rpmcheck_list;
     process_list_link($option);
-    # second laucn of rpmcheck (should have fix a lot of missing deps)
+    # second launch of rpmcheck (should have fix a lot of missing deps)
     rpmcheck_launch;
     umount_all_mountloop;
-    remove_hdlist;
+    #remove_hdlist;
     show_size;
+    my $l = @list_of_removed;
+    if ($l ne "0") {
+	print_color("$LOG List of package removed, if you dont want to remove them, just add them in the file $isoconf->{mediainfo}{filter}:", $color);
+	foreach (@list_of_removed) { print "$_\n"; }
+    }
 }
 
 1;
diff --git a/lists/basesystem_common b/lists/basesystem_common
index 0ab068a..374c12c 100644
--- a/lists/basesystem_common
+++ b/lists/basesystem_common
@@ -1,4 +1,5 @@
 # MANDATORY PACKAGES !!
+INSTALL 1
 bootloader-utils
 kbd
 grub
@@ -389,8 +390,9 @@ lockdev-baudboy
 minicom
 mc
 ncftp
-ftp-client-krb5
-ftp-server-krb5
+#ftp-client-krb5
+#ftp-server-krb5
+#libkrb53
 apache-mod_ldap
 freeradius-client
 libradius0
@@ -439,3 +441,20 @@ lib64xp-devel
 scim
 scim-bridge
 nabi
+
+xmessage
+#kdelibs4-devel
+ldapjdk
+bdftopcf
+squirrelmail
+python-lxml
+libxbase2
+drakx-installer-matchbox
+#liblirc0
+#libblt2
+heimdal-libs
+heimdal-login
+shadow-utils
+gecko-sharp
+#libXsettings
+pidgin
diff --git a/lists/basesystem_mini b/lists/basesystem_mini
index a61135b..4ba6d91 100644
--- a/lists/basesystem_mini
+++ b/lists/basesystem_mini
@@ -1,152 +1,147 @@
+# MANDATORY PACKAGES !!
+kbd
+grub
 acpi
 acpid
-alsa-utils
-apmd
-aria2
-at
-aumix
+hwreport
 basesystem
-bind-utils
-cpio
-cpufreq
-cpufreqd
-dhcp-common
+mandi
+mandi-ifw
 dhcp-client
-dkms-minimal
-dmidecode
-dmraid
-dosfstools
-drakconf-icons
-drakx-kbd-mouse-x11
-drakx-net
-drakx-net-text
-drakxtools
-drakxtools-curses
-e2fsprogs
-eject
-file
-firefox
-firefox-de
-firefox-en_GB
-firefox-es_ES
-firefox-eu
-firefox-fr
-firefox-pt_BR
-fonts-ttf-dejavu
-gdm
-gedit
-gnupg
-grub
-ia_ora-gnome
-icewm
+syslog-daemon
 initscripts
-iptables
-iputils
-jfsutils
-kbd
-ldetect
-lftp
-linuxwacom
+util-linux-ng
+mount
 losetup
-lsof
-lynx
-man
-mandi
-mandi-ifw
+udev
+iputils
+gnupg
+wireless-tools
+#ndiswrapper
+msec
+wpa_supplicant
+
+mandriva-theme-Free
 mandriva-gfxboot-theme
-mandriva-theme-Corporate
-mdadm
-mkinitrd
-mmc-wizard
+mandriva-release-common
+mandriva-lxde-config-Free
+mandriva-release-Free
+polkit-gnome
+INSTALL 1
+
+
+##################
+#
+
+dvd+rw-tools
+cdrkit
+rsync
+grub
+acpi
+acpid
+hwreport
+aumix
+mandi-ifw
+dhcp-client
+openssh-server
+openssh-clients
+traceroute
+wget
+lynx
+lsof
+tcpdump
+gnupg
+file
+xterm
 monitor-edid
-mount
-msec
-ndiswrapper
-nfs-utils
-nfs-utils-clients
+vim-enhanced
+vim-common
+urpmi
+aria2
+#locales-(en|fr|es|pt_BR|pl|de|ru|bg|ja|hu|mk)
+#samba-client
+iputils
+lftp
+cpio
 ngrep
-ntfs-3g
-ntp
-numlock
-openssh
-openssh-clients
-openssh-server
+cpufreqd
+cpufreq
+apmd
 pcmciautils
-perl-Net-DNS
-postfix
+dmraid
+laptop-mode-tools
+numlock
+vlan-utils
+reiserfsprogs
+xfsprogs
+alsa-utils
+task-x11
+task-lxde
+lxtask
+lxpanel
+xarchiver
+#icewm
+pptp-linux
 ppp
-ppp-pppoatm
+nfs-utils-clients
+nfs-utils
 ppp-pppoe
-pptp-linux
-putils
-reiserfsprogs
-rpmdrake
 rp-pppoe
-rsync
-setserial
-sharutils
+ppp-pppoatm
+ntp
 shorewall
-shorewall-common
-sudo
+bind-utils
+mkinitrd
+iptables
+perl-Net-DNS
+zcip
 synaptics
-syslog-daemon
-syslog-ng
-php-gd
-rpcbind
-tcpdump
-traceroute
-udev
-urpmi
-util-linux-ng
-vim-enhanced
-vim-common
-vlan-utils
-wget
-wireless-tools
-wpa_supplicant
+linuxwacom
+setserial
 x11-driver-input
-x11-driver-input-vboxmouse
 x11-driver-video
-x11-driver-video-vboxvideo
 x11-server-xvfb
-xarchiver
-xfsprogs
-xterm
-zcip
-task-x11
+drakxtools
+drakx-kbd-mouse-x11
+drakx-net
+drakx-net-text
+drakconf
+drakxtools-curses
+brltty
+jfsutils
+dosfstools
+e2fsprogs
+dmidecode
+at
+eject
+ldetect
+udev
+sharutils
+sudo
+gdm
+x11-driver-input-vboxmouse
+x11-driver-video-vboxvideo
+x11-driver-video-sisimedia
+virtualbox-guest-additions
+#glibc-devel
+#ncurses-devel
+fonts-ttf-dejavu
+ia_ora-gnome
+metacity
+gnome-settings-daemon
+rpmdrake
+lvm2
+drakfirsttime
+firefox
+ntfs-3g
+dkms-minimal
+#dkms
+xchat
+#gedit
+mdadm
+man
+xguest
+glxinfo
+msec-gui
 mdkonline
-
-# added to complete
-rdate
-httping
-dnstracer
-arping
-bridge-utils
-ipcalc
-iftop
-atftp
-tcptraceroute
-whois
-hdparm
-lrzsz
-wput
-vpnc
-fuse
-macchanger
-netcat
-strace
-xfsdump
-screen
-minicom
-openvpn
-links
-parted
-joe
-iptraf
-openswan
-mount-cifs
-nmap
-lilo
-#samba-client
-#emacs
-fping
+task-pulseaudio
diff --git a/lists/corpo b/lists/corpo
index dfe2cc5..a41ac60 100644
--- a/lists/corpo
+++ b/lists/corpo
@@ -58,3 +58,5 @@ ocsinventory-agent
 perl-Ocsinventory
 perl-Proc-PID-File
 task-nagios
+task-c++-devel
+task-c-devel
diff --git a/lists/exclude_main_corpo b/lists/exclude_main_corpo
index 3c4b82e..0e1a1ee 100644
--- a/lists/exclude_main_corpo
+++ b/lists/exclude_main_corpo
@@ -3,7 +3,212 @@ megacli
 flash-kde4-config
 #free-kde-config
 #mandriva-kde4-config-common
-superkaramba
-firefox-devel
 
+firefox-ka
+firefox-ku
+firefox-mn
+firefox-oc
+firefox-sr
+heimdal-login
+openoffice.org-help-fi
+openoffice.org-l10n-fi
+openoffice.org-voikko
+telnet-client-krb5
+telnet-server-krb5
 
+akonadi-devel
+kdebase4-workspace-devel
+libkocorehelper4
+pidgin-mono
+python-vtk-devel
+squirrelmail-en
+squirrelmail-bn
+tcl-vtk-devel
+x11-font-util
+liblirc-devel
+ftp-client-krb5
+ftp-server-krb5
+libxulrunner-unstable-devel
+
+drm-experimental-kernel-2.6.27.37-desktop-1mnb
+drm-experimental-kernel-2.6.27.37-desktop586-1mnb
+drm-experimental-kernel-2.6.27.37-server-1mnb
+drm-experimental-kernel-2.6.27.39-desktop-1mnb
+drm-experimental-kernel-2.6.27.39-desktop586-1mnb
+drm-experimental-kernel-2.6.27.39-server-1mnb
+drm-experimental-kernel-2.6.27.45-desktop-1mnb
+drm-experimental-kernel-2.6.27.45-desktop586-1mnb
+drm-experimental-kernel-2.6.27.45-server-1mnb
+fglrx-kernel-2.6.27.24-desktop-1mnb
+fglrx-kernel-2.6.27.24-desktop586-1mnb
+fglrx-kernel-2.6.27.24-server-1mnb
+fglrx-kernel-2.6.27.37-desktop-1mnb
+fglrx-kernel-2.6.27.37-desktop586-1mnb
+fglrx-kernel-2.6.27.37-server-1mnb
+fglrx-kernel-2.6.27.39-desktop-1mnb
+fglrx-kernel-2.6.27.39-desktop586-1mnb
+fglrx-kernel-2.6.27.39-server-1mnb
+fglrx-kernel-2.6.27.45-desktop-1mnb
+fglrx-kernel-2.6.27.45-desktop586-1mnb
+fglrx-kernel-2.6.27.45-server-1mnb
+iscsitarget-kernel-2.6.27.24-desktop-1mnb
+iscsitarget-kernel-2.6.27.24-desktop586-1mnb
+iscsitarget-kernel-2.6.27.24-server-1mnb
+iscsitarget-kernel-2.6.27.37-desktop-1mnb
+iscsitarget-kernel-2.6.27.37-desktop586-1mnb
+iscsitarget-kernel-2.6.27.37-server-1mnb
+iscsitarget-kernel-2.6.27.39-desktop-1mnb
+iscsitarget-kernel-2.6.27.39-desktop586-1mnb
+iscsitarget-kernel-2.6.27.39-server-1mnb
+iscsitarget-kernel-2.6.27.45-desktop-1mnb
+iscsitarget-kernel-2.6.27.45-desktop586-1mnb
+iscsitarget-kernel-2.6.27.45-server-1mnb
+kernel-2.6.27.24-1mnb
+kernel-2.6.27.24-2mnb
+kernel-2.6.27.37-1mnb
+kernel-2.6.27.39-1mnb
+kernel-2.6.27.45-1mnb
+kqemu-kernel-2.6.27.24-desktop-1mnb
+kqemu-kernel-2.6.27.24-desktop586-1mnb
+kqemu-kernel-2.6.27.24-server-1mnb
+kqemu-kernel-2.6.27.37-desktop-1mnb
+kqemu-kernel-2.6.27.37-desktop586-1mnb
+kqemu-kernel-2.6.27.37-server-1mnb
+kqemu-kernel-2.6.27.39-desktop-1mnb
+kqemu-kernel-2.6.27.39-desktop586-1mnb
+kqemu-kernel-2.6.27.39-server-1mnb
+kqemu-kernel-2.6.27.45-desktop-1mnb
+kqemu-kernel-2.6.27.45-desktop586-1mnb
+kqemu-kernel-2.6.27.45-server-1mnb
+libafs-kernel-2.6.27.37-desktop-1mnb
+libafs-kernel-2.6.27.37-desktop586-1mnb
+libafs-kernel-2.6.27.37-server-1mnb
+libafs-kernel-2.6.27.39-desktop-1mnb
+libafs-kernel-2.6.27.39-desktop586-1mnb
+libafs-kernel-2.6.27.39-server-1mnb
+libafs-kernel-2.6.27.45-desktop-1mnb
+libafs-kernel-2.6.27.45-desktop586-1mnb
+libafs-kernel-2.6.27.45-server-1mnb
+lzma-kernel-2.6.27.24-desktop-1mnb
+lzma-kernel-2.6.27.24-desktop586-1mnb
+lzma-kernel-2.6.27.24-server-1mnb
+lzma-kernel-desktop-latest
+lzma-kernel-desktop586-latest
+lzma-kernel-server-latest
+madwifi-kernel-2.6.27.37-desktop-1mnb
+madwifi-kernel-2.6.27.37-desktop586-1mnb
+madwifi-kernel-2.6.27.37-server-1mnb
+madwifi-kernel-2.6.27.39-desktop-1mnb
+madwifi-kernel-2.6.27.39-desktop586-1mnb
+madwifi-kernel-2.6.27.39-server-1mnb
+madwifi-kernel-2.6.27.45-desktop-1mnb
+madwifi-kernel-2.6.27.45-desktop586-1mnb
+madwifi-kernel-2.6.27.45-server-1mnb
+nvidia-current-kernel-2.6.27.24-desktop-1mnb
+nvidia-current-kernel-2.6.27.24-desktop586-1mnb
+nvidia-current-kernel-2.6.27.24-server-1mnb
+nvidia-current-kernel-2.6.27.37-desktop-1mnb
+nvidia-current-kernel-2.6.27.37-desktop586-1mnb
+nvidia-current-kernel-2.6.27.37-server-1mnb
+nvidia-current-kernel-2.6.27.39-desktop-1mnb
+nvidia-current-kernel-2.6.27.39-desktop586-1mnb
+nvidia-current-kernel-2.6.27.39-server-1mnb
+nvidia-current-kernel-2.6.27.45-desktop-1mnb
+nvidia-current-kernel-2.6.27.45-desktop586-1mnb
+nvidia-current-kernel-2.6.27.45-server-1mnb
+nvidia173-kernel-2.6.27.24-desktop-1mnb
+nvidia173-kernel-2.6.27.24-desktop586-1mnb
+nvidia173-kernel-2.6.27.37-desktop-1mnb
+nvidia173-kernel-2.6.27.37-desktop586-1mnb
+nvidia173-kernel-2.6.27.39-desktop-1mnb
+nvidia173-kernel-2.6.27.39-desktop586-1mnb
+nvidia173-kernel-2.6.27.45-desktop-1mnb
+nvidia173-kernel-2.6.27.45-desktop586-1mnb
+nvidia71xx-kernel-2.6.27.24-desktop-1mnb
+nvidia71xx-kernel-2.6.27.24-desktop586-1mnb
+nvidia71xx-kernel-2.6.27.24-server-1mnb
+nvidia71xx-kernel-2.6.27.37-desktop-1mnb
+nvidia71xx-kernel-2.6.27.37-desktop586-1mnb
+nvidia71xx-kernel-2.6.27.37-server-1mnb
+nvidia71xx-kernel-2.6.27.39-desktop-1mnb
+nvidia71xx-kernel-2.6.27.39-desktop586-1mnb
+nvidia71xx-kernel-2.6.27.39-server-1mnb
+nvidia71xx-kernel-2.6.27.45-desktop-1mnb
+nvidia71xx-kernel-2.6.27.45-desktop586-1mnb
+nvidia71xx-kernel-2.6.27.45-server-1mnb
+nvidia96xx-kernel-2.6.27.24-desktop-1mnb
+nvidia96xx-kernel-2.6.27.24-desktop586-1mnb
+nvidia96xx-kernel-2.6.27.24-server-1mnb
+nvidia96xx-kernel-2.6.27.37-desktop-1mnb
+nvidia96xx-kernel-2.6.27.37-desktop586-1mnb
+nvidia96xx-kernel-2.6.27.37-server-1mnb
+nvidia96xx-kernel-2.6.27.39-desktop-1mnb
+nvidia96xx-kernel-2.6.27.39-desktop586-1mnb
+nvidia96xx-kernel-2.6.27.39-server-1mnb
+nvidia96xx-kernel-2.6.27.45-desktop-1mnb
+nvidia96xx-kernel-2.6.27.45-desktop586-1mnb
+nvidia96xx-kernel-2.6.27.45-server-1mnb
+rt2860-kernel-2.6.27.24-desktop-1mnb
+rt2860-kernel-2.6.27.24-desktop586-1mnb
+rt2860-kernel-2.6.27.24-server-1mnb
+rt2860-kernel-desktop-latest
+rt2860-kernel-desktop586-latest
+rt2860-kernel-server-latest
+rt2870-kernel-2.6.27.24-desktop-1mnb
+rt2870-kernel-2.6.27.24-desktop586-1mnb
+rt2870-kernel-2.6.27.24-server-1mnb
+rt2870-kernel-desktop-latest
+rt2870-kernel-desktop586-latest
+rt2870-kernel-server-latest
+rtl8187se-kernel-2.6.27.24-desktop-1mnb
+rtl8187se-kernel-2.6.27.24-desktop586-1mnb
+rtl8187se-kernel-2.6.27.24-server-1mnb
+rtl8187se-kernel-desktop-latest
+rtl8187se-kernel-desktop586-latest
+rtl8187se-kernel-server-latest
+squashfs-lzma-kernel-2.6.27.24-desktop-1mnb
+squashfs-lzma-kernel-2.6.27.24-desktop586-1mnb
+squashfs-lzma-kernel-2.6.27.24-server-1mnb
+squashfs-lzma-kernel-desktop-latest
+squashfs-lzma-kernel-desktop586-latest
+squashfs-lzma-kernel-server-latest
+vboxadd-kernel-2.6.27.24-desktop-1mnb
+vboxadd-kernel-2.6.27.24-desktop586-1mnb
+vboxadd-kernel-2.6.27.24-server-1mnb
+vboxadd-kernel-2.6.27.45-desktop-1mnb
+vboxadd-kernel-2.6.27.45-desktop586-1mnb
+vboxadd-kernel-2.6.27.45-server-1mnb
+vboxadd-kernel-desktop-latest
+vboxadd-kernel-desktop586-latest
+vboxadd-kernel-server-latest
+vboxvfs-kernel-2.6.27.24-desktop-1mnb
+vboxvfs-kernel-2.6.27.24-desktop586-1mnb
+vboxvfs-kernel-2.6.27.24-server-1mnb
+vboxvfs-kernel-2.6.27.45-desktop-1mnb
+vboxvfs-kernel-2.6.27.45-desktop586-1mnb
+vboxvfs-kernel-2.6.27.45-server-1mnb
+vboxvfs-kernel-desktop-latest
+vboxvfs-kernel-desktop586-latest
+vboxvfs-kernel-server-latest
+virtualbox-kernel-2.6.27.24-desktop-1mnb
+virtualbox-kernel-2.6.27.24-desktop586-1mnb
+virtualbox-kernel-2.6.27.24-server-1mnb
+virtualbox-kernel-2.6.27.45-desktop-1mnb
+virtualbox-kernel-2.6.27.45-desktop586-1mnb
+virtualbox-kernel-2.6.27.45-server-1mnb
+virtualbox-kernel-desktop-latest
+virtualbox-kernel-desktop586-latest
+virtualbox-kernel-server-latest
+vpnclient-kernel-2.6.27.24-desktop-1mnb
+vpnclient-kernel-2.6.27.24-desktop586-1mnb
+vpnclient-kernel-2.6.27.24-server-1mnb
+vpnclient-kernel-2.6.27.37-desktop-1mnb
+vpnclient-kernel-2.6.27.37-desktop586-1mnb
+vpnclient-kernel-2.6.27.37-server-1mnb
+vpnclient-kernel-2.6.27.39-desktop-1mnb
+vpnclient-kernel-2.6.27.39-desktop586-1mnb
+vpnclient-kernel-2.6.27.39-server-1mnb
+vpnclient-kernel-2.6.27.45-desktop-1mnb
+vpnclient-kernel-2.6.27.45-desktop586-1mnb
+vpnclient-kernel-2.6.27.45-server-1mnb
+*2.6.27.53
diff --git a/lists/exclude_mini b/lists/exclude_mini
index da7b977..28d06d0 100644
--- a/lists/exclude_mini
+++ b/lists/exclude_mini
@@ -1,10 +1,30 @@
-virtualbox-kernel
-vpnclient-kernel
-lzma-kernel
-squashfs-lzma-kernel
-drm-experimental-kernel
-kqemu-kernel
-#firefox-3.0.10-0.1mdv2009.0
-#firefox-3.0.11-0.1mdv2009.0
 kernel-xen
-vim-minimal
+kdm
+vim-X11
+mandriva-theme-Flash
+mandriva-theme-One
+mandriva-theme-Free
+mandriva-theme-Mini
+mandriva-release-Flash
+mandriva-release-One
+mandriva-release-Free
+mandriva-release-Mini
+mandriva-lxde-config-Flash
+mandriva-lxde-config-One
+mandriva-lxde-config-Free
+mandriva-lxde-config-Mini
+policykit-kde
+polkit-kde-1
+kernel-source
+dkms-vboxadditions
+kernel-kerrighed
+kernel-linus
+kernel-netbook
+kernel-openvz
+kernel-rsbac
+kernel-rt
+kernel-tmb
+kernel-vserver
+rsbac-admin
+apache-mod_rsbac
+apache-mpm-rsbac
diff --git a/lists/exclude_mini32 b/lists/exclude_mini32
index b7f1593..f94ccc8 100644
--- a/lists/exclude_mini32
+++ b/lists/exclude_mini32
@@ -1 +1 @@
-kernel-desktop-
+kesalo
diff --git a/lists/extra-filter b/lists/extra-filter
index e506806..cb5729a 100644
--- a/lists/extra-filter
+++ b/lists/extra-filter
@@ -1,2 +1,9 @@
+#kernel-source
+#kernel-server
+#kernel-desktop
+#kernel-desktop586
+#mandriva-release-common
+#vboxadd-kernel
 libgnomecups
 lib64gnomecups
+glibc-devel
diff --git a/lists/input_cat b/lists/input_cat
index 15f5268..4a99ce8 100644
--- a/lists/input_cat
+++ b/lists/input_cat
@@ -1,70 +1,125 @@
-INSTALL 1
-CAT_LSB 1
-CAT_LXDE 1
-CAT_GRAPHICAL_DESKTOP 1
-CAT_GNOME 1
-CAT_KDE 1
-CAT_XFCE 1
-CAT_VIDEO 1
-CAT_OFFICE 1
-CAT_SPELLCHECK 1
-CAT_AUDIO 1
-CAT_ACCESSIBILITY 1
-CAT_PUBLISHING 1
-CAT_SHELLS 1
-CAT_SCIENCES 1
-CAT_EDUCATION 1
-CAT_EDITORS 1
-CAT_TEXT_TOOLS 1
-CAT_COMMUNICATIONS 1
-CAT_TERMINALS 1
-CAT_NETWORKING_CHAT 1
-CAT_NETWORKING_CHAT_SERVER 1
-CAT_NETWORKING_FILE_TRANSFER 1
-CAT_NETWORKING_FILE_TRANSFER_SERVER 1
-CAT_NETWORKING_LDAP_SERVER 1
-CAT_NETWORKING_INSTANT_MESSAGING 1
-CAT_NETWORKING_IRC 1
-CAT_NETWORKING_FIREWALLING_SERVER 1
-CAT_NETWORKING_GROUPWARE_SERVER 1
-CAT_NETWORKING_MAIL 1
-CAT_NETWORKING_MAIL_SERVER 1
-CAT_NETWORKING_NEWS 1
-CAT_NETWORKING_NEWS_SERVER 1
-CAT_NETWORKING_OTHER 1
-CAT_NETWORKING_OTHER_SERVER 1
-CAT_NIS 1
-CAT_NIS_SERVER 1
-CAT_NETWORKING_REMOTE_ACCESS 1
-CAT_NETWORKING_REMOTE_ACCESS_SERVER 1
-CAT_NETWORKING_DNS 1
-CAT_NETWORKING_DNS_SERVER 1
-CAT_NETWORKING_FILE 1
-CAT_NETWORKING_FILE_SERVER 1
-CAT_NETWORKING_WWW 1
-CAT_NETWORKING_WWW_SERVER 1
+CAT_NETWORKING_NEWS_SERVER 3
+CAT_NETWORKING_OTHER 3
+CAT_NETWORKING_OTHER_SERVER 3
+CAT_NIS 3
+CAT_NIS_SERVER 3
+CAT_NETWORKING_REMOTE_ACCESS 3
+CAT_NETWORKING_REMOTE_ACCESS_SERVER 3
+CAT_NETWORKING_DNS 3
+CAT_NETWORKING_DNS_SERVER 3
+CAT_NETWORKING_FILE 3
+CAT_NETWORKING_FILE_SERVER 3
+CAT_NETWORKING_WWW 4
+CAT_NETWORKING_WWW_SERVER 5
 CAT_GRAPHICS 1
 CAT_ARCHIVING 1
-CAT_DATABASES 1
-CAT_GAMES 1
-CAT_DEVELOPMENT 1
-CAT_MONITORING 1
+CAT_DATABASES 4
+CAT_GAMES 2
+CAT_DEVELOPMENT 2
+CAT_MONITORING 3
 CAT_FILE_TOOLS 1
-CAT_WEBMIN 1
-CAT_WIZARDS 1
+CAT_WEBMIN 3
+CAT_WIZARDS 3
 CAT_CONFIG 1
-CAT_BOOKS 1
+CAT_BOOKS 3
 CAT_X 1
-CAT_MINIMAL_DOCS 1
+CAT_MINIMAL_DOCS 3
 CAT_SYSTEM 1
-CAT_EMULATORS 1
+CAT_EMULATORS 2
 CAT_PRINTER 1
-mandriva-xfce-config-Free
-mandriva-lxde-config-Free
+SCANNER 4
+CAT_VIDEO_EDITING 3
+PHOTO 3
+INSTALL 1
+CAT_LSB 3
+CAT_LXDE 1
+CAT_GRAPHICAL_DESKTOP 4
+CAT_GNOME 1
+CAT_KDE 1
+CAT_XFCE 1
+CAT_VIDEO 3
+CAT_TV 3
+CAT_OFFICE 4
+CAT_SPELLCHECK 5
+CAT_AUDIO 1
+CAT_ACCESSIBILITY 3
+CAT_PUBLISHING 4
+CAT_SHELLS 3
+CAT_SCIENCES 3
+CAT_EDUCATION 3
+CAT_EDITORS 4
+CAT_TEXT_TOOLS 3
+CAT_COMMUNICATIONS 3
+CAT_TERMINALS 2
+CAT_NETWORKING_CHAT 3
+CAT_NETWORKING_CHAT_SERVER 5
+CAT_NETWORKING_FILE_TRANSFER 3
+CAT_NETWORKING_FILE_TRANSFER_SERVER 3
+CAT_NETWORKING_LDAP_SERVER 3
+CAT_NETWORKING_INSTANT_MESSAGING 3
+CAT_NETWORKING_IRC 3
+CAT_NETWORKING_FIREWALLING_SERVER 3
+CAT_NETWORKING_GROUPWARE_SERVER 3
+CAT_NETWORKING_MAIL 4
+CAT_NETWORKING_MAIL_SERVER 5
+CAT_NETWORKING_NEWS 3
+
+# all task- packages
+task-3ddesktop-gtk
+task-3ddesktop-kde
+#task-c-devel
+#task-c++-devel
+task-gnome-2010.1
+task-gnome-minimal-2010.1
+task-kde4
+#task-kde4-devel
+task-kde4-minimal
+task-lxde
 lxde-common
 lxde-settings-daemon
-lxpanel
-lxsession
-lxtask
-lxterminal
-xarchiver
+task-mds
+task-printing
+task-printing-canon
+task-printing-epson
+task-printing-hp
+task-printing-lexmark
+task-printing-misc
+task-printing-okidata
+task-printing-scanning
+task-printing-server
+task-pulseaudio
+task-scanning
+task-x11
+
+# usefull tools
+xen-hypervisor
+dkms
+xemacs
+fluid-soundfont-common
+xorg-x11-75dpi-fonts
+x11-font-wqy-bitmapfont
+xterm
+cpufreqd
+apmd
+bcm43xx-fwcutter
+lilo
+vboxadditions-kernel-desktop-latest
+vboxadditions-kernel-server-latest
+vboxadditions-kernel-desktop586-latest
+virtualbox-kernel-desktop586-latest
+virtualbox-kernel-desktop-latest
+virtualbox-kernel-server-latest
+virtualbox
+java-1.6.0-openjdk-plugin
+ka-deploy-source-node
+ka-deploy-server
+dansguardian
+hylafax-server
+mercurial-server
+mercurial
+kdevplatform4
+kdevelop4
+vpnclient
+vpnc
+openvpn
+openvpn-admin
diff --git a/lists/input_contrib b/lists/input_contrib
index c7dc051..2a208ca 100644
--- a/lists/input_contrib
+++ b/lists/input_contrib
@@ -1,12 +1,15 @@
-mandriva-xfce-config-Free
 afio
+abiword
+abiword-docs-en
+abiword-docs-fr
+abiword-docs-pl
+gnumeric
 aircrack-ng
 airsnort
 alsa_raoppcm-kernel-desktop-latest
 alsa_raoppcm-kernel-server-latest
 anjuta2
 apache-mod_python
-ardour
 arj
 atunes
 aubio
@@ -40,7 +43,7 @@ bluedj-upgrade
 buffer
 canna
 capture
-cinepaint
+chromium-browser
 clamav
 clamav-db
 clanbomber2
@@ -78,24 +81,17 @@ dkms-vloopback
 dkms-zd1211
 dolly
 dolly_plus
-drakmsync
 dvdauthor
 dvd-slideshow
 dvdstyler
 ec-fonts-mftraced
 eclipse-egit
 editobj
-egoboo
-egoboo-data
-elisa
-elisa-core
-elisa-plugins-bad
-elisa-plugins-good
-elisa-plugins-ugly
+#egoboo
+#egoboo-data
 enblend
 engine_pkcs11
 exo
-free-kde-config
 gajim
 galaxy-gtk12
 gdk-pixbuf-loaders
@@ -114,12 +110,14 @@ gstreamer0.10-mpeg2enc
 gstreamer0.10-musepack
 gstreamer0.10-neon
 gstreamer0.10-plugins-bad
+gstreamer0.10-mpeg
+gstreamer0.10-a52dec
+gstreamer0.10-resindvd
 gsynaptics
 hibernate
 hotkeys
 htmlparser
 hugin
-ia_ora-xfce
 iftop
 input-utils
 ivtv
@@ -129,32 +127,17 @@ jfreechart
 jhlabs-filters
 joda-time
 kconfigldap
-kdelibs3-common
 kftpgrabber
 kiba-dock
-kiba-pidgin-plugin
 kiba-plugins
 klamav
 kmediafactory
 kqemu-kernel-desktop-latest
 kqemu-kernel-server-latest
-amd2.2.0
 anjuta0
-arts1
-aubio2
-audacious1
-barry0
-cal3d12
-canna1
-cinepaint0
 clamav5
 clamav6
-Cw1
-cwiid1
-djconsole0
-dvbpsi5
-dynamite0
-ebml0
+djconsole
 exo
 fluidsynth1
 gdk-pixbuf2
@@ -162,20 +145,11 @@ gstphotography0.10_0
 gtk+1.2
 gtkhex0
 gtksourceviewmm
-gwsoap0
-kdecore4
 kdepim2-common
 kdepim2-ktnef
 kftpinterfaces4
 kmediafactory
-lash1
-matroska0
-mcs1
-mimedir0
-mimic0
-mowgli2
-ode1
-openlibraries0
+openlibraries
 opensync-plugin-evolution2
 opensync-plugin-file
 opensync-plugin-gnokii
@@ -183,69 +157,34 @@ opensync-plugin-kdepim
 opensync-plugin-python
 opensync-plugin-syncml
 orange0
-p11_0
-pano13_0
 pano13-tools
-pigment10
-ptp2_1
-quesoglc0
-rapi2
 rapi-python
-rra0
 rtfcomp0
 scim-honoka0
 scim-honoka-counterattack0
 scim-honoka-devel
-skim0
-soup
-stdc++5
-swfdec0.8_0
-synce0
-syncml0
-thunar1_2
-tommath0
-tonezone2
-umfpack5.2.0
-unshield0
 upnp3
-vlc2
-wbxml0
-wxsvg0
 xfsm
-xmi0
-xmms1
 xosd2
-lilypond
-lilypond-doc
 lincity-ng
-lmctl
-lmms
 logitech_applet
 logitech-mouse-common
 luma
 maildrop
-mandriva-xfce-config-common
-mandriva-xfce-config-Free
-maniadrive
-maniadrive-data
-manslide
 mcs
-mediawiki
 memtester
 mindi
 mindi-busybox
-miro
-mixxx
 mondo
 mousepad
 mrxvt
 msynctool
 multisync-gui
+nano
 nautilus-open-terminal
 nautilus-sendto
 nautilus-sendto-bluetooth
 nautilus-sendto-gajim
-nautilus-sendto-pidgin
 nemiver
 netstat-nat
 nget
@@ -262,6 +201,7 @@ perl-Config-General
 perl-Dahdi
 perl-Flickr-API
 perl-Flickr-Upload
+perl-Test-Mock-LWP
 perl-Gtk2-Ex-PodViewer
 perl-Gtk2-Ex-Simple-List
 perl-Gtk2-GladeXML
@@ -281,23 +221,6 @@ perl-XMLTV
 phpmyadmin
 php-pear-OLE
 php-pear-Spreadsheet_Excel_Writer
-pidgin-encryption
-pidgin-facebookchat
-pidgin-festival
-pidgin-guifications
-pidgin-icb
-pidgin-lastfm
-pidgin-libnotify
-pidgin-microblog
-pidgin-msn-pecan
-pidgin-musictracker
-pidgin-otr
-pidgin-plugin-pack
-pidgin-privacy-please
-pidgin-rhythmbox
-pidgin-smartear
-pidgin-tlen
-pidgin-xmms
 pigment
 pigment-python
 pitivi
@@ -332,11 +255,9 @@ python-wmd
 python-xlib
 pyvorbis
 pywbxml
-qemu-
+qemu
 qemu-img
-qemu-launcher
-qtemu-
-referencer
+qtemu
 rgrep
 ri-li
 scim-array
@@ -370,19 +291,14 @@ skim-scim-anthy
 skim-scim-canna
 skim-scim-honoka
 skim-scim-skk
-slune
-smplayer
-smplayer-themes
 soya
-squashfs-kernel-desktop-latest
-squashfs-kernel-server-latest
-squashfs-lzma-kernel-desktop-latest
-squashfs-lzma-kernel-server-latest
+#squashfs-kernel-desktop-latest
+#squashfs-kernel-server-latest
+#squashfs-lzma-kernel-desktop-latest
+#squashfs-lzma-kernel-server-latest
 sshfs-fuse
 stgit
 substance
-swfdec-gnome
-swfdec-mozilla
 swh-plugins
 swingx
 synce-gvfs
@@ -404,20 +320,14 @@ task-nokiasync-gnome
 task-wm5sync-common
 task-wm5sync-gnome
 task-wm5sync-kde
-task-xfce-minimal
 terminal
-terminatorX
 thunar
 thunar-volman
 tkdvd
 tp_smapi-kernel
-tp_smapi-kernel
-tp_smapi-kernel
 tp_smapi-kernel-desktop-latest
 tp_smapi-kernel-server-latest
 transkode
-tremulous
-tremulous-maps
 tuxpaint
 twill
 unpaper
@@ -451,23 +361,13 @@ vlc-plugin-upnp
 vlc-plugin-xosd
 vlc-plugin-zvbi
 w3m
-widelands-b13
-wormux
 wstx
 xarchiver
 xdvi
-xfce4-icon-theme
-xfce4-mixer
-xfce4-panel
-xfce4-power-manager
-xfce4-session
-xfce4-settings
-xfce4-taskmanager
-xfce4-volstatus-icon
-xfce-utils
 xfconf
 xfdesktop
 xfwm4
+xmoto
 xmlpull-api
 xmltv-grabbers-ar
 xmltv-grabbers-ch
@@ -489,19 +389,34 @@ xmltv-grabbers-pt
 xmltv-grabbers-re
 xmltv-grabbers-se
 xmltv-grabbers-uk
-xmms
-xmms-singit
-xmoto
 xournal
 xstream
 yauap
 zd1211
-
-java-devel
-libopenmpi-devel
-libgcj-devel
-libstdc++-devel
-glibc-devel
-kernel-devel
-libapr-devel
-
+mplayerthumb
+wormux
+wesnoth
+widelands-b15
+warzone2100
+#tremulous-maps
+#tremulous
+X11R6-contrib
+#task-xfce
+smplayer
+smplayer-themes
+halevt
+halevt-user
+dkms-psb
+psb-kernel-desktop-latest
+psb-kernel-desktop586-latest
+psb-kernel-server-latest
+x11-driver-video-psb
+x11-driver-input-wiimote
+x11-driver-video-vermilion
+x11-driver-video-nouveau
+x11-driver-video-xgi
+mandriva-xfce-config-Free
+tmux
+tuxracer
+scilab
+#uClibc-libopenssl0.9.7
diff --git a/lists/input_contrib32_extra b/lists/input_contrib32_extra
index ddb1ad1..6fcecfc 100644
--- a/lists/input_contrib32_extra
+++ b/lists/input_contrib32_extra
@@ -9,3 +9,4 @@ syntek-kernel-desktop586-latest
 syntek-kernel-desktop-latest
 syntek-kernel-server-latest
 tp_smapi-kernel-desktop586-latest
+nano
diff --git a/lists/input_main b/lists/input_main
index 018cd34..d25ad64 100644
--- a/lists/input_main
+++ b/lists/input_main
@@ -1,3 +1,5 @@
+kernel-desktop-latest
+kernel-server-latest
 # MANDATORY PACKAGES !!
 kbd
 grub
@@ -16,27 +18,24 @@ losetup
 udev
 iputils
 gnupg
-
 # higly recommended
 urpmi
 drakxtools-
 curl
 dkms-
-
 # other stuff
-task-x11
-task-kde4
-task-gnome
 task-3ddesktop-gtk
 task-3ddesktop-kde
 task-c-devel
 task-c++-devel
-task-gnome-2010.0
-task-gnome-minimal-2010.0
+task-gnome-2010.1
+task-gnome-minimal-2010.1
 task-kde4
 task-kde4-devel
 task-kde4-minimal
-task-lxde-2009.0
+task-lxde
+lxde-common
+lxde-settings-daemon
 task-mds
 task-printing
 task-printing-canon
@@ -50,9 +49,7 @@ task-printing-server
 task-pulseaudio
 task-scanning
 task-x11
-
 drakxtools
-
 alsa-plugins
 monitor-edid
 screen
@@ -65,13 +62,13 @@ cdrkit
 lsof
 tcpdump
 smartmontools
-
 cdp
 splashy
 #dkms-
 sox
-mandriva-theme-Free
-
+#mandriva-theme-Free
+#mandriva-release-Free
+skrooge
 xorg-x11-75dpi-fonts
 x11-font-wqy-bitmapfont
 xterm
@@ -157,15 +154,77 @@ wpa_supplicant
 ndiswrapper
 poppler-data
 sdparm
-
 meta-task
+mandriva-galaxy
+mandriva-galaxy-data
+kwallet
+
+# firefox
+firefox-fr
+firefox-en_GB
+#firefox-af
+#firefox-ar
+firefox-be
+#firefox-bg
+#firefox-bn
+firefox-ca
+#firefox-cs
+#firefox-cy
+#firefox-da
+firefox-de
+#firefox-el
+#firefox-eo
+#firefox-es_AR
+firefox-es_ES
+#firefox-et
+firefox-eu
+#firefox-fi
+#firefox-fy
+#firefox-ga_IE
+#firefox-gl
+#firefox-gu_IN
+firefox-he
+#firefox-hi
+firefox-hu
+#firefox-id
+#firefox-is
+firefox-it
+firefox-ja
+#firefox-ka
+#firefox-kn
+firefox-ko
+#firefox-ku
+#firefox-lt
+#firefox-lv
+#firefox-mk
+#firefox-mn
+#firefox-mr
+#firefox-nb_NO
+#firefox-nl
+#firefox-nn_NO
+#firefox-oc
+#firefox-pa_IN
+firefox-pl
+firefox-pt_BR
+firefox-pt_PT
+#firefox-ro
+firefox-ru
+#firefox-si
+#firefox-sk
+#firefox-sl
+#firefox-sq
+#firefox-sr
+#firefox-sv_SE
+#firefox-te
+#firefox-th
+#firefox-tr
+firefox-uk
+firefox-zh_CN
+firefox-zh_TW
 
-java-devel
-libopenmpi-devel
-libgcj-devel
-libstdc++-devel
-glibc-devel
-kernel-devel
-libapr-devel
+vboxadditions-kernel-desktop-latest
+vboxadditions-kernel-server-latest
+virtualbox
 
-lib64Xp-devel
+mailcap
+libcg-devel
diff --git a/lists/input_main32 b/lists/input_main32
index 085dd37..627d570 100644
--- a/lists/input_main32
+++ b/lists/input_main32
@@ -1,8 +1,5 @@
 kernel-desktop586-latest
-
-vboxadditions-kernel-desktop586-latest
 virtualbox-kernel-desktop586-latest
 em8300-kernel-desktop586-latest
 afs-kernel-desktop586-latest
 lzma-kernel-desktop586-latest
-
diff --git a/lists/input_main64_ooo3 b/lists/input_main64_ooo3
index d38c4d7..b26de20 100644
--- a/lists/input_main64_ooo3
+++ b/lists/input_main64_ooo3
@@ -47,7 +47,6 @@ openoffice.org64-l10n-zh_CN
 openoffice.org64-l10n-zh_TW
 openoffice.org64-l10n-zu
 openoffice.org64-math
-openoffice.org64-openclipart
 openoffice.org64-pdfimport
 openoffice.org64-presentation-minimizer
 openoffice.org64-pyuno
@@ -58,4 +57,3 @@ openoffice.org64-style-tango
 openoffice.org64-testtool
 openoffice.org64-voikko
 openoffice.org64-writer
-
diff --git a/lists/input_main_ooo3 b/lists/input_main_ooo3
index 4f24cc6..4473a13 100644
--- a/lists/input_main_ooo3
+++ b/lists/input_main_ooo3
@@ -47,7 +47,6 @@ openoffice.org-l10n-zh_CN
 openoffice.org-l10n-zh_TW
 openoffice.org-l10n-zu
 openoffice.org-math
-openoffice.org-openclipart
 openoffice.org-pdfimport
 openoffice.org-presentation-minimizer
 openoffice.org-pyuno
@@ -58,4 +57,3 @@ openoffice.org-style-tango
 openoffice.org-testtool
 openoffice.org-voikko
 openoffice.org-writer
-
diff --git a/lists/input_restricted b/lists/input_restricted
index 5830d70..9d6ebc5 100644
--- a/lists/input_restricted
+++ b/lists/input_restricted
@@ -1,2 +1,41 @@
-FlashPlayer
-FlashPlayer-plugin
+acroread
+acroread-l10n-da
+acroread-l10n-de
+acroread-l10n-es
+acroread-l10n-fi
+acroread-l10n-fr
+acroread-l10n-it
+acroread-l10n-ja
+acroread-l10n-ko
+acroread-l10n-nb
+acroread-l10n-nl
+acroread-l10n-pt
+acroread-l10n-sv
+acroread-l10n-zh_CN
+acroread-l10n-zh_TW
+acroread-nppdf
+acroread-plugins-accessibility
+acroread-plugins-checkers
+acroread-plugins-comments
+acroread-plugins-dva
+acroread-plugins-ecmascript
+acroread-plugins-extwin
+acroread-plugins-forms
+acroread-plugins-hls
+acroread-plugins-internetaccess
+acroread-plugins-legalpdf
+acroread-plugins-makeaccessible
+acroread-plugins-multimedia
+acroread-plugins-pddom
+acroread-plugins-ppklite
+acroread-plugins-readoutloud
+acroread-plugins-saveasrtf
+acroread-plugins-searchfind
+acroread-plugins-sendmail
+acroread-plugins-soap
+acroread-plugins-spelling
+acroread-plugins-weblink
+opera
+skype
+flashplayer-plugin
+flashplayer
diff --git a/lists/kernel32 b/lists/kernel32
index 7b7bf18..0fea7ea 100644
--- a/lists/kernel32
+++ b/lists/kernel32
@@ -1,6 +1,3 @@
-#kernel-desktop
-#kernel-desktop-latest
-kernel-desktop586
 kernel-desktop586-latest
-kernel-server
-kernel-server-latest
+kernel-desktop586-devel
+vboxadditions-kernel-desktop586-latest
diff --git a/lists/kernel64 b/lists/kernel64
index 420e37d..1b44c0e 100644
--- a/lists/kernel64
+++ b/lists/kernel64
@@ -1,4 +1,3 @@
 kernel-desktop-latest
-kernel-desktop
-kernel-server-latest
-kernel-server
+kernel-desktop-devel
+vboxadditions-kernel-desktop-latest
diff --git a/lists/languages b/lists/languages
index ad9a3bc..77b9530 100644
--- a/lists/languages
+++ b/lists/languages
@@ -1,99 +1,33 @@
-locales-af
-locales-am
-locales-ar
-locales-az
-locales-be
 locales-bg
-locales-bn
-locales-br
-locales-ca
-locales-cs
-locales-cy
-locales-da
 locales-de
-locales-el
 locales-en
-locales-eo
 locales-es
-locales-et
-locales-eu
-locales-fa
-locales-fi
-locales-fo
 locales-fr
-locales-fur
-locales-fy
-locales-ga
-locales-gd
-locales-gl
-locales-gu
-locales-gv
-locales-he
-locales-hi
-locales-hr
-locales-hsb
 locales-hu
-locales-hy
-locales-id
-locales-is
-locales-it
 locales-ja
-locales-ka
-locales-kk
-locales-km
-locales-kn
-locales-ko
-locales-ku
-locales-lt
-locales-lv
-locales-mg
-locales-mi
 locales-mk
-locales-ml
-locales-mn
-locales-mr
-locales-ms
-locales-mt
-locales-nds
-locales-ne
-locales-nl
-locales-no
-locales-nr
-locales-nso
-locales-oc
-locales-pa
 locales-pl
+locales-ru
+#locales-zh
 locales-pt
-locales-ro
+#locales-ro
 locales-ru
-locales-rw
-locales-sc
-locales-se
-locales-si
-locales-sk
-locales-sl
-locales-so
-locales-sq
-locales-sr
-locales-ss
-locales-st
 locales-sv
-locales-sw
-locales-ta
-locales-te
-locales-tg
-locales-th
-locales-tl
-locales-tn
-locales-tr
-locales-ts
+locales-ko
+locales-be
 locales-uk
-locales-ur
-locales-uz
-locales-ve
-locales-vi
-locales-wa
-locales-xh
-locales-yi
-locales-zh
-locales-zu
+locales-ca
+locales-it
+firefox-be
+firefox-it
+firefox-de
+firefox-en_GB
+firefox-es_ES
+firefox-ru
+firefox-fr
+firefox-he
+firefox-hu
+firefox-pl
+firefox-pt_BR
+#firefox-ca
+#firefox-eu
diff --git a/lists/main32 b/lists/main32
index 3d73255..43d03c5 100644
--- a/lists/main32
+++ b/lists/main32
@@ -1,9 +1,5 @@
+libmesagl1
 libflashsupport
-libfreetype
-libpython2.5
-libxt6
-libgtk+-x11-2.0_0
-libpng3
-libcairo2
-libpango1.0_0
-libx11_6
+libfreetype6
+libalsa-plugins-pulseaudio
+libxdamage1
diff --git a/lists/server_cs5 b/lists/server_cs5
index f06413b..31a52db 100644
--- a/lists/server_cs5
+++ b/lists/server_cs5
@@ -22,7 +22,6 @@ firefox-
 
 #######
 openldap-server
-openldap
 openldap-clients
 openldap-doc
 openldap-servers
@@ -42,15 +41,14 @@ telnet-server-krb5
 nload
 iftop
 iptraf
-ipmi-
-openipmi-
+ipmi
+openipmi
 
 #
 backuppc
 
 #
 freeradius
-freeradius-*
 
 #
 samba-server
@@ -234,7 +232,6 @@ pwauth
 
 #
 jakarta-commons
-tomcat5
 tomcat5-server-lib
 tomcat5-common-lib
 xerces
@@ -242,7 +239,6 @@ ant-
 ypserv
 
 #
-mysql
 mysql-max
 mysql-bench
 mysql-client
@@ -252,10 +248,9 @@ pam_sqlite
 sqlite-tools
 
 #
-postgresql8.3
 postgresql8.3-contrib
 postgresql8.3-docs
-postgresql8.3-pl
+postgresql8.3-pl-
 postgresql8.3-plperl
 postgresql8.3-plpgsql
 postgresql8.3-plpython
@@ -266,6 +261,8 @@ postgresql8.3-test
 #
 shorewall
 iptables
+libiptables-devel
+lib64iptables-devel
 squid
 squidGuard
 privoxy
@@ -311,19 +308,20 @@ dkms-ndiswrapper
 
 
 #
-bacula-common-3.0.2-0.1mdvmes5
-bacula-dir-mysql-3.0.2-0.1mdvmes5
-bacula-gui-bimagemgr-3.0.2-0.1mdvmes5
-bacula-console-3.0.2-0.1mdvmes5
-bacula-dir-pgsql-3.0.2-0.1mdvmes5
-bacula-gui-web-3.0.2-0.1mdvmes5
-bacula-console-gnome-3.0.2-0.1mdvmes5
-bacula-dir-sqlite-3.0.2-0.1mdvmes5
-bacula-sd-3.0.2-0.1mdvmes5
-bacula-console-wx-3.0.2-0.1mdvmes5
-bacula-dir-sqlite3-3.0.2-0.1mdvmes5
-bacula-dir-common-3.0.2-0.1mdvmes5
-bacula-fd-3.0.2-0.1mdvmes5
+bacula-common
+bacula-dir-mysql
+bacula-gui-bimagemgr
+bacula-console
+bacula-dir-pgsql
+bacula-gui-web
+bacula-gui-bweb
+bacula-console-gnome
+bacula-dir-sqlite
+bacula-sd
+bacula-console-wx
+bacula-dir-sqlite3
+bacula-dir-common
+bacula-fd
 
 
 ####
@@ -379,7 +377,7 @@ python-nufw
 #
 #
 glpi
-ocsinventory-*
+ocsinventory-
 
 
 ###
diff --git a/mes5_X86_32.xml b/mes5_X86_32.xml
new file mode 100644
index 0000000..b5f4dab
--- /dev/null
+++ b/mes5_X86_32.xml
@@ -0,0 +1,191 @@
+<?xml version='1.0'?>
+
+<productname desc="The Linux product">
+	<nameid>mandriva-linux-corporate</nameid>
+	<nb_fork>4</nb_fork>
+	<!-- you must specify on wich distrib this iso will be built -->
+	<based_on>mes5</based_on>
+	<!-- -->
+	<arch>i586</arch>
+	<signature>/home/builduser/.signature.gpg</signature>
+	<rpmrc>/home/builduser/.rpmrc</rpmrc>
+	<repo desc="Where is the repositery of the distribution">
+		<path>/mnt/BIG/official</path>
+	</repo>
+	<workdir desc="Where is my working dir">
+		<path>/home/builduser/build_bcd</path>
+	</workdir>
+	<tocopy_file>tocopy_plop</tocopy_file>
+	<isolinux desc="isolinux info">
+		<defaultpath>isolinux</defaultpath>
+		<fullpath>/home/builduser/export_i386/isolinux</fullpath>
+		<!-- add hdt entry in syslinux.cfg -->
+		<!--		<entry name="hdt" desc="Main media">
+			<bin>/usr/lib/syslinux/hdt.c32</bin>
+			<label>hdt</label>
+			<kernel>hdt.c32</kernel>
+			<append>modules=modules.pci</append>
+		</entry>
+		-->
+		<!-- keep this entry to create an array ref -->
+		<entry></entry>
+		<entry></entry>
+               <tocopy name="pcimap">
+		       <file>/lib/modules/2.6.27.53-server-1mnb/modules.pcimap</file>
+                </tocopy>
+                <tocopy name="ids">
+                        <file>/usr/share/pci.ids</file>
+                </tocopy>
+                <tocopy></tocopy>
+	</isolinux>
+	<installer desc="path to the Mandriva installer (stage1/stage2)">
+		<defaultpath>install</defaultpath>
+		<fullpath>/home/builduser/export_i386</fullpath>
+		<advertising>
+			<defaultpath>advertising</defaultpath>
+			<!--<fullpath></fullpath> -->
+		</advertising>
+	</installer>
+
+	<!-- theme must be available to path altx/all.rdz files -->
+	<theme name="mandriva-release-Server">
+                <theme>mandriva-theme-Corporate</theme>
+		<bootsplash>Mandriva-Corporate</bootsplash>
+		<bootsplash_path>/usr/share/bootsplash</bootsplash_path>
+		<gfxboot_path>/usr/share/gfxboot</gfxboot_path>
+	</theme>
+
+	<media desc="media to take into account to build the ISO">
+		<!-- WARNING this media must be named "Main" because main media is mandatory for all other media-->
+		<!-- Morever the "Main" media is always the Name use for an MDV reposiery -->
+		<!-- futur feature will provide a way to specify another name for the basic repo of an MDV distribution -->
+		<list name="Main" desc="Main media">
+			<!-- MANDATORY list of wanted packages on the iso -->
+			<input name="base">
+				<file>lists/server_cs5</file>
+			</input>
+			<input name="base">
+				<file>lists/all</file>
+			</input>
+			<input name="base">
+				<file>lists/basesystem_common</file>
+			</input>
+			<input name="theme">
+				<file>lists/corpo</file>
+			</input>
+			<!-- to create an array you must keep this even if it is empty -->
+			<!-- MANDATORY list of unwanted packages on the iso -->
+			<exclude name="exclude">
+				<file>lists/exclude-theme-corpo</file>
+			</exclude>
+			<exclude name="exclude_free">
+				<file>lists/exclude_main_corpo</file>
+			</exclude>
+			<!-- to create an array you must keep this even if it is empty -->
+			<exclude>
+			</exclude>
+			<!-- nosuggests options should be yes or no -->
+			<nosuggests>no</nosuggests>
+			<!-- will be taken in {repo}{version}{arch}/media -->
+			<mediadir>main</mediadir>
+			<destmedia>main</destmedia>
+			<!--
+			<fullpath_mediadir>/home/plop/iso/final/t/i586/media/main</fullpath_mediadir>
+			-->
+			<pubkey>release/media_info/pubkey</pubkey>
+			<release>yes</release>
+			<updates>yes</updates>
+			<backport>no</backport>
+			<testing>no</testing>
+		</list>
+		<list name="bck" desc="Main2 media">
+			<!-- MANDATORY list of wanted packages on the iso -->
+			<input name="base2">
+				<file>lists/main2</file>
+			</input>
+			<input name="base">
+			</input>
+			<!-- to create an array you must keep this even if it is empty -->
+			<!-- MANDATORY list of unwanted packages on the iso -->
+			<exclude name="exclude">
+				<file>lists/exclude-theme-corpo</file>
+			</exclude>
+			<exclude name="exclude_free">
+				<file>lists/exclude_main_corpo</file>
+			</exclude>
+			<!-- to create an array you must keep this even if it is empty -->
+			<exclude>
+			</exclude>
+			<!-- nosuggests options should be yes or no -->
+			<nosuggests>no</nosuggests>
+			<!-- will be taken in {repo}{version}{arch}/media -->
+			<mediadir>main2</mediadir>
+			<destmedia>main</destmedia>
+			<external name="bck">
+				<fullpath_mediadir>/home/builduser/PIECES/i586/release</fullpath_mediadir>
+			</external>
+			<pubkey>release/media_info/pubkey</pubkey>
+			<release>yes</release>
+			<updates>no</updates>
+			<backport>no</backport>
+			<testing>no</testing>
+		</list>
+
+		<!-- keep this entry to create an array ref -->
+		<list></list>
+	</media>
+
+	<mediainfo desc="All files relatives to media_info dir">
+	        <version>mes5</version>
+		<!-- set fullpath if youy want to use an files in a non MDV repositery -->
+		<!--<fullpath>/home/plop/drakx/perl-install/install/share/meta-task</fullpath>-->
+		<mediainfo_dir>media/media_info</mediainfo_dir>
+		<rpmsrate>rpmsrate</rpmsrate>
+		<compssusers>compssUsers.pl</compssusers>
+		<filedeps>file-deps</filedeps>
+                <filter>lists/extra-filter</filter>
+                <urpmi_option>-a</urpmi_option>
+		<askmedia desc="add for other media ?">
+			<todo>no</todo>
+		</askmedia>
+		<suppl desc="add an external media ?">
+			<todo>no</todo>
+		</suppl>
+		<xmlinfo>
+			<todo>no</todo>
+		</xmlinfo>
+	</mediainfo>
+	
+	<iso>
+		<tag>mes5</tag>
+		<minor>1</minor>
+		<subversion>1</subversion>
+		<product>MES5</product>
+		<branch>Official</branch>
+		<type>basic</type>
+		<!-- dual arch not yet supported -->
+		<dualarch>no</dualarch>
+		<!-- SIZE is not YET USED !!! -->
+		<size>700</size>
+		<!-- media.cfg will be stored on genisoimage->{builddir}/{nameid}/{arch} -->
+		<mediacfg>media/media_info/media.cfg</mediacfg>
+		<hdlist>yes</hdlist>
+		<synthesis>yes</synthesis>
+		<header desc="Iso header info">
+			<systemid>Mandriva Linux</systemid>
+			<volumeid>MES5-i586</volumeid>
+			<volumesetid>Mandriva Linux - MES5 - i586 DVD</volumesetid>
+			<publisherid>Mandriva</publisherid>
+			<datapreparer>Mandriva-Linux BCD</datapreparer>
+			<applicationid>Mandriva Linux - MES5</applicationid>
+			<copyrightid>Mandriva Linux</copyrightid>
+		</header>
+		<genisoimage desc="iso generation tool">
+			<options>-f -r -J -hide-rr-moved -nobak -cache-inodes -no-emul-boot -boot-load-size 4 </options>
+			<bootcat>isolinux/boot.cat</bootcat>
+			<!-- builddir and destdir will always use the workdir -->
+			<builddir>build</builddir>
+			<isodir>iso</isodir>
+		</genisoimage>
+	</iso>
+</productname>
diff --git a/mes5_X86_64.xml b/mes5_X86_64.xml
new file mode 100644
index 0000000..d412430
--- /dev/null
+++ b/mes5_X86_64.xml
@@ -0,0 +1,150 @@
+<?xml version='1.0'?>
+
+<productname desc="The Linux product">
+	<nameid>mandriva-linux-corporate</nameid>
+	<nb_fork>10</nb_fork>
+	<!-- you must specify on wich distrib this iso will be built -->
+	<based_on>corporate/5.0</based_on>
+	<!-- -->
+	<arch>x86_64</arch>
+	<repo desc="Where is the repositery of the distribution">
+		<path>/mnt/BIG/official</path>
+	</repo>
+	<workdir desc="Where is my working dir">
+		<path>/home/builduser/build_bcd</path>
+	</workdir>
+	<tocopy_file>tocopy_plop</tocopy_file>
+	<isolinux desc="isolinux info">
+		<defaultpath>isolinux</defaultpath>
+		<!-- <fullpath></fullpath> -->
+		<!-- add hdt entry in syslinux.cfg -->
+		<!--		<entry name="hdt" desc="Main media">
+			<bin>/usr/lib/syslinux/hdt.c32</bin>
+			<label>hdt</label>
+			<kernel>hdt.c32</kernel>
+			<append>modules=modules.pci</append>
+		</entry>
+		-->
+		<!-- keep this entry to create an array ref -->
+		<entry></entry>
+		<entry></entry>
+               <tocopy name="pcimap">
+		       <file>/lib/modules/2.6.27.53-server-1mnb/modules.pcimap</file>
+                </tocopy>
+                <tocopy name="ids">
+                        <file>/usr/share/pci.ids</file>
+                </tocopy>
+                <tocopy></tocopy>
+	</isolinux>
+	<installer desc="path to the Mandriva installer (stage1/stage2)">
+		<defaultpath>install</defaultpath>
+		<!--<fullpath></fullpath> -->
+		<advertising>
+			<defaultpath>advertising</defaultpath>
+			<!--<fullpath></fullpath> -->
+		</advertising>
+	</installer>
+
+	<!-- theme must be available to path altx/all.rdz files -->
+	<theme name="mandriva-release-Server">
+                <theme>mandriva-theme-Corporate</theme>
+		<bootsplash>Mandriva-Corporate</bootsplash>
+		<bootsplash_path>/usr/share/bootsplash</bootsplash_path>
+		<gfxboot_path>/usr/share/gfxboot</gfxboot_path>
+	</theme>
+
+	<media desc="media to take into account to build the ISO">
+		<!-- WARNING this media must be named "Main" because main media is mandatory for all other media-->
+		<!-- Morever the "Main" media is always the Name use for an MDV reposiery -->
+		<!-- futur feature will provide a way to specify another name for the basic repo of an MDV distribution -->
+		<list name="Main" desc="Main media">
+			<!-- MANDATORY list of wanted packages on the iso -->
+			<input name="base">
+				<file>lists/server_cs5</file>
+			</input>
+			<input name="theme">
+				<file>lists/corpo</file>
+			</input>
+			<!-- to create an array you must keep this even if it is empty -->
+			<!-- MANDATORY list of unwanted packages on the iso -->
+			<exclude name="exclude">
+				<file>lists/exclude_theme_corpo</file>
+			</exclude>
+			<exclude name="exclude_free">
+				<file>lists/exclude_main_corpo</file>
+			</exclude>
+			<!-- to create an array you must keep this even if it is empty -->
+			<exclude>
+			</exclude>
+			<!-- nosuggests options should be yes or no -->
+			<nosuggests>no</nosuggests>
+			<!-- will be taken in {repo}{version}{arch}/media -->
+			<mediadir>main</mediadir>
+			<destmedia>main</destmedia>
+			<!--
+			<fullpath_mediadir>/home/plop/iso/final/t/i586/media/main</fullpath_mediadir>
+			-->
+			<pubkey>release/media_info/pubkey</pubkey>
+			<release>yes</release>
+			<updates>yes</updates>
+			<backport>no</backport>
+			<testing>no</testing>
+		</list>
+		<!-- keep this entry to create an array ref -->
+		<list></list>
+	</media>
+
+	<mediainfo desc="All files relatives to media_info dir">
+	        <version>mes5</version>
+		<!-- set fullpath if youy want to use an files in a non MDV repositery -->
+		<!--<fullpath>/home/plop/drakx/perl-install/install/share/meta-task</fullpath>-->
+		<mediainfo_dir>media/media_info</mediainfo_dir>
+		<rpmsrate>rpmsrate</rpmsrate>
+		<compssusers>compssUsers.pl</compssusers>
+		<filedeps>file-deps</filedeps>
+                <filter>lists/extra-filter</filter>
+                <urpmi_option>-a</urpmi_option>
+		<askmedia desc="add for other media ?">
+			<todo>yes</todo>
+		</askmedia>
+		<suppl desc="add an external media ?">
+			<todo>yes</todo>
+		</suppl>
+		<xmlinfo>
+			<todo>no</todo>
+		</xmlinfo>
+	</mediainfo>
+	
+	<iso>
+		<tag>mes5</tag>
+		<minor>1</minor>
+		<subversion>1</subversion>
+		<product>MES5</product>
+		<branch>Official</branch>
+		<type>basic</type>
+		<!-- dual arch not yet supported -->
+		<dualarch>no</dualarch>
+		<!-- SIZE is not YET USED !!! -->
+		<size>700</size>
+		<!-- media.cfg will be stored on genisoimage->{builddir}/{nameid}/{arch} -->
+		<mediacfg>media/media_info/media.cfg</mediacfg>
+		<hdlist>yes</hdlist>
+		<synthesis>yes</synthesis>
+		<header desc="Iso header info">
+			<systemid>Mandriva Linux</systemid>
+			<volumeid>MES5-x86_64</volumeid>
+			<volumesetid>Mandriva Linux - MES5 - x86_64 DVD</volumesetid>
+			<publisherid>Mandriva</publisherid>
+			<datapreparer>Mandriva-Linux BCD</datapreparer>
+			<applicationid>Mandriva Linux - MES5</applicationid>
+			<copyrightid>Mandriva Linux</copyrightid>
+		</header>
+		<genisoimage desc="iso generation tool">
+			<options>-f -r -J -hide-rr-moved -nobak -cache-inodes -no-emul-boot -boot-load-size 4 </options>
+			<bootcat>isolinux/boot.cat</bootcat>
+			<!-- builddir and destdir will always use the workdir -->
+			<builddir>build</builddir>
+			<isodir>iso</isodir>
+		</genisoimage>
+	</iso>
+</productname>