[xorg] update config

3 files changed, 64 insertions, 66 deletions

diff --git a/remote/modules/xorg/xorg.conf b/remote/modules/xorg/xorg.conf
index b1589b80..a40d3041 100644
--- a/remote/modules/xorg/xorg.conf
+++ b/remote/modules/xorg/xorg.conf
@@ -1,50 +1,18 @@
-REQUIRED_CONTENT_PACKAGES="	xserver-xorg
-			xserver-xorg-core
-			libgl1-mesa-dri
-			libgl1-mesa-glx
-			xkb-data
-			x11-xkb-utils
-			x11-xserver-utils
-			xserver-xorg-input-evdev
-			xserver-xorg-input-mouse
-			xserver-xorg-input-vmmouse
-			xserver-xorg-video-intel
-			@xserver-xorg-video-openchrome     
-			@xserver-xorg-video-savage         
-			@xserver-xorg-video-trident
-			xserver-xorg-video-ati            
-			@xserver-xorg-video-mach64         
-			@xserver-xorg-video-qxl            
-			@xserver-xorg-video-siliconmotion  
-			xserver-xorg-video-vesa
-			@xserver-xorg-video-cirrus         
-			xserver-xorg-video-mga            
-			@xserver-xorg-video-r128           
-			xserver-xorg-video-sis            
-			xserver-xorg-video-vmware
-			xserver-xorg-video-fbdev          
-			@xserver-xorg-video-neomagic       
-			xserver-xorg-video-radeon         
-			xserver-xorg-video-sisusb         
-			@xserver-xorg-video-geode          
-			xserver-xorg-video-nouveau        
-			@xserver-xorg-video-s3             
-			@xserver-xorg-video-tdfx"   
-REQUIRED_BINARIES="	Xorg
+REQUIRED_BINARIES="	
+			X
+			Xorg
 			gtf
-			cvt 
-			X 
-			xkbcomp 
+			cvt  
+			setxkbmap 
 			xkbvleds 
 			xkbprint 
-			setxkbmap 
 			xkbwatch 
 			xkbbell 
 			xkbevd 
+			xrandr
 			vmmouse_detect
-			xrandr"
+"
 REQUIRED_DIRECTORIES="
-			/usr/lib 
 			/usr/share/X11
 "
 REQUIRED_FILES=""
diff --git a/remote/modules/xorg/xorg.conf.zypper b/remote/modules/xorg/xorg.conf.opensuse
index b48452fb..a91aca4d 100644
--- a/remote/modules/xorg/xorg.conf.zypper
+++ b/remote/modules/xorg/xorg.conf.opensuse
@@ -36,32 +36,21 @@ REQUIRED_CONTENT_PACKAGES="
 			xrandr
 "
 REQUIRED_LIBRARIES="
-	libI810XvMC
-	libxcb-glx
-	libIntelXvMC
-	i965_dri
-	vmwgfx_dri
-	i915_dri
-	i965_drv_video
-	libpixman-1
+			libI810XvMC
+			libxcb-glx
+			libIntelXvMC
+			i965_dri
+			vmwgfx_dri
+			i915_dri
+			i965_drv_video
+			libpixman-1
 "
-REQUIRED_BINARIES="	Xorg
-			gtf
-			cvt 
-			X 
-			xkbvleds 
-			xkbprint 
-			setxkbmap 
-			xkbwatch 
-			xkbbell 
-			xkbevd 
-			vmmouse_detect
-			xrandr"
-REQUIRED_DIRECTORIES="
-	/usr/lib/udev
-	/usr/$LIB64/xorg
-	/usr/bin
-	/usr/share/X11
-	/usr/share/fonts
+REQUIRED_DIRECTORIES+="
+			/usr/bin
+			/usr/lib/udev
+			/usr/$LIB64/xorg
+			/usr/share/fonts
+"
+REQUIRED_FILES="
+			/var/adm/fillup-templates/sysconfig.displaymanager-kdm
 "
-REQUIRED_FILES="/var/adm/fillup-templates/sysconfig.displaymanager-kdm"
diff --git a/remote/modules/xorg/xorg.conf.ubuntu b/remote/modules/xorg/xorg.conf.ubuntu
new file mode 100644
index 00000000..1712f520
--- /dev/null
+++ b/remote/modules/xorg/xorg.conf.ubuntu
@@ -0,0 +1,41 @@
+REQUIRED_CONTENT_PACKAGES="	
+			xserver-xorg
+			xserver-xorg-core
+			libgl1-mesa-dri
+			libgl1-mesa-glx
+			xkb-data
+			x11-xkb-utils
+			x11-xserver-utils
+			xserver-xorg-input-evdev
+			xserver-xorg-input-mouse
+			xserver-xorg-input-vmmouse
+			xserver-xorg-video-intel
+			xserver-xorg-video-ati            
+			xserver-xorg-video-vesa
+			xserver-xorg-video-mga            
+			xserver-xorg-video-sis            
+			xserver-xorg-video-vmware
+			xserver-xorg-video-fbdev          
+			xserver-xorg-video-radeon         
+			xserver-xorg-video-sisusb         
+			xserver-xorg-video-nouveau        
+			@xserver-xorg-video-openchrome     
+			@xserver-xorg-video-savage         
+			@xserver-xorg-video-trident
+			@xserver-xorg-video-mach64         
+			@xserver-xorg-video-qxl            
+			@xserver-xorg-video-siliconmotion  
+			@xserver-xorg-video-cirrus         
+			@xserver-xorg-video-r128           
+			@xserver-xorg-video-neomagic       
+			@xserver-xorg-video-geode          
+			@xserver-xorg-video-s3             
+			@xserver-xorg-video-tdfx
+"
+REQUIRED_BINARIES+="	
+			xkbcomp 
+"
+REQUIRED_DIRECTORIES+="
+			/usr/lib 
+"
+REQUIRED_FILES=""