6 files changed, 48 insertions, 101 deletions
diff --git a/lists/basesystem_mini b/lists/basesystem_mini
index f8e2a4a..d000753 100644
--- a/lists/basesystem_mini
+++ b/lists/basesystem_mini
@@ -56,6 +56,8 @@ dvd+rw-tools
 cdrkit
 rsync
 grub
+grub2
+os-prober
 acpi
 acpid
 aumix
@@ -143,3 +145,4 @@ aoss
 rpmdrake
 virtualbox-guest-additions
 mgaonline
+
diff --git a/lists/exclude b/lists/exclude
index e6787cf..3b948d8 100644
--- a/lists/exclude
+++ b/lists/exclude
@@ -134,3 +134,14 @@ lilypond
 
 scilab
 xguest
+
+firefox-aurora
+firefox-beta
+flash-player*
+get-skype
+skype4pidgin
+x11-font-adobe-utopia-100dpi
+x11-font-adobe-utopia-75dpi
+x11-font-adobe-utopia-type1
+x11-font-bh-type1
+hunspell-gsc
diff --git a/lists/exclude_mini b/lists/exclude_mini
index 6626dfd..3d1536b 100644
--- a/lists/exclude_mini
+++ b/lists/exclude_mini
@@ -28,4 +28,10 @@ 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*
+flash-player*
+get-skype
+skype4pidgin
+x11-font-adobe*
+x11-font-bh-type1
diff --git a/lists/input_cat b/lists/input_cat
index 9df94d8..c88cbc2 100644
--- a/lists/input_cat
+++ b/lists/input_cat
@@ -254,3 +254,5 @@ caribou
 net_monitor
 util-linux
 rsyslog
+grub2
+os-prober
diff --git a/lists/input_main b/lists/input_main
index efe0001..2032cd7 100644
--- a/lists/input_main
+++ b/lists/input_main
@@ -3,6 +3,7 @@ kernel-server-latest
 # MANDATORY PACKAGES !!
 kbd
 grub
+grub2
 acpi
 acpid
 hwreport
diff --git a/lists/input_nonfree b/lists/input_nonfree
index 8a271ea..e39e284 100644
--- a/lists/input_nonfree
+++ b/lists/input_nonfree
@@ -1,131 +1,55 @@
-a320raid
-adp94xx
-adpahci
 atmel-firmware
 bluez-firmware
+broadcom-wl-kernel-*
+broadcom-wl-kernel-desktop586-latest
 broadcom-wl-kernel-desktop-latest
 broadcom-wl-kernel-server-latest
-#cg
-#cg-examples
-clustalw
-clustalx
-dark-oberon
 dkms-broadcom-wl
-dkms-fcdsl
-dkms-fcdsl2
-dkms-fcdslsl
-dkms-fcdslslusb
-dkms-fcdslusb
-dkms-fcdslusb2
-dkms-fcdslusba
-dkms-fcpci
-dkms-fcusb
-dkms-fcusb2
 dkms-fglrx
-dkms-fxusb
-dkms-fxusb_CZ
-dkms-hsfmodem
-dkms-madwifi
 dkms-nvidia173
-dkms-nvidia96xx
+dkms-nvidia304
 dkms-nvidia-current
-dkms-unicorn
-dkms-vpnclient
-drcss
-emacs-mpg123
 fglrx-control-center
 fglrx-devel
+fglrx-kernel-*
+fglrx-kernel-desktop586-latest
 fglrx-kernel-desktop-latest
 fglrx-kernel-server-latest
-flvstreamer
-freecol
-get_iplayer
-google-apps-installer
-hsfmodem
-hsfmodem-doc
-hsfmodem-kernel-desktop-latest
-hsfmodem-kernel-server-latest
+fglrx-opencl
 ipw2100-firmware
 ipw2200-firmware
-ipw3945d
-ipw3945-ucode
-iwlwifi-1000-ucode
 iwlwifi-3945-ucode
 iwlwifi-4965-ucode
-iwlwifi-5000-ucode
-iwlwifi-5150-ucode
-iwlwifi-6000-ucode
 iwlwifi-agn-ucode
-java-1.5.0-sun
-java-1.5.0-sun-alsa
-java-1.5.0-sun-demo
-java-1.5.0-sun-devel
-java-1.5.0-sun-fonts
-java-1.5.0-sun-jdbc
-java-1.5.0-sun-src
-java-1.6.0-sun
-java-1.6.0-sun-alsa
-java-1.6.0-sun-demo
-java-1.6.0-sun-devel
-java-1.6.0-sun-fonts
-java-1.6.0-sun-jdbc
-java-1.6.0-sun-plugin
-java-1.6.0-sun-src
-kernel-firmware-extra
-lib64openmotif4
-lib64openmotif-devel
-lie
-madwifi
-madwifi-kernel-desktop-latest
-madwifi-kernel-server-latest
-megacli
+kernel-firmware-nonfree
 microcode
+nvidia173-cuda
 nvidia173-devel
 nvidia173-doc-html
-nvidia173-kernel-desktop-latest
-nvidia173-kernel-server-latest
-nvidia96xx-devel
-nvidia96xx-doc-html
-nvidia96xx-kernel-desktop-latest
-nvidia96xx-kernel-server-latest
-nvidia-cuda-profiler
+nvidia173-kernel-*
+nvidia304-cuda-opencl
+nvidia304-devel
+nvidia304-doc-html
+nvidia304-kernel-*
+nvidia304-kernel-desktop586-latest
+nvidia304-kernel-desktop-latest
+nvidia304-kernel-server-latest
+nvidia-compute-profiler
 nvidia-cuda-toolkit
 nvidia-cuda-toolkit-devel
+nvidia-current-cuda-opencl
 nvidia-current-devel
 nvidia-current-doc-html
+nvidia-current-kernel-*
+nvidia-current-kernel-desktop586-latest
 nvidia-current-kernel-desktop-latest
 nvidia-current-kernel-server-latest
-openmotif
-prism54-firmware
-python-pycuda
-radeon-rlc-firmware
-rt2860-firmware
-rt2870-firmware
-rt3090-firmware
-rt61-firmware
-rt73-firmware
-shareware_doom_iwad
+radeon-firmware
+ralink-firmware
+rtlwifi-firmware
 speedtouch-firmware
-#taktuk2
-#taktuk2-devel
-#taktuk2-viewnet
-ueagle-firmware
-unicorn
-unrar
-vpnclient
-vpnclient-kernel-desktop-latest
-vpnclient-kernel-server-latest
+vaapi-driver-fglrx
 x11-driver-video-fglrx
 x11-driver-video-nvidia173
-x11-driver-video-nvidia96xx
+x11-driver-video-nvidia304
 x11-driver-video-nvidia-current
-x11-driver-video-psb-binary-blobs
-x11-driver-video-sisdrv
-x11-font-adobe-utopia-100dpi
-x11-font-adobe-utopia-75dpi
-x11-font-adobe-utopia-type1
-x11-font-bh-ttf
-x11-font-bh-type1
-x11-font-ibm-type1
-x11-font-misc-meltho
-zd1201-firmware