modified: xml/D5000-server.xml

modified:   xml/D5000-workstation.xml

xml/D5000-server.xml

@@ -55,6 +55,7 @@
 
 <package name='db'/>
 
+
 <package name='dbus'/>
 
 <package name='dbus-glib-1'/>
@@ -87,7 +88,6 @@
 
 <package name='flex'/>
 
-<package name='fontconfig'/>
 
 <package name='gawk'/>
 
@@ -101,7 +101,6 @@
 
 <package name='gettext'/>
 
-<package name='glib2'/>
 <package name='glibc'/>
 
 <package name='glibmm'>
@@ -145,11 +144,8 @@
 
 <package name='kbd'/>
 
-<package name='libjpeg'/>
 
-<package name='libtiff'/>
 
-<package name='libungif'/>
 
 <package name='kernel-header'/>
 
@@ -175,7 +171,6 @@
 
 <package name='libpcap'/>
 
-<package name='libpng'/>
 
 <package name='libpthread-stubs'/>
 
@@ -251,6 +246,7 @@
 
 <package name='mysql'/>
 
+
 <package name='nail'/>
 
 <package name='nasm'/>
@@ -376,6 +372,8 @@
 
 <package name='tar'/>
 
+<package name='tar_i686_lib'/>
+
 <package name='tcl'/>
 
 <package name='tcp_wrappers'/>
@@ -436,8 +434,6 @@
 <package name='xfsprogs'/>
 
 
-<package name='xorg-x11-libSM'/>
-<package name='xorg-x11-libXpm'/>
 
 <package name='zip'/>
 
@@ -506,6 +502,8 @@
 <package name='libstdc++-compat_i686_lib'/>
 <package name='libtool_i686_lib'/>
 <package name='libsigc++_i686_lib'/>
+<package name='Compress-Zlib'/>
+<package name='Compress-Raw-Zlib'/>
 <package name='Compress-Zlib_i686_lib'/>
 <package name='Compress-Raw-Zlib_i686_lib'/>
 <package name='IO-Compress-Base_i686_lib'/>
@@ -576,7 +574,6 @@
   <including install='mandatory' package='libaio'/>
   <including install='mandatory' package='libarchive'/>
   <including install='mandatory' package='libcap'/>
-  <including install='mandatory' package='libcgroup'/>
   <including install='mandatory' package='libusb'/>
   <including install='mandatory' package='libxml2'/>
   <including install='mandatory' package='libxslt'/>
@@ -630,6 +627,7 @@
   <including install='mandatory' package='sysstat'/>
   <including install='mandatory' package='sysvinit'/>
   <including install='mandatory' package='tar'/>
+  <including install='mandatory' package='tar_i686_lib'/>
   <including install='mandatory' package='tcl'/>
   <including install='mandatory' package='tcp_wrappers'/>
   <including install='mandatory' package='tcsh'/>
@@ -678,6 +676,7 @@ group name='development'>
   <including install='mandatory' package='libtool'/>
   <including install='mandatory' package='m4'/>
   <including install='mandatory' package='make'/>
+  <including install='mandatory' package='nail'/>
   <including install='mandatory' package='nasm'/>
   <including install='mandatory' package='strace'/>
   <including install='mandatory' package='tls'/>
@@ -690,17 +689,14 @@ group name='development'>
     图形类软件包分为必选包和可选包，当选择安装该类后，必选包是默认安装的，可选包可以自由选择安装。
     </description>
 -->
-  <including install='mandatory' package='glib2'/>
-  <including install='mandatory' package='fontconfig'/>
   <including install='mandatory' package='SDL'/>
   <including install='mandatory' package='tk'/>
   <including install='mandatory' package='windowmaker'/>
   <!-- xorg related packages -->
-  <including install='mandatory' package='xorg-x11-libSM'/>
-  <including install='mandatory' package='xorg-x11-libXpm'/>
   <including install='mandatory' package='libxcb'/>
   <including install='mandatory' package='libpthread-stubs'/>
   <including install='mandatory' package='Mesa'/>
+  <including install='mandatory' package='libcgroup'/>
   <including install='mandatory' package='libdrm'/>
 
 <!--
@@ -713,18 +709,6 @@ group name='development'>
   <including install='mandatory' package='dbus'/>
   <including install='mandatory' package='dbus-glib-1'/>
 
