Mageia 4 beta 1

12 files changed, 144 insertions, 83 deletions

diff --git a/BCD/Genisoimage.pm b/BCD/Genisoimage.pm
index 9615c49..2369d8d 100644
--- a/BCD/Genisoimage.pm
+++ b/BCD/Genisoimage.pm
@@ -92,7 +92,7 @@ sub create_iso {
 -volset '$isoconf->{iso}{header}{volumesetid}' \\
 -V '$isoconf->{iso}{header}{volumeid}' \\
 -o '$isodir/$isoname.iso' \\
--b $arch/isolinux/isolinux.bin \\
+-b isolinux/isolinux.bin \\
 -boot-info-table \\
 $builddir/../
 ";
diff --git a/create_dual.sh b/create_dual.sh
index b8fa8c6..1868e99 100755
--- a/create_dual.sh
+++ b/create_dual.sh
@@ -1,10 +1,10 @@
 #!/bin/sh
 
 DISTRIB=Mageia
-TREE=3
+TREE=cauldron
 TAG=vanda
-VERSION=3
-SUPPORT=dual-CD
+VERSION=4-beta1
+SUPPORT=dual-DVD
 VV=1
 MEDIAMAIN=media/core
 PIECES="$HOME/build_bcd/pieces"
@@ -13,7 +13,7 @@ BUILDPATH="$HOME/build_bcd/build/$DISTRIB-$VERSION-$SUPPORT"
 BUILDISOPATH="$HOME/build_bcd/iso/$DISTRIB-$VERSION-$SUPPORT"
 
 # genisoimage options
-AGENISO="$DISTRIB - 3 RC"
+AGENISO="$DISTRIB - 4 beta 1"
 PUBLISHER="Mageia.Org"
 SYSID="$PUBLISHER"
 TOOL="$SYSID BCD"
@@ -38,10 +38,17 @@ do
 	cp -af $OLDBUILDPATH-$i/$i $BUILDPATH
 	rm -rf $BUILDPATH/$i/install/images
 	rm -rf $BUILDPATH/$i/isolinux
-	cp -f $PIECES/iso/dual/compssUsers.pl $PIECES/iso/dual/rpmsrate $BUILDPATH/$i/media/media_info
+	cp -f $PIECES/iso/dual/compssUsers.pl $BUILDPATH/$i/media/media_info
 done
 sync
-cp -r $PIECES/iso/dual/syslinux $BUILDPATH
+
+cp -r $PIECES/iso/dual/isolinux $BUILDPATH
+
+for i in i586 x86_64
+do
+	cp -r $PIECES/iso/images/$i $BUILDPATH/isolinux/
+done
+
 
 for i in i586 x86_64
 do
@@ -81,7 +88,7 @@ genisoimage -f -r -J -hide-rr-moved -nobak -cache-inodes -no-emul-boot -boot-loa
 	-volset "$VOLSET" \
 	-V "$VOLUME" \
 	-o "$BUILDISOPATH/$DISTRIB-$VERSION-$SUPPORT.iso" \
-	-b syslinux/syslinux.bin \
+	-b isolinux/isolinux.bin \
 	-boot-info-table \
 	-quiet \
 	$BUILDPATH/
diff --git a/create_dvd.sh b/create_dvd.sh
index 74b6be3..1b200c8 100755
--- a/create_dvd.sh
+++ b/create_dvd.sh
@@ -2,7 +2,7 @@
 
 arch=$1
 distrib=Mageia
-version=3
+version=4-beta1
 homebcd=/home/bcd/build_bcd
 bin=$homebcd/bcd
 pieces=$homebcd/pieces/iso
@@ -10,10 +10,10 @@ build=$homebcd/build/$distrib-$version-$arch
 
 $bin/bcd.pl dvd_free-$arch.xml all noiso
 
-cp -af $pieces/hdt.c32 $build/$arch/isolinux
-cp -af $pieces/bootlogo $build/$arch/isolinux
-cp -af $homebcd/pieces/$version/$arch/isolinux/isolinux-$arch.bin $build/$arch/isolinux
-cp -af $pieces/gfxboot.* $build/$arch/isolinux
+rm -rf $build/$arch/isolinux
+cp -r $pieces/dvd/isolinux $build
+cp $pieces/dvd/$arch.cfg $build/isolinux/isolinux.cfg
+cp -r $pieces/images/$arch $build/isolinux
 
 rm -f $build/$arch/install/images/*nonfree*
 
diff --git a/dual.xml b/dual.xml
index 4b5fa4b..9acb75e 100644
--- a/dual.xml
+++ b/dual.xml
@@ -4,7 +4,7 @@
 	<nameid>mageia-dual</nameid>
 	<nb_fork>10</nb_fork>
 	<!-- you must specify on wich distrib this iso will be built -->
-	<based_on>3</based_on>
+	<based_on>cauldron</based_on>
 	<checktool>rpmcheck</checktool>
 	<arch>i586</arch>
 	<repo desc="Where is the repositery of the distribution">
@@ -17,10 +17,10 @@
         <chroot_media>Core</chroot_media>
 	<chroot_media_exclude>Updates Testing</chroot_media_exclude>
 	<isolinux desc="isolinux info">
-		<fullpath>/home/bcd/build_bcd/pieces/3/i586/isolinux</fullpath> 
+		<fullpath>/home/bcd/build_bcd/pieces/cauldron/i586/isolinux</fullpath> 
 		<!-- add hdt entry in syslinux.cfg -->
 		<entry name="hdt" desc="core media">
-			<bin>/home/bcd/build_bcd/pieces/3/i586/isolinux/hdt.c32</bin>
+			<bin>/home/bcd/build_bcd/pieces/cauldron/i586/isolinux/hdt.c32</bin>
 			<label>hdt</label>
 			<kernel>hdt.c32</kernel>
 			<append>modules=modules.pci</append>
@@ -28,7 +28,7 @@
 		<!-- keep this entry to create an array ref -->
 		<entry></entry>
                <tocopy name="pcimap">
-		       <file>/home/bcd/build_bcd/pieces/3/i586/isolinux/modules.pcimap</file>
+		       <file>/home/bcd/build_bcd/pieces/cauldron/i586/isolinux/modules.pcimap</file>
                 </tocopy>
                 <tocopy name="ids">
 			<file>/usr/share/pci.ids</file>
@@ -103,7 +103,7 @@
                                 <file>lists/exclude_free</file>
                         </exclude>
                         <exclude name="exclude">
-                                <file>lists/exclude_tofix</file>
+                                <file>lists/exclude_dual</file>
                         </exclude>
                         <!-- to create an array you must keep this even if it is empty -->
                         <exclude>
@@ -128,9 +128,9 @@
 
 
 	<mediainfo desc="All files relatives to media_info dir">
-	        <version>3</version>
+	        <version>4-beta1</version>
 		<!-- set fullpath if youy want to use an files in a non MDV repositery -->
-		<fullpath>/home/bcd/build_bcd/pieces/3/i586/media/media_info</fullpath>
+		<fullpath>/home/bcd/build_bcd/pieces/cauldron/i586/media/media_info</fullpath>
 		<mediainfo_dir>media/media_info</mediainfo_dir>
 		<rpmsrate>rpmsrate</rpmsrate>
 		<compssusers>compssUsers.pl</compssusers>
@@ -153,7 +153,7 @@
 		<minor>1</minor>
 		<subversion>1</subversion>
 		<product>mageia-dual</product>
-		<branch>Official</branch>
+		<branch>Devel</branch>
 		<type>basic</type>
 		<!-- dual aRCh not yet supported -->
 		<dualarch>yes</dualarch>
@@ -165,11 +165,11 @@
 		<synthesis>yes</synthesis>
 		<header desc="Iso header info">
 			<systemid>Mageia</systemid>
-			<volumeid>Mageia - mageia dual 3</volumeid>
-			<volumesetid>Mageia - 3 - dual</volumesetid>
+			<volumeid>Mageia - mageia dual 4 beta 1</volumeid>
+			<volumesetid>Mageia - 4 beta 1 - dual</volumesetid>
 			<publisherid>Mageia.Org</publisherid>
 			<datapreparer>Mageia BCD</datapreparer>
-			<applicationid>mageia-dual - 3</applicationid>
+			<applicationid>mageia-dual - 4 beta 1</applicationid>
 			<copyrightid>Mageia.Org</copyrightid>
 		</header>
 		<isohybrid>
diff --git a/dual64.xml b/dual64.xml
index c070ae8..ff48a15 100644
--- a/dual64.xml
+++ b/dual64.xml
@@ -4,7 +4,7 @@
 	<nameid>mageia-dual</nameid>
 	<nb_fork>10</nb_fork>
 	<!-- you must specify on wich distrib this iso will be built -->
-	<based_on>3</based_on>
+	<based_on>cauldron</based_on>
 	<!-- -->
 	<arch>x86_64</arch>
 	<repo desc="Where is the repositery of the distribution">
@@ -17,10 +17,10 @@
         <chroot_media>Core</chroot_media>
         <chroot_media_exclude>Updates Testing</chroot_media_exclude>
 	<isolinux desc="isolinux info">
-		<fullpath>/home/bcd/build_bcd/pieces/3/x86_64/isolinux</fullpath>
+		<fullpath>/home/bcd/build_bcd/pieces/cauldron/x86_64/isolinux</fullpath>
 		<!-- add hdt entry in syslinux.cfg -->
 		<entry name="hdt" desc="Core media">
-			<bin>/home/bcd/build_bcd/pieces/3/x86_64/isolinux/hdt.c32</bin>
+			<bin>/home/bcd/build_bcd/pieces/cauldron/x86_64/isolinux/hdt.c32</bin>
 			<label>hdt</label>
 			<kernel>hdt.c32</kernel>
 			<append>modules=modules.pci</append>
@@ -28,7 +28,7 @@
 		<!-- keep this entry to create an array ref -->
 		<entry></entry>
                <tocopy name="pcimap">
-		       <file>/home/bcd/build_bcd/pieces/3/x86_64/isolinux/modules.pcimap</file>
+		       <file>/home/bcd/build_bcd/pieces/cauldron/x86_64/isolinux/modules.pcimap</file>
                 </tocopy>
                 <tocopy name="ids">
                         <file>/usr/share/pci.ids</file>
@@ -128,9 +128,9 @@
 	</media>
 
 	<mediainfo desc="All files relatives to media_info dir">
-	        <version>3</version>
+	        <version>4-beta1</version>
 		<!-- set fullpath if youy want to use an files in a non MDV repositery -->
-                <fullpath>/home/bcd/build_bcd/pieces/3/x86_64/media/media_info</fullpath>
+                <fullpath>/home/bcd/build_bcd/pieces/cauldron/x86_64/media/media_info</fullpath>
 		<mediainfo_dir>media/media_info</mediainfo_dir>
 		<rpmsrate>rpmsrate</rpmsrate>
 		<compssusers>compssUsers.pl</compssusers>
@@ -153,7 +153,7 @@
 		<minor>1</minor>
 		<subversion>1</subversion>
 		<product>mageia-dual</product>
-		<branch>Official</branch>
+		<branch>Devel</branch>
 		<type>basic</type>
 		<!-- dual arch not yet supported -->
 		<dualarch>no</dualarch>
@@ -165,11 +165,11 @@
 		<synthesis>yes</synthesis>
 		<header desc="Iso header info">
 			<systemid>Mageia</systemid>
-			<volumeid>Mageia - mageia dual 3</volumeid>
-			<volumesetid>Mageia - 3</volumesetid>
+			<volumeid>Mageia - mageia dual 4 beta 1</volumeid>
+			<volumesetid>Mageia - 4 beta 1</volumesetid>
 			<publisherid>Mageia.Org</publisherid>
 			<datapreparer>Mageia BCD</datapreparer>
-			<applicationid>mageia-dual - 3</applicationid>
+			<applicationid>mageia-dual - 4 beta 1</applicationid>
 			<copyrightid>Mageia.Org</copyrightid>
 		</header>
                 <isohybrid>
diff --git a/dvd_free-i586.xml b/dvd_free-i586.xml
index c70478b..9745750 100644
--- a/dvd_free-i586.xml
+++ b/dvd_free-i586.xml
@@ -4,7 +4,7 @@
 	<nameid>Mageia</nameid>
 	<nb_fork>10</nb_fork>
 	<!-- you must specify on wich distrib this iso will be built -->
-	<based_on>3</based_on>
+	<based_on>cauldron</based_on>
 	<!-- -->
 	<support>DVD</support>
 	<arch>i586</arch>
@@ -19,18 +19,18 @@
 	<chroot_media_exclude>Updates Testing</chroot_media_exclude>
 	<isolinux desc="isolinux info">
 		<!--<defaultpath>isolinux</defaultpath>-->
-		<fullpath>/home/bcd/build_bcd/pieces/3/i586/isolinux</fullpath>
+		<fullpath>/home/bcd/build_bcd/pieces/cauldron/i586/isolinux</fullpath>
 		<!-- add hdt entry in syslinux.cfg -->
 		<entry name="hdt" desc="Main media">
-			<bin>/home/bcd/build_bcd/pieces/3/i586/isolinux/hdt.c32</bin>
+			<bin>/home/bcd/build_bcd/pieces/cauldron/i586/isolinux/hdt.c32</bin>
 			<label>hdt</label>
 			<kernel>hdt.c32</kernel>
-			<append>modules=modules.pci</append>
+			<append>modules_alias=modules.ali</append>
 		</entry>
 		<!-- keep this entry to create an array ref -->
 		<entry></entry>
 		<tocopy name="pcimap">
-			<file>/home/bcd/build_bcd/pieces/3/i586/isolinux//modules.pcimap</file>
+			<file>/home/bcd/build_bcd/pieces/iso/dual/isolinux/modules.alias</file>
 		</tocopy>
 		<tocopy name="ids">
 			<file>/usr/share/pci.ids</file>	
@@ -142,9 +142,9 @@
 	</media>
 
 	<mediainfo desc="All files relatives to media_info dir">
-	        <version>3</version>
+	        <version>4-beta1</version>
 		<!-- set fullpath if you want to use an files in a non MDV repositery -->
-		<fullpath>/home/bcd/build_bcd/pieces/3/i586/media/media_info</fullpath>
+		<fullpath>/home/bcd/build_bcd/pieces/cauldron/i586/media/media_info</fullpath>
 		<mediainfo_dir>media/media_info</mediainfo_dir>
 		<rpmsrate>rpmsrate</rpmsrate>
 		<compssusers>compssUsers.pl</compssusers>
@@ -166,7 +166,7 @@
 		<minor>1</minor>
 		<subversion>1</subversion>
 		<product>Free</product>
-		<branch>Official</branch>
+		<branch>Devel</branch>
 		<type>basic</type>
 		<!-- dual arch not yet supported -->
 		<dualarch>no</dualarch>
@@ -178,11 +178,11 @@
 		<synthesis>yes</synthesis>
 		<header desc="Iso header info">
 			<systemid>Mageia</systemid>
-			<volumeid>Mageia-3-i586</volumeid>
-			<volumesetid>Mageia 3 - i586 DVD</volumesetid>
+			<volumeid>Mageia-4-beta1-i586</volumeid>
+			<volumesetid>Mageia 4 beta 1 - i586 DVD</volumesetid>
 			<publisherid>Mageia</publisherid>
 			<datapreparer>Mageia BCD</datapreparer>
-			<applicationid>Mageia 3</applicationid>
+			<applicationid>Mageia 4 beta 1 </applicationid>
 			<copyrightid>Mageia</copyrightid>
 		</header>
                 <isohybrid>
diff --git a/dvd_free-x86_64.xml b/dvd_free-x86_64.xml
index bf5da08..5cf94c3 100644
--- a/dvd_free-x86_64.xml
+++ b/dvd_free-x86_64.xml
@@ -4,7 +4,7 @@
 	<nameid>Mageia</nameid>
 	<nb_fork>10</nb_fork>
 	<!-- you must specify on wich distrib this iso will be built -->
-	<based_on>3</based_on>
+	<based_on>cauldron</based_on>
 	<!-- -->
 	<support>DVD</support>
 	<arch>x86_64</arch>
@@ -19,10 +19,10 @@
 	<chroot_media_exclude>Updates Testing</chroot_media_exclude>
 	<isolinux desc="isolinux info">
 		<!--<defaultpath>isolinux</defaultpath>-->
-		<fullpath>/home/bcd/build_bcd/pieces/3/x86_64/isolinux</fullpath>
+		<fullpath>/home/bcd/build_bcd/pieces/cauldron/x86_64/isolinux</fullpath>
 		<!-- add hdt entry in syslinux.cfg -->
 		<entry name="hdt" desc="Main media">
-			<bin>/home/bcd/build_bcd/pieces/3/x86_64/isolinux/hdt.c32</bin>
+			<bin>/home/bcd/build_bcd/pieces/cauldron/x86_64/isolinux/hdt.c32</bin>
 			<label>hdt</label>
 			<kernel>hdt.c32</kernel>
 			<append>modules=modules.pci</append>
@@ -30,7 +30,7 @@
 		<!-- keep this entry to create an array ref -->
 		<entry></entry>
 		<tocopy name="pcimap">
-			<file>/home/bcd/build_bcd/pieces/3/x86_64/isolinux//modules.pcimap</file>
+			<file>/home/bcd/build_bcd/pieces/cauldron/x86_64/isolinux//modules.pcimap</file>
 		</tocopy>
 		<tocopy name="ids">
 			<file>/usr/share/pci.ids</file>	
@@ -143,9 +143,9 @@
 	</media>
 
 	<mediainfo desc="All files relatives to media_info dir">
-	        <version>3</version>
+	        <version>4-beta1</version>
 		<!-- set fullpath if you want to use an files in a non MDV repositery -->
-		<fullpath>/home/bcd/build_bcd/pieces/3/x86_64/media/media_info</fullpath>
+		<fullpath>/home/bcd/build_bcd/pieces/cauldron/x86_64/media/media_info</fullpath>
 		<mediainfo_dir>media/media_info</mediainfo_dir>
 		<rpmsrate>rpmsrate</rpmsrate>
 		<compssusers>compssUsers.pl</compssusers>
@@ -167,7 +167,7 @@
 		<minor>1</minor>
 		<subversion>1</subversion>
 		<product>Free</product>
-		<branch>Official</branch>
+		<branch>Devel</branch>
 		<type>basic</type>
 		<!-- dual arch not yet supported -->
 		<dualarch>no</dualarch>
@@ -179,11 +179,11 @@
 		<synthesis>yes</synthesis>
 		<header desc="Iso header info">
 			<systemid>Mageia</systemid>
-			<volumeid>Mageia-3-x86_64</volumeid>
-			<volumesetid>Mageia 3 - x86_64 DVD</volumesetid>
+			<volumeid>Mageia-4-beta1-x86_64</volumeid>
+			<volumesetid>Mageia 4 beta 1 - x86_64 DVD</volumesetid>
 			<publisherid>Mageia</publisherid>
 			<datapreparer>Mageia BCD</datapreparer>
-			<applicationid>Mageia 3</applicationid>
+			<applicationid>Mageia 4 beta 1</applicationid>
 			<copyrightid>Mageia</copyrightid>
 		</header>
                 <isohybrid>
diff --git a/lists/basesystem_mini b/lists/basesystem_mini
index 228292a..299d526 100644
--- a/lists/basesystem_mini
+++ b/lists/basesystem_mini
@@ -1,7 +1,6 @@
 # MANDATORY PACKAGES !!
 glibc
 nscd
-kernel-headers
 setup
 makedev
 kbd
@@ -70,7 +69,6 @@ lsof
 gnupg
 file
 monitor-edid
-rsyslog
 urpmi
 aria2
 iputils
@@ -103,7 +101,8 @@ synaptics
 drakx-kbd-mouse-x11
 drakx-net
 drakx-net-text
-drakxtools-curses
+rpmdrake
+drakconf
 brltty
 jfsutils
 dosfstools
@@ -117,8 +116,6 @@ sharutils
 sudo
 lvm2
 mdadm
-task-lxde
-mageia-lxde-config
 x11-driver-video
 x11-driver-video-vboxvideo
 
@@ -126,21 +123,63 @@ bridge-utils
 bash-completion
 screen
 iftop
-midori
-lxdm
-xdm
-mageia-gfxboot-theme
 vnstat
 libfuse2
 aoss
-rpmdrake
-virtualbox-guest-additions
 mgaonline
 shorewall-ipv6
-openbox
 gvfs
-vim
+vim-enhanced
 fonts-ttf-dejavu
-smartmontools
 tcpdump
 netsat
+mageia-gfxboot-theme
+task-xfce
+liblightdm-gobject1_0
+lightdm
+lightdm-gtk-greeter-common
+lightdm-gtk2-greeter
+abattis-cantarell-fonts
+adwaita-cursor-theme
+adwaita-gtk2-theme
+adwaita-gtk3-theme
+fontpackages-filesystem
+gnome-icon-theme
+oxygen-icon-theme
+gnome-themes-standard
+firefox
+smartmontools
+
+task-lamp*
+lftp 
+mirrordir 
+rsync
+proftpd
+iproute2 
+routed 
+iptables 
+postfix
+dhcp-server
+bind
+bind-utils
+samba-server
+samba-client
+squid
+squidGuard
+postgresql9.3
+postgresql9.3-server
+procinfo 
+psacct
+lsof 
+swatch 
+tcpdump 
+traceroute
+nmap 
+lm_sensors
+wireshark 
+airsnort 
+ngrep 
+netstat-nat
+iftop
+logcheck
+
diff --git a/lists/exclude b/lists/exclude
index 82a20a1..8e0b7d8 100644
--- a/lists/exclude
+++ b/lists/exclude
@@ -149,3 +149,6 @@ yofrankie-bge
 al-anvar
 celtx-
 bijiben
+
+kernel-source
+qt4-doc
diff --git a/lists/exclude_mini b/lists/exclude_mini
index 3afa526..8bdb2f5 100644
--- a/lists/exclude_mini
+++ b/lists/exclude_mini
@@ -17,16 +17,6 @@ kernel-source
 kernel-desktop-devel
 libcairo-xcb2
 lib64cairo-xcb2
-glibc-devel
-gcc
-vboxadditions-kernel-3.5.2*
-vboxadditions-kernel-3.5.3-desktop-1.mga3-4.1.18-7
-vboxadditions-kernel-3.5.3-desktop586-1.mga3-4.1.18-7.mga3.i586.rpm
-vboxadditions-kernel-3.5.3-desktop586-2.mga3-4.1.18-8.mga3.i586.rpm
-vboxadditions-kernel-3.5.3-netbook-1.mga3-4.1.18-7.mga3.i586.rpm
-vboxadditions-kernel-3.5.3-netbook-2.mga3-4.1.18-8.mga3.i586.rpm
-vboxadditions-kernel-3.5.3-server-1.mga3-4.1.18-7.mga3.i586.rpm
-vboxadditions-kernel-3.5.3-server-2.mga3-4.1.18-8.mga3.i586.rpm
 firefox-beta
 firefox-aurora
 celt*
@@ -38,4 +28,3 @@ x11-font-bh-type1
 nvidia-nsight
 nvidia-visual-profiler
 python3
-syslog-ng
diff --git a/lists/input_cat b/lists/input_cat
index 28e169f..1c5609e 100644
--- a/lists/input_cat
+++ b/lists/input_cat
@@ -264,6 +264,7 @@ lightdm
 lightdm-gtk-greeter
 lightdm-kde-greeter
 lightdm-razorqt-greeter
+lightdm-gtk-greeter-common
 pentaho-reporting-flow-engine
 perl-Test-Mock-LWP
 plasma-applet-kimpanel-backend-ibus
@@ -282,3 +283,11 @@ liblayout
 pentaho-reporting-flow-engine
 
 java-gcj-compat
+gnome-session
+gnome-classic-session
+
+anjuta
+cinnamon
+gnome-terminal-nautilus
+mageiawelcome
+usbutils
diff --git a/lists/languages b/lists/languages
index d67f9ee..fb9d1f8 100644
--- a/lists/languages
+++ b/lists/languages
@@ -1,15 +1,29 @@
+locales-be
 locales-bg
+locales-ca
 locales-de
 locales-en
 locales-es
 locales-fr
+locales-it
 locales-mk
 locales-pl
 locales-pt
 locales-ru
 locales-sv
-locales-be
 locales-uk
-locales-ca
-locales-it
 
+firefox-be
+firefox-bg
+firefox-ca
+firefox-de
+firefox-en_GB
+firefox-es_ES
+firefox-fr
+firefox-it
+firefox-mk
+firefox-pl
+firefox-pt_BR
+firefox-pt_PT
+firefox-ru
+firefox-uk