[src/trunk]: src Rename xorg.conf in the xserver set to xorg.conf.sample to a...

[tsutsui <tsutsui%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/f7a554cb1dd2
branches:  trunk
changeset: 765192:f7a554cb1dd2
user:      tsutsui <tsutsui%NetBSD.org@localhost>
date:      Sat May 21 11:38:52 2011 +0000

description:
Rename xorg.conf in the xserver set to xorg.conf.sample to avoid
overwriting a possibly modified user config file.  Suggested by jmmv@.

diffstat:

 distrib/sets/lists/xserver/md.zaurus              |   4 +-
 external/mit/xorg/etc/etc.zaurus/xorg.conf        |  57 -----------------------
 external/mit/xorg/etc/etc.zaurus/xorg.conf.sample |  57 +++++++++++++++++++++++
 3 files changed, 59 insertions(+), 59 deletions(-)

diffs (133 lines):

diff -r 5352df1eb70e -r f7a554cb1dd2 distrib/sets/lists/xserver/md.zaurus
--- a/distrib/sets/lists/xserver/md.zaurus      Sat May 21 10:04:03 2011 +0000
+++ b/distrib/sets/lists/xserver/md.zaurus      Sat May 21 11:38:52 2011 +0000
@@ -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
diff -r 5352df1eb70e -r f7a554cb1dd2 external/mit/xorg/etc/etc.zaurus/xorg.conf
--- a/external/mit/xorg/etc/etc.zaurus/xorg.conf        Sat May 21 10:04:03 2011 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,57 +0,0 @@
-# $NetBSD: xorg.conf,v 1.1 2011/05/20 08:40:04 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
diff -r 5352df1eb70e -r f7a554cb1dd2 external/mit/xorg/etc/etc.zaurus/xorg.conf.sample
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/external/mit/xorg/etc/etc.zaurus/xorg.conf.sample Sat May 21 11:38:52 2011 +0000
@@ -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