-<!-->
-<group name='multi-media'>
-  <description>
-    多媒体类包括各种媒体库。
-    多媒体类都是可选软件包，可以自由选择安装。
-    </description>
--->
-  <including install='mandatory' package='libjpeg'/>
-  <including install='mandatory' package='libtiff'/>
-  <including install='mandatory' package='libpng'/>
-  <including install='mandatory' package='libungif'/>
-
 <!-->
 <group name='network_service'>
   <description>
@@ -741,7 +725,6 @@ group name='development'>
   <including install='mandatory' package='linux-identd'/>
   <including install='mandatory' package='mod_perl'/>
   <including install='mandatory' package='mod_php'/>
-  <including install='mandatory' package='nail'/>
   <including install='mandatory' package='net-snmp'/>
   <including install='mandatory' package='netkit-rsh'/>
   <including install='mandatory' package='netkit-telnet'/>
@@ -836,7 +819,9 @@ group name='development'>
     <including install='mandatory' package='libstdc++-compat_i686_lib'/>
     <including install='mandatory' package='libtool_i686_lib'/>
     <including install='mandatory' package='libsigc++_i686_lib'/>
+    <including install='mandatory' package='Compress-Zlib'/>
     <including install='mandatory' package='Compress-Zlib_i686_lib'/>
+    <including install='mandatory' package='Compress-Raw-Zlib'/>
     <including install='mandatory' package='Compress-Raw-Zlib_i686_lib'/>
     <including install='mandatory' package='IO-Compress-Base_i686_lib'/>
     <including install='mandatory' package='IO-Compress-Zlib_i686_lib'/>

xml/D5000-workstation.xml

@@ -144,7 +144,6 @@
 <package name='gtk2_i686_lib'/>
 
 <package name='gpm'/>
-<package name='gpm_i686_lib'/>
 
 <package name='gettext'/>
 <package name='glib1'/>
@@ -493,6 +492,7 @@
 
 <package name='tar'/>
 
+<package name='tar_i686_lib'/>
 <package name='tcl'/>
 
 <package name='tcp_wrappers'/>
@@ -564,6 +564,7 @@
 
 <package name='x11-fonts-chinese'/>
 
+<package name='xorg-x11-doc'/>
 
 <package name='xorg-x11-xserver'/>
 
@@ -692,6 +693,8 @@
 <package name='libidl_i686_lib'/>
 <package name='libstdc++-compat_i686_lib'/>
 <package name='libsigc++_i686_lib'/>
+<package name='Compress-Zlib'/>
+<package name='Compress-Raw-Zlib'/>
 <package name='Compress-Zlib_i686_lib'/>
 <package name='Compress-Raw-Zlib_i686_lib'/>
 <package name='IO-Compress-Base_i686_lib'/>
@@ -813,7 +816,6 @@
   <including install='mandatory' package='gtk2'/>
   <including install='mandatory' package='gtk2_i686_lib'/>
   <including install='mandatory' package='gpm'/>
-  <including install='mandatory' package='gpm_i686_lib'/>
   <including install='mandatory' package='gettext'/>
   <including install='mandatory' package='glibc'/>
   <including install='mandatory' package='glitz'/>
@@ -938,6 +940,7 @@
   <including install='mandatory' package='sysstat'/>
   <including install='mandatory' package='sysvinit'/>
   <including install='mandatory' package='tar'/>
+  <including install='mandatory' package='tar_i686_lib'/>
   <including install='mandatory' package='tcl'/>
   <including install='mandatory' package='tcp_wrappers'/>
   <including install='mandatory' package='tcsh'/>
@@ -1016,6 +1019,7 @@ group name='development'>
   <including install='mandatory' package='windowmaker'/>
   <including install='mandatory' package='wireshark'/>
   <!-- xorg related packages -->
+  <including install='mandatory' package='xorg-x11-doc'/>
   <including install='mandatory' package='xorg-x11-xserver'/>
   <including install='mandatory' package='xorg-x11-xserver_i686_lib'/>
   <including install='mandatory' package='xorg-x11-xcursor-themes'/>
@@ -1266,6 +1270,8 @@ group name='development'>
     <including install='mandatory' package='libidl_i686_lib'/>
     <including install='mandatory' package='libstdc++-compat_i686_lib'/>
     <including install='mandatory' package='libsigc++_i686_lib'/>
+    <including install='mandatory' package='Compress-Zlib'/>
+    <including install='mandatory' package='Compress-Raw-Zlib'/>
     <including install='mandatory' package='Compress-Zlib_i686_lib'/>
     <including install='mandatory' package='Compress-Raw-Zlib_i686_lib'/>
     <including install='mandatory' package='IO-Compress-Base_i686_lib'/>