[Channel-debian-de-devel] [SCM] Git repository for #debian.de branch, master, updated. 2a173ffccd21fa6f20491f3fb6a2c0aac41d9c18

Martin Würtele martin at wuertele.net
Fri Feb 11 18:08:42 UTC 2011


The following commit has been merged in the master branch:
commit 72a78c9a1b938452d7657929118028a575a5d478
Author: Martin Würtele <martin at wuertele.net>
Date:   Fri Feb 11 18:57:59 2011 +0100

    XFree* entsorgt da xorg autoconfig hat

diff --git a/faq/DebianDE.sgml b/faq/DebianDE.sgml
index c6a313e..d5a7a6d 100644
--- a/faq/DebianDE.sgml
+++ b/faq/DebianDE.sgml
@@ -969,607 +969,6 @@ Meta:
   keyboard-configuration</tt> die Tastenkombinaten zu aktivieren.
 
 
-<sect id="xfree86410">XFree86 4.x konfigurieren
-
-<p>
- Zunächst: es sollten alle nötigen Pakete installiert sein. Abhängig vom
- Alter der Woody-Installation gibt es vereinzelt Probleme.
-<p>
-Damit die Hardware automatisch erkannt wird, sollte man zuerst folgende Pakete
-installieren:
-
-<example>
-       aptitude install discover mdetect read-edid
-</example>
-
-danach dann
-
-<example>
-  aptitude install xserver-xfree86 xlibs xbase-clients icewm xfree86-common x-window-system
-</example>
-
-<p>
- Wie konfiguriert man XFree-4.x? Man kann sich bei der Installation für die
- Konfiguration via Debconf entscheiden. Falls man die Programme für automatische
- Hardware-Erkennung vorher installiert hat, bekommt man nur einige wenige Fragen gestellt;
- mit ein paar Kenntnissen über die vorliegende Hardware kommt man auch sonst recht
- schnell ans Ziel. Bei Problemen
- muss man aber Debconf-Skripte abstellen ("dpkg-reconfigure xserver-xfree86")
- und per Hand konfigurieren. Es beginnt mit einer Grundkonfiguration:
-<example>
-  XFree86 -configure
-(danach das Template aus ~ nach /etc/X11/XF86Config-4 kopieren)
-oder
-  xf86config
-oder
-  dpkg-reconfigure xserver-xfree86
-(falls nicht schon beim Installieren geschehen)
-</example>
-
-<p>
- Für Puristen ganz einfach (als root): Die XF86Config-4 ist dann (hoffentlich)
- mit einigermaßen sinnvollen Defaults und kommentierten Beispielen gefüllt.
- Manche Sachen stimmen möglicherweise jedoch nicht, z.B. werden oft Maus und Tastatur
- falsch erkannt. Diese Werte kann man aus der vorherigen XF-3.3.x Konfiguration
- übernehmen, aus Manpages oder aus meiner Config.
-
-<p>
- Klicki-Bunti-User haben es mit XFree-4.x schwerer. XF86Setup ist abgeschafft,
- und SaX2 ist noch nicht portiert. Man kann es mit xf86cfg probieren, oder
- (wenn es crasht oder spinnt) mit "xf86cfg -textmode".
-
-<sect1 id="xfree86410-xf86config-4-zomb">XF86Config-4 (Zomb, 1)
-
-<p>
- Wenn es interessiert, hier ist meine X-Config. Konfiguriert fürs
- Schlepptop, 14" LCD, Touchpad intern, Maus extern via USB (geladen von
- Hotplug mit dem X11-Hack aktiviert). Multiple Tastaturbelegung,
- Umschaltbar mit Alt-Shift. Es werden TTFs von Windows verwendet
- (eingerichtet mit dem Paket ttf-commercial). Es wird korrektes
- DisplaySize verwendet, -dpi-Parameter wurden aus /etc/X11/*/* Skripten
- entfernt.
-<example>
-# /etc/X11/XF86Config-4 (neu)
-# Created by Eduard Bloch
-
-Section "Files"
-#        FontPath        "/usr/X11R6/lib/X11/fonts/TrueType"
-##       FontPath        "unix/:7100"                    # local font server
-#       # if the local font server has problems, we can fall back on these
-#       FontPath        "/usr/lib/X11/fonts/75dpi"
-#       FontPath        "/usr/lib/X11/fonts/100dpi"
-#       FontPath        "/usr/lib/X11/fonts/Speedo"
-#       FontPath        "/usr/lib/X11/fonts/misc"
-#       FontPath        "/usr/lib/X11/fonts/cyrillic"
-#       FontPath        "/usr/lib/X11/fonts/Type1"
-#       FontPath        "/usr/lib/X11/fonts/CID"
-
-        FontPath     "/usr/X11R6/lib/X11/fonts/misc:unscaled"
-        FontPath     "/usr/X11R6/lib/X11/fonts/misc"
-        FontPath     "/usr/X11R6/lib/X11/fonts/75dpi:unscaled"
-        FontPath     "/usr/X11R6/lib/X11/fonts/75dpi"
-        FontPath     "/usr/X11R6/lib/X11/fonts/100dpi:unscaled"
-        FontPath     "/usr/X11R6/lib/X11/fonts/100dpi"
-        FontPath     "/usr/X11R6/lib/X11/fonts/Speedo"
-        FontPath     "/usr/X11R6/lib/X11/fonts/PEX"
-# Additional fonts: Locale, Gimp, TTF...
-        FontPath     "/usr/X11R6/lib/X11/fonts/cyrillic"
-#       FontPath     "/usr/X11R6/lib/X11/fonts/latin2/75dpi"
-#       FontPath     "/usr/X11R6/lib/X11/fonts/latin2/100dpi"
-# True type and type1 fonts are also handled via xftlib, see /etc/X11/XftConfig!
-        FontPath     "/usr/X11R6/lib/X11/fonts/Type1"
-        FontPath     "/usr/share/fonts/ttf/western"
-        FontPath     "/usr/share/fonts/ttf/decoratives"
-        FontPath     "/usr/share/fonts/truetype/openoffice"
-        FontPath     "/usr/X11R6/lib/X11/fonts/defoma/CID"
-        FontPath     "/usr/X11R6/lib/X11/fonts/defoma/TrueType"
-
-
-EndSection
-
-Section "Module"
-	Load	"GLcore"
-	Load	"bitmap"
-	Load	"dbe"
-	Load	"ddc"
-	Load	"dri"
-	Load	"extmod"
-	Load	"freetype"
-	Load	"glx"
-	Load	"int10"
-	Load	"record"
-	Load	"speedo"
-	Load	"type1"
-	Load	"vbe"
-EndSection
-
-Section "InputDevice"
-	Identifier	"Generic Keyboard"
-	Driver		"keyboard"
-	Option		"CoreKeyboard"
-	Option		"XkbRules"	"xfree86"
-	Option		"XkbModel"	"pc105"
-	Option		"XkbLayout"	"de,ru"
-	Option		"XkbVariant"	"nodeadkeys,phonetic"
-  Option    "XKbOptions" "grp:alt_shift_toggle"
-EndSection
-
-Section "InputDevice"
-	Identifier	"Configured Mouse"
-	Driver		"mouse"
-	Option		"CorePointer"
-	Option		"Device"		"/dev/misc/psaux"
-	Option		"Protocol"		"ImPS/2"
-	Option		"Emulate3Buttons"	"true"
-	Option		"ZAxisMapping"		"4 5"
-EndSection
-
-Section "InputDevice"
-	Identifier	"Generic Mouse"
-	Driver		"mouse"
-	Option		"SendCoreEvents"	"true"
-	Option		"Device"		"/dev/input/mice"
-	Option		"Protocol"		"ImPS/2"
-	Option		"Emulate3Buttons"	"true"
-	Option		"ZAxisMapping"		"4 5"
-EndSection
-
-#Section "Device"
-#	Identifier	"420go"
-#	Driver		"nvidia"
-#EndSection
-
-Section "Monitor"
-	Identifier	"TFT"
-	HorizSync	28-50
-	VertRefresh	43-60
-	DisplaySize	288 216
-	Option		"DPMS"
-EndSection
-Section "Device"
-        Identifier      "420go"
-	Driver          "nv"
-        Option          "SWcursor"
-	BusID           "AGP:01:00:0"
-	# Override DDC
-	Option          "NoDDC" "1"
-	Option          "IgnoreEDID" "1"
-	# Important when using TFT
-	Option          "GenerateRTList"   "0"
-	Option          "OverridePolarity" "1"
-	# Switch AGP
-	Option		"NvAGP" "0"
-	Option "FlatPanelScalingMode" "Scalling = aspect-scaled, Dithering = enabled"
-	Option "FlatPanelProperties" "Scalling = aspect-scaled, Dithering = enabled"
-	# Some Pointer Eyecandy
-	Option		 "CursorShadow" "1"
-	Option		 "CursorShadowAlpha" "63"
-	Option		 "CursorShadowYOffset" "2"
-	Option		 "CursorShadowXOffset" "4"
-	# Picture Improvement
-	Option		"DigitalVibrance" "0"
-	# TV Twinview
-	Option		"TwinView" "0"
-	Option		"SecondMonitorHorizSync" "30-50"
-	Option		"SecondMonitorVertRefresh" "60"
-	Option		"TwinViewOrientation" "Clone"
-#	Option		"TVOutFormat" "COMPOSITE"
-	Option		"ConnectedMonitor" "DFP, CRT"
-#	Option		"TVStandard" "PAL-B"
-#	Option		 "MetaModes" "1024x768 @1024x768,1024x768 
-# besser in eine Zeile... @1024x768;
-# 800x600 @800x600,800x600 @800x600; 640x480 @640x480,640x480 @640x480"
-	Option		 "MetaModes" "1024x768,1024x768"
-EndSection
-##	SECTION FOR TV - end
-
-Section "Screen"
-	Identifier	"Default Screen"
-	Device		"420go"
-	Monitor		"TFT"
-	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"
-	InputDevice	"Generic Mouse"
-EndSection
-
-Section "DRI"
-	Mode	0666
-EndSection
-</example>
-</sect1>
-
-
-<sect1 id="xfree86410-xf86config-4-zomb2">XF86Config-4 (Zomb, 2)
-
-<p>
- Wenn es interessiert, hier ist meine X-Config, etwas verhunzt durch die vielen
- Anpassungen an verschiedene Grafikkartentreiber, Monitore und Tastaturtypen. Im Moment
- auf NVIDIA (non-free), 94kHz-Monitor und die typische deutsche Tastatur
- (im nodeadkeys-Modus) eingestellt.
-
-<example>
-# /etc/X11/XF86Config-4 (alt, XFree86 4.2.1)
-# Created by Eduard Bloch
-
-Section "ServerLayout"
-	Identifier     "Default Layout"
-	Screen      0  "Default Screen" 0 0
-	InputDevice    "Keyboard"
-	InputDevice    "Generic Mouse"
-EndSection
-
-Section "Files"
-	FontPath     "unix/:7100"
-# Using fontserver
-#	FontPath     "unix/:7101"
-# No longer using xfstt on 7101. xfstt is old and breaks xf4
-	FontPath     "/usr/X11R6/lib/X11/fonts/TrueType/"
-# TrueType fonts. Use mkttfdir from fttools package to create the font index in
-# that directory
-EndSection
-
-Section "Module"
-	Load  "ddc"
-	Load  "GLcore"
-	Load  "dbe"
-	Load  "dri"
-#	Load  "v4l"
-# sux with nvidia and some other drivers. TV programms work good enough without
-# v4l additions
-	Load  "extmod"
-  Load  "glx"
-	Load  "pex5"
-	Load  "record"
-	Load  "xie"
-	Load  "bitmap"
-	Load  "freetype"
-	Load  "speedo"
-	Load  "type1"
-	Load  "vbe"
-	Load  "int10"
-EndSection
-
-Section "InputDevice"
-	Identifier  "Keyboard"
-	Driver      "keyboard"
-	Option      "CoreKeyboard"
-	Option      "XkbRules" "xfree86"
-	Option      "XkbModel" "pc102"
-	Option      "XkbLayout" "de"
-#	Option      "XkbLayout" "ruEBde"
-#	Option      "XkbOptions" "grp:shift_toggle"
-# My customized keyboard layout for writing Russian and German without
-# learning the keys again and again
-	Option      "XkbVariant" "nodeadkeys"
-EndSection
-
-Section "InputDevice"
-	Identifier  "Generic Mouse"
-	Driver      "mouse"
-	Option      "CorePointer"
-	Option      "Device" "/dev/gpmdata"
-	Option      "Protocol" "IMPS/2"
-# Eine Logitech-MouseMan-Plus, aber ohne Rad. Eine echte Seltenheit.
-EndSection
-
-Section "Monitor"
-	Identifier   "Generic Monitor"
-  Option       "DPMS"
-  Option  "NoDDC" "1"
-
-#  HorizSync    31.5 - 49.0
-	HorizSync    31.5 - 94.0
-
-	VertRefresh  40.0 - 160.0
-#	ModeLine     "1280x960 at 85" 148.5 1280 1344 1504 1728 960 961 964 1011 +hsync +vsync
-	ModeLine "786x576"      91.74    786  842  968 1048    576  578  604  610
-
-## getunte
-#Modeline "640x480"      63.99    640  672  760  844    480  482  503  505
-#Modeline "800x600"      87.30    800  820  948 1056    600  602  629  631
-#Modeline "1024x768"    111.94   1024 1044 1228 1360    768  770  806  808
-
-# getunt fuer nvidia-non-free. Ist eh mist, das untere ist besser
-#Modeline "800x600"   49.50  800  828  908 1020    600  601  604  625 +hsync +vsync
-#Modeline "1024x768"     94.50   1024 1028 1124 1284    768  769  772  808 +hsync +vsync
-
-#Modeline "1024x768" 92.00 1024 1056 1240 1272 768 770 806 808
-#Modeline "1152x864" 108.00 1152 1184 1400 1432 864 866 907 909
-
-Mode "1152x864"
-        DotClock 137.65
-   HTimings 1152 1184 1312 1536
-   VTimings  864  866  882  902
-   Flags    "-HSync" "-VSync"
-      EndMode
-
-      Mode "1024x768"
-        DotClock 115.50
-HTimings 1024 1040 1216 1440
-VTimings  768  771  781  802
-#HTimings 1024 1056 1248 1440
-#VTimings  768  771  781  802
-##HTimings 1024 1044 1236 1440
-##VTimings  768  771  781  802
-Flags    "-HSync" "-VSync"
-      EndMode
-
-      Mode "800x600"
-        DotClock 69.65
-HTimings 800 864 928 1088
-VTimings 600 604 610  640
-Flags    "-HSync" "-VSync"
-      EndMode
-
-      Mode "640x480"
-        DotClock 45.80
-HTimings 640 672 768 864
-VTimings 480 488 494 530
-Flags    "-HSync" "-VSync"
-      EndMode
-
-EndSection
-
-Section "Device"
-	Identifier  "Generic Video Card"
-	Driver      "nvidia"
-  Option  "NoDDC" "1"
-  Option      "IgnoreEDID" "1"
-# Das ist wichtig bei TFTs, da saugt der non-free-Treiber
-  Option      "GenerateRTList"   "0"
-  Option      "OverridePolarity" "1"
-EndSection
-
-Section "Screen"
-	Identifier "Default Screen"
-	Device     "Generic Video Card"
-	Monitor    "Generic Monitor"
-	DefaultDepth     24
-  Option  "NvAgp" "1"
-# Internen AGP-Treiber erzwingen, statt agpgart.
-  Option  "NoDDC" "1"
-	SubSection "Display"
-		Depth     1
-		Modes    "1152x864" "1024x768" "800x600" "640x480"
-	EndSubSection
-	SubSection "Display"
-		Depth     4
-		Modes    "1152x864" "1024x768" "800x600" "640x480"
-	EndSubSection
-	SubSection "Display"
-		Depth     8
-   Modes     "1024x768" "800x600" "640x480" "400x300" "320x240" "320x200"
-	#	Modes    "1152x864" "1024x768" "800x600" "640x480"
-	EndSubSection
-	SubSection "Display"
-		Depth     15
-   Modes     "1024x768" "800x600" "640x480" "400x300" "320x240" "320x200"
-	#	Modes    "1152x864" "1024x768" "800x600" "640x480"
-	EndSubSection
-	SubSection "Display"
-		Depth     16
-    Virtual 1024 768
-		Modes    "1024x768" "640x480" "800x600" "400x300" "320x240" "320x200" "1152x864" "1280x960"
-	EndSubSection
-	SubSection "Display"
-#    Virtual 1024 768
-#    Virtual 800 600
-		Depth     24
-  # Modes     "1280x1024" "1152x864" "1024x768" "800x600" "640x480" "400x300" "320x240" "320x200"
-   Modes     "1024x768" "800x600" "640x480" "400x300" "320x240" "320x200" "786x576"
-#   Modes     "1600x1200" "1024x768" "800x600" "640x480" "400x300" "320x240" "320x200"
-#		Modes     "800x600" "640x480" "400x300" "320x240" "320x200"
-	EndSubSection
-EndSection
-
-Section "DRI"
-	Mode         0666
-EndSection
-
-</example>
-
-<sect1 id="xfree86410-xf86config-4-hightower">XF86Config-4 (hightower)
-<p>
-Gespendet von hightower:
-<p>
-<example>
-# XF86Config-4 (XFree86 server configuration file) generated by Dexconf, the
-# Debian X Configuration tool, using values from the debconf database.
-#
-# Edit this file with caution, and see the XF86Config manual page.
-# (Type "man XF86Config" at the shell prompt.)
-
-Section "Files
-    FontPath   "unix/:7100"					# Local Font Server "XFS"
-    FontPath   "/usr/X11R6/lib/X11/fonts/local/"
-    FontPath   "/usr/X11R6/lib/X11/fonts/misc/"
-    FontPath   "/usr/X11R6/lib/X11/fonts/75dpi/:unscaled"
-    FontPath   "/usr/X11R6/lib/X11/fonts/100dpi/:unscaled"
-    FontPath   "/usr/X11R6/lib/X11/fonts/Type1/"
-    FontPath   "/usr/X11R6/lib/X11/fonts/Speedo/"
-    FontPath   "/usr/X11R6/lib/X11/fonts/75dpi/"
-    FontPath   "/usr/X11R6/lib/X11/fonts/100dpi/"
-EndSection
-
-Section "ServerFlags"
-	Option		"AllowMouseOpenFail"	"true"		# Start also if mouse is NOT available
-	Option		"standby time"		"20"		# Standby Time in Minutes for Monitor
-	Option		"suspend time"		"30"		# Suspend Time in Minutes for Monitor
-	Option		"off time"		"60"		# Off Time in Minutes for Monitor
-	Option		"Dont Zoom"		"true"		# Ctrl-Alt -/+ are NOT available
-	Option		"Dont Zap"		"true"		# Ctrl-Alt-Backspace is NOT available
-EndSection
-
-Section "Module"
-	Load	"ddc"
-	Load	"GLcore"
-	Load	"dbe"
-	Load	"glx"
-	Load	"dri"
-	Load	"extmod"
-	Load	"pex5"
-	Load	"record"
-	Load	"xie"
-	Load	"bitmap"
-	Load	"freetype"
-	Load	"speedo"
-	Load	"type1"
-	Load	"vbe"
-	Load	"int10"
-EndSection
-
-Section "InputDevice"
-	Identifier	"Generic Keyboard"
-	Driver		"keyboard"
-	Option		"CoreKeyboard"
-	Option		"XkbRules"	"xfree86"
-	Option		"XkbModel"	"pc105"			# We have 105 keys, wow! :)
-	Option		"XkbLayout"	"de"			# German Layout
-	Option		"XkbVariant"	"nodeadkeys"		# We don't want á or à, we want ´ and a :)
-	Option		"AutoRepeat"	"250 30"		# We want a FAST keyboard :-)
-EndSection
-
-#Section "InputDevice"	Identifier	"Configured Mouse"
-#	Driver		"mouse"
-#	Option		"CorePointer"
-#	Option		"Device"		"/dev/psaux"
-#	Option		"Protocol"		"ImPS/2"
-##	Option		"Emulate3Buttons"	"true"
-#	Option		"ZAxisMapping"		"4 5"
-#	Option		"Buttons"		"3"
-#EndSection
-
-Section "InputDevice"						# This is for GPM use at the same time!
-	Identifier	"Configured Mouse"
-	Driver		"mouse"
-	Option		"CorePointer"
-	Option 		"Protocol"	 	"MouseSystems"
-	Option 		"Device"		"/dev/gpmdata"
-	Option		"ZAxisMapping"		"4 5"
-	Option 		"Buttons"		"5"
-	Option		"Resolution"		"100"
-EndSection
-
-Section "InputDevice"
-	Identifier	"Generic Mouse"
-	Driver		"mouse"
-	Option		"SendCoreEvents"	"true"
-	Option		"Device"		"/dev/input/mice"
-	Option		"Protocol"		"ImPS/2"
-	Option		"Emulate3Buttons"	"true"
-	Option		"ZAxisMapping"		"4 5"
-EndSection
-
-#Section "Device"
-#        Identifier      "ATI All In Wonder 128"
-#        Driver          "fbdev"
-#        Option          "UseFBDev"              "true"
-#        VideoRam        32768
-#EndSection
-
-Section "Device"
-	Identifier	"ATI All In Wonder 128"
-	Driver		"ati"
-	VideoRam	32768
-	Option		"AGPMode"	"4"
-	Option		"UseCCEFor2D"	"false"
-EndSection
-
-Section "Monitor"
-	Identifier	"NEC MultiSync FP1370"
-	HorizSync	31-130
-	#HorizSync	31-65
-	VertRefresh	55-160
-	#VertRefresh	55-80
-	Option		"DPMS"
-EndSection
-
-Section "Screen"
-	Identifier	"Default Screen"
-	Device		"ATI All In Wonder 128"
-	Monitor		"NEC MultiSync FP1370"
-	DefaultDepth	16
-	SubSection "Display"
-		Depth		1
-		Modes		"1600x1200" "1280x1024" "1024x768" "800x600" "640x480"
-		Virtual		1600 1200
-	EndSubSection
-	SubSection "Display"
-		Depth		4
-		Modes		"1600x1200" "1280x1024" "1024x768" "800x600" "640x480"
-		Virtual		1600 1200
-	EndSubSection
-	SubSection "Display"
-		Depth		8
-		Modes		"1600x1200" "1280x1024" "1024x768" "800x600" "640x480"
-		Virtual		1600 1200
-	EndSubSection
-	SubSection "Display"
-		Depth		15
-		Modes		"1600x1200" "1280x1024" "1024x768" "800x600" "640x480"
-		Virtual		1600 1200
-	EndSubSection
-	SubSection "Display"
-		Depth		16
-		Modes		"1600x1200" "1280x1024" "1024x768" "800x600" "640x480"
-		Virtual		1600 1200
-	EndSubSection
-	SubSection "Display"
-		Depth		24
-		Modes		"1600x1200" "1280x1024" "1024x768" "800x600" "640x480"
-		Virtual		1600 1200
-	EndSubSection
-EndSection
-
-Section "ServerLayout"
-	Identifier	"Default Layout"
-	Screen		"Default Screen"
-	InputDevice	"Generic Keyboard"
-	InputDevice	"Configured Mouse"
-	InputDevice	"Generic Mouse"
-EndSection
-
-Section "DRI"
-	Group		"xf86dri"		# Only users in this group can use DRI!
-	Mode		0660
-EndSection
-
-# end of XF86Config
-
-</example>
-
-EOF --
- Autor: <url id="mailto:Zomb at channel.debian.de" name="Zomb"> ;
 
 <!-- ********** Euro ********** -->
 <!-- FIXME UTF-8 statt Latin seit Etch? -->

-- 
Git repository for #debian.de



More information about the Channel-debian-de-devel mailing list