Module Name: src
Committed By: tsutsui
Date: Sat May 21 11:38:53 UTC 2011
Modified Files:
src/distrib/sets/lists/xserver: md.zaurus
Added Files:
src/external/mit/xorg/etc/etc.zaurus: xorg.conf.sample
Removed Files:
src/external/mit/xorg/etc/etc.zaurus: xorg.conf
Log Message:
Rename xorg.conf in the xserver set to xorg.conf.sample to avoid
overwriting a possibly modified user config file. Suggested by jmmv@.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/distrib/sets/lists/xserver/md.zaurus
cvs rdiff -u -r1.1 -r0 src/external/mit/xorg/etc/etc.zaurus/xorg.conf
cvs rdiff -u -r0 -r1.1 src/external/mit/xorg/etc/etc.zaurus/xorg.conf.sample
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/xserver/md.zaurus
diff -u src/distrib/sets/lists/xserver/md.zaurus:1.6 src/distrib/sets/lists/xserver/md.zaurus:1.7
--- src/distrib/sets/lists/xserver/md.zaurus:1.6 Fri May 20 09:29:08 2011
+++ src/distrib/sets/lists/xserver/md.zaurus Sat May 21 11:38:53 2011
@@ -1,5 +1,5 @@
-# $NetBSD: md.zaurus,v 1.6 2011/05/20 09:29:08 tsutsui Exp $
-./etc/X11/xorg.conf -unknown- xorg
+# $NetBSD: md.zaurus,v 1.7 2011/05/21 11:38:53 tsutsui Exp $
+./etc/X11/xorg.conf.sample -unknown- xorg
./usr/X11R7/bin/X -unknown- xorg
./usr/X11R7/bin/Xorg -unknown- xorg
./usr/X11R7/bin/cvt -unknown- xorg
Added files:
Index: src/external/mit/xorg/etc/etc.zaurus/xorg.conf.sample
diff -u /dev/null src/external/mit/xorg/etc/etc.zaurus/xorg.conf.sample:1.1
--- /dev/null Sat May 21 11:38:53 2011
+++ src/external/mit/xorg/etc/etc.zaurus/xorg.conf.sample Sat May 21 11:38:52 2011
@@ -0,0 +1,57 @@
+# $NetBSD: xorg.conf.sample,v 1.1 2011/05/21 11:38:52 tsutsui Exp $
+
+Section "ServerLayout"
+ Identifier "wsfb"
+ Screen 0 "Screen0" 0 0
+ InputDevice "TouchScreen0" "CorePointer"
+ InputDevice "Keyboard0" "CoreKeyboard"
+EndSection
+
+Section "Files"
+# FontPath "/usr/pkg/lib/X11/fonts/TTF/"
+EndSection
+
+Section "InputDevice"
+ Identifier "Keyboard0"
+ Driver "kbd"
+ Option "XkbModel" "sl-c3x00"
+EndSection
+
+Section "InputDevice"
+ Identifier "TouchScreen0"
+ Driver "ws"
+
+ Option "device" "/dev/wsmouse"
+ Option "ZAxisMapping" "4 5"
+
+ Option "MinX" "0"
+ Option "MaxX" "479"
+ Option "MinY" "0"
+ Option "MaxY" "639"
+
+ Option "Rotate" "CW"
+EndSection
+
+Section "Device"
+ Identifier "Wsdisplay0"
+ Driver "wsfb"
+
+ Option "Rotate" "CW"
+EndSection
+
+Section "Monitor"
+ Identifier "Monitor"
+ VendorName "Sharp"
+ ModelName "Zaurus"
+EndSection
+
+Section "Screen"
+ Identifier "Screen0"
+ Device "Wsdisplay0"
+ Monitor "Monitor"
+ DefaultDepth 16
+
+ SubSection "Display"
+ Depth 16
+ EndSubSection
+EndSection
