bootdisk/trunk/batch-installer/ui/data/groups

[hawk]

Author: hawk
Date: Sun Jan 22 20:33:24 2006
New Revision: 6882

Modified:
   bootdisk/trunk/batch-installer/ui/data/groups
Log:
- killed duplicated kde-splash-Default
- killed conflict between php-sybase and php-sybase-ct
- we can't install X11-driver-nvidia-*, it causes conflicts :(
- fixed package group names for apache1 and php4
- cleanup


Modified: bootdisk/trunk/batch-installer/ui/data/groups
==============================================================================
--- bootdisk/trunk/batch-installer/ui/data/groups	(original)
+++ bootdisk/trunk/batch-installer/ui/data/groups	Sun Jan 22 20:33:24 2006
@@ -258,7 +258,7 @@
 !apache-suexec
 !apache-tools
 
-* 0 apache `nls "Apache 1.3.x web server"`
+* 0 apache1 `nls "Apache 1.3.x web server"`
 apache1
 !apache1-apxs
 !apache1-doc
@@ -362,8 +362,7 @@
 !php-soap
 !php-sockets
 !php-sqlite
-!php-sybase
-!php-sybase-ct
+@!php-sybase php-sybase-ct php-sybase
 !php-sysvmsg
 !php-sysvsem
 !php-sysvshm
@@ -376,7 +375,7 @@
 !php-xsl
 !php-zlib
 
-* 0 php `nls "PHP 4.x for apache"`
+* 0 php4 `nls "PHP 4.x for apache"`
 @!apache-mod_php apache-mod_php4 apache1-mod_php4
 !php4-bcmath
 !php4-bzip2
@@ -433,8 +432,7 @@
 !php4-shmop
 !php4-snmp
 !php4-sockets
-!php4-sybase
-!php4-sybase-ct
+@!php4-sybase php4-sybase-ct php4-sybase
 !php4-sysvmsg
 !php4-sysvsem
 !php4-sysvshm
@@ -590,10 +588,6 @@
 X11-driver-neomagic
 X11-driver-nsc
 X11-driver-nv
-X11-driver-nvidia
-X11-driver-nvidia-legacy
-X11-driver-nvidia-legacy-progs
-X11-driver-nvidia-progs
 X11-driver-r128
 X11-driver-radeon
 X11-driver-rendition
@@ -1109,9 +1103,7 @@
 kde-decoration-aqua
 kde-decoration-b2
 kde-decoration-baghira
-kde-decoration-baghira-0.6e-2
 kde-decoration-cde
-kde-decoration-common-i18n
 kde-decoration-crystal
 kde-decoration-dotcurve
 kde-decoration-fahrenheit
@@ -1126,7 +1118,7 @@
 kde-decoration-kstep
 kde-decoration-laptop
 kde-decoration-modernsys
-kde-decoration-nvidia-1.0b-1
+kde-decoration-nvidia
 kde-decoration-openlook
 kde-decoration-quartz
 kde-decoration-redmond
@@ -1173,7 +1165,6 @@
 kde-splash-blue-bend
 kde-splash-BlueTribe
 kde-splash-Clock_K
-kde-splash-Default
 kde-splash-Gears
 kde-splash-gears_white
 kde-splash-GNU_CooL
@@ -1209,7 +1200,6 @@
 kde-theme-alloy
 kde-theme-aqua
 kde-theme-baghira
-kde-theme-baghira-0.6e-2
 kde-theme-Bluecurve
 kde-theme-gorilla
 kde-theme-konx