[Debconf-video-commits] r166 - in fai-config: class files/etc files/etc/X11 files/etc/X11/xorg.conf package_config scripts scripts/XORG
holger at alioth.debian.org
holger at alioth.debian.org
Tue Aug 5 16:32:18 UTC 2008
Author: holger
Date: 2008-08-05 16:32:17 +0000 (Tue, 05 Aug 2008)
New Revision: 166
Added:
fai-config/files/etc/X11/
fai-config/files/etc/X11/xorg.conf/
fai-config/files/etc/X11/xorg.conf/mrwhite
fai-config/files/etc/X11/xorg.conf/scratchy
fai-config/files/etc/X11/xorg.conf/selma
fai-config/scripts/XORG/
fai-config/scripts/XORG/10-xorg.conf
Modified:
fai-config/class/28-debconf8-classes
fai-config/package_config/VIDEO
Log:
new class, XORG. + copy xorg.conf for those machines, package config reorg
Modified: fai-config/class/28-debconf8-classes
===================================================================
--- fai-config/class/28-debconf8-classes 2008-08-05 16:02:54 UTC (rev 165)
+++ fai-config/class/28-debconf8-classes 2008-08-05 16:32:17 UTC (rev 166)
@@ -11,6 +11,12 @@
esac
case $HOSTNAME in
+ selma|scratchy|mrwhite)
+ echo "XORG";;
+esac
+
+
+case $HOSTNAME in
daffy)
echo "ENCODING";;
selma|patty|itchy|scratchy)
Added: fai-config/files/etc/X11/xorg.conf/mrwhite
===================================================================
--- fai-config/files/etc/X11/xorg.conf/mrwhite (rev 0)
+++ fai-config/files/etc/X11/xorg.conf/mrwhite 2008-08-05 16:32:17 UTC (rev 166)
@@ -0,0 +1,99 @@
+# /etc/X11/xorg.conf (xorg X Window System server configuration file)
+#
+# This file was generated by dexconf, the Debian X Configuration tool, using
+# values from the debconf database.
+#
+# Edit this file with caution, and see the /etc/X11/xorg.conf manual page.
+# (Type "man /etc/X11/xorg.conf" at the shell prompt.)
+#
+# This file is automatically updated on xserver-xorg package upgrades *only*
+# if it has not been modified since the last upgrade of the xserver-xorg
+# package.
+#
+# If you have edited this file but would like it to be automatically updated
+# again, run the following command:
+# sudo dpkg-reconfigure -phigh xserver-xorg
+
+Section "Files"
+ FontPath "/usr/share/fonts/X11/misc"
+ FontPath "/usr/X11R6/lib/X11/fonts/misc"
+ FontPath "/usr/share/fonts/X11/cyrillic"
+ FontPath "/usr/X11R6/lib/X11/fonts/cyrillic"
+ FontPath "/usr/share/fonts/X11/100dpi/:unscaled"
+ FontPath "/usr/X11R6/lib/X11/fonts/100dpi/:unscaled"
+ FontPath "/usr/share/fonts/X11/75dpi/:unscaled"
+ FontPath "/usr/X11R6/lib/X11/fonts/75dpi/:unscaled"
+ FontPath "/usr/share/fonts/X11/Type1"
+ FontPath "/usr/X11R6/lib/X11/fonts/Type1"
+ FontPath "/usr/share/fonts/X11/100dpi"
+ FontPath "/usr/X11R6/lib/X11/fonts/100dpi"
+ FontPath "/usr/share/fonts/X11/75dpi"
+ FontPath "/usr/X11R6/lib/X11/fonts/75dpi"
+ # path to defoma fonts
+ FontPath "/var/lib/defoma/x-ttcidfont-conf.d/dirs/TrueType"
+EndSection
+
+Section "Module"
+ Load "i2c"
+ Load "bitmap"
+ Load "ddc"
+ Load "dri"
+ Load "extmod"
+ Load "freetype"
+ Load "glx"
+ Load "int10"
+ Load "vbe"
+EndSection
+
+Section "InputDevice"
+ Identifier "Generic Keyboard"
+ Driver "kbd"
+ Option "CoreKeyboard"
+ Option "XkbRules" "xorg"
+ Option "XkbModel" "pc105"
+ Option "XkbLayout" "us"
+EndSection
+
+Section "InputDevice"
+ Identifier "Configured Mouse"
+ Driver "mouse"
+ Option "CorePointer"
+ Option "Device" "/dev/input/mice"
+ Option "Protocol" "ImPS/2"
+ Option "Emulate3Buttons" "true"
+EndSection
+
+Section "Device"
+ Identifier "Generic Video Card"
+ Driver "via"
+ # BusID "PCI:1:0:0"
+EndSection
+
+Section "Monitor"
+ Identifier "Generic Monitor"
+ Option "DPMS"
+# HorizSync 28-51
+# VertRefresh 43-60
+EndSection
+
+Section "Screen"
+ Identifier "Default Screen"
+ Device "Generic Video Card"
+ Monitor "Generic Monitor"
+ DefaultDepth 24
+ SubSection "Display"
+ Depth 24
+ Modes "1280x1024" "1024x768" "800x600" "640x480"
+ EndSubSection
+EndSection
+
+Section "ServerLayout"
+ Identifier "Default Layout"
+ Screen "Default Screen"
+ InputDevice "Generic Keyboard"
+ InputDevice "Configured Mouse"
+EndSection
+
+Section "DRI"
+ Mode 0666
+EndSection
Added: fai-config/files/etc/X11/xorg.conf/scratchy
===================================================================
--- fai-config/files/etc/X11/xorg.conf/scratchy (rev 0)
+++ fai-config/files/etc/X11/xorg.conf/scratchy 2008-08-05 16:32:17 UTC (rev 166)
@@ -0,0 +1,118 @@
+# /etc/X11/xorg.conf (xorg X Window System server configuration file)
+#
+# This file was generated by dexconf, the Debian X Configuration tool, using
+# values from the debconf database.
+#
+# Edit this file with caution, and see the /etc/X11/xorg.conf manual page.
+# (Type "man /etc/X11/xorg.conf" at the shell prompt.)
+#
+# This file is automatically updated on xserver-xorg package upgrades *only*
+# if it has not been modified since the last upgrade of the xserver-xorg
+# package.
+#
+# If you have edited this file but would like it to be automatically updated
+# again, run the following command:
+# sudo dpkg-reconfigure -phigh xserver-xorg
+
+Section "Files"
+ FontPath "/usr/share/fonts/X11/misc"
+ FontPath "/usr/X11R6/lib/X11/fonts/misc"
+ FontPath "/usr/share/fonts/X11/cyrillic"
+ FontPath "/usr/X11R6/lib/X11/fonts/cyrillic"
+ FontPath "/usr/share/fonts/X11/100dpi/:unscaled"
+ FontPath "/usr/X11R6/lib/X11/fonts/100dpi/:unscaled"
+ FontPath "/usr/share/fonts/X11/75dpi/:unscaled"
+ FontPath "/usr/X11R6/lib/X11/fonts/75dpi/:unscaled"
+ FontPath "/usr/share/fonts/X11/Type1"
+ FontPath "/usr/X11R6/lib/X11/fonts/Type1"
+ FontPath "/usr/share/fonts/X11/100dpi"
+ FontPath "/usr/X11R6/lib/X11/fonts/100dpi"
+ FontPath "/usr/share/fonts/X11/75dpi"
+ FontPath "/usr/X11R6/lib/X11/fonts/75dpi"
+ # path to defoma fonts
+ FontPath "/var/lib/defoma/x-ttcidfont-conf.d/dirs/TrueType"
+EndSection
+
+Section "Module"
+ Load "i2c"
+ Load "bitmap"
+ Load "ddc"
+ Load "dri"
+ Load "extmod"
+ Load "freetype"
+ Load "glx"
+ Load "int10"
+ Load "vbe"
+EndSection
+
+Section "InputDevice"
+ Identifier "Generic Keyboard"
+ Driver "kbd"
+ Option "CoreKeyboard"
+ Option "XkbRules" "xorg"
+ Option "XkbModel" "pc104"
+ Option "XkbLayout" "us"
+EndSection
+
+Section "InputDevice"
+ Identifier "Configured Mouse"
+ Driver "mouse"
+ Option "CorePointer"
+ Option "Device" "/dev/input/mice"
+ Option "Protocol" "ImPS/2"
+ Option "Emulate3Buttons" "true"
+EndSection
+
+Section "Device"
+ Identifier "Generic Video Card"
+ Driver "intel"
+EndSection
+
+Section "Monitor"
+ Identifier "Generic Monitor"
+ Option "DPMS"
+ HorizSync 28-51
+ VertRefresh 43-80
+EndSection
+
+Section "Screen"
+ Identifier "Default Screen"
+ Device "Generic Video Card"
+ Monitor "Generic Monitor"
+ DefaultDepth 24
+ SubSection "Display"
+ Depth 1
+ Modes "1024x768" "800x600" "640x480"
+ EndSubSection
+ SubSection "Display"
+ Depth 4
+ Modes "1024x768" "800x600" "640x480"
+ EndSubSection
+ SubSection "Display"
+ Depth 8
+ Modes "1024x768" "800x600" "640x480"
+ EndSubSection
+ SubSection "Display"
+ Depth 15
+ Modes "1024x768" "800x600" "640x480"
+ EndSubSection
+ SubSection "Display"
+ Depth 16
+ Modes "1024x768" "800x600" "640x480"
+ EndSubSection
+ SubSection "Display"
+ Depth 24
+ Modes "1024x768" "800x600" "640x480"
+ EndSubSection
+EndSection
+
+Section "ServerLayout"
+ Identifier "Default Layout"
+ Screen "Default Screen"
+ InputDevice "Generic Keyboard"
+ InputDevice "Configured Mouse"
+EndSection
+
+Section "DRI"
+ Mode 0666
+EndSection
Added: fai-config/files/etc/X11/xorg.conf/selma
===================================================================
--- fai-config/files/etc/X11/xorg.conf/selma (rev 0)
+++ fai-config/files/etc/X11/xorg.conf/selma 2008-08-05 16:32:17 UTC (rev 166)
@@ -0,0 +1,118 @@
+# /etc/X11/xorg.conf (xorg X Window System server configuration file)
+#
+# This file was generated by dexconf, the Debian X Configuration tool, using
+# values from the debconf database.
+#
+# Edit this file with caution, and see the /etc/X11/xorg.conf manual page.
+# (Type "man /etc/X11/xorg.conf" at the shell prompt.)
+#
+# This file is automatically updated on xserver-xorg package upgrades *only*
+# if it has not been modified since the last upgrade of the xserver-xorg
+# package.
+#
+# If you have edited this file but would like it to be automatically updated
+# again, run the following command:
+# sudo dpkg-reconfigure -phigh xserver-xorg
+
+Section "Files"
+ FontPath "/usr/share/fonts/X11/misc"
+ FontPath "/usr/X11R6/lib/X11/fonts/misc"
+ FontPath "/usr/share/fonts/X11/cyrillic"
+ FontPath "/usr/X11R6/lib/X11/fonts/cyrillic"
+ FontPath "/usr/share/fonts/X11/100dpi/:unscaled"
+ FontPath "/usr/X11R6/lib/X11/fonts/100dpi/:unscaled"
+ FontPath "/usr/share/fonts/X11/75dpi/:unscaled"
+ FontPath "/usr/X11R6/lib/X11/fonts/75dpi/:unscaled"
+ FontPath "/usr/share/fonts/X11/Type1"
+ FontPath "/usr/X11R6/lib/X11/fonts/Type1"
+ FontPath "/usr/share/fonts/X11/100dpi"
+ FontPath "/usr/X11R6/lib/X11/fonts/100dpi"
+ FontPath "/usr/share/fonts/X11/75dpi"
+ FontPath "/usr/X11R6/lib/X11/fonts/75dpi"
+ # path to defoma fonts
+ FontPath "/var/lib/defoma/x-ttcidfont-conf.d/dirs/TrueType"
+EndSection
+
+Section "Module"
+ Load "i2c"
+ Load "bitmap"
+ Load "ddc"
+ Load "dri"
+ Load "extmod"
+ Load "freetype"
+ Load "glx"
+ Load "int10"
+ Load "vbe"
+EndSection
+
+Section "InputDevice"
+ Identifier "Generic Keyboard"
+ Driver "kbd"
+ Option "CoreKeyboard"
+ Option "XkbRules" "xorg"
+ Option "XkbModel" "pc104"
+ Option "XkbLayout" "us"
+EndSection
+
+Section "InputDevice"
+ Identifier "Configured Mouse"
+ Driver "mouse"
+ Option "CorePointer"
+ Option "Device" "/dev/input/mice"
+ Option "Protocol" "ImPS/2"
+ Option "Emulate3Buttons" "true"
+EndSection
+
+Section "Device"
+ Identifier "Generic Video Card"
+ Driver "nv"
+EndSection
+
+Section "Monitor"
+ Identifier "Generic Monitor"
+ Option "DPMS"
+ HorizSync 28-51
+ VertRefresh 43-80
+EndSection
+
+Section "Screen"
+ Identifier "Default Screen"
+ Device "Generic Video Card"
+ Monitor "Generic Monitor"
+ DefaultDepth 24
+ SubSection "Display"
+ Depth 1
+ Modes "1024x768" "800x600" "640x480"
+ EndSubSection
+ SubSection "Display"
+ Depth 4
+ Modes "1024x768" "800x600" "640x480"
+ EndSubSection
+ SubSection "Display"
+ Depth 8
+ Modes "1024x768" "800x600" "640x480"
+ EndSubSection
+ SubSection "Display"
+ Depth 15
+ Modes "1024x768" "800x600" "640x480"
+ EndSubSection
+ SubSection "Display"
+ Depth 16
+ Modes "1024x768" "800x600" "640x480"
+ EndSubSection
+ SubSection "Display"
+ Depth 24
+ Modes "1024x768" "800x600" "640x480"
+ EndSubSection
+EndSection
+
+Section "ServerLayout"
+ Identifier "Default Layout"
+ Screen "Default Screen"
+ InputDevice "Generic Keyboard"
+ InputDevice "Configured Mouse"
+EndSection
+
+Section "DRI"
+ Mode 0666
+EndSection
Modified: fai-config/package_config/VIDEO
===================================================================
--- fai-config/package_config/VIDEO 2008-08-05 16:02:54 UTC (rev 165)
+++ fai-config/package_config/VIDEO 2008-08-05 16:32:17 UTC (rev 166)
@@ -5,19 +5,20 @@
munin-node
mailutils postfix logcheck
-PACKAGES install DVSWITCH
+PACKAGES install XORG
x-window-system elinks
icewm xserver-xorg xterm kdm
+xserver-xorg-video-intel
+xscreensaver iceweasel
+irssi xchat
+
+PACKAGES install DVSWITCH
dvswitch
debconf-video-common
debconf-video-switch
ffmpeg2theora oggfwd icecast2
-xscreensaver iceweasel
PACKAGES install REVIEW
-x-window-system elinks
-icewm xserver-xorg xterm kdm
-xscreensaver iceweasel
totem mplayer xine-ui vlc
PACKAGES install CAPTURE
Added: fai-config/scripts/XORG/10-xorg.conf
===================================================================
--- fai-config/scripts/XORG/10-xorg.conf (rev 0)
+++ fai-config/scripts/XORG/10-xorg.conf 2008-08-05 16:32:17 UTC (rev 166)
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+fcopy -M /etc/X11/xorg.conf
+
Property changes on: fai-config/scripts/XORG/10-xorg.conf
___________________________________________________________________
Name: svn:executable
+ *
More information about the Debconf-video-commits
mailing list