xorg: Changes to 'xsf-docs'
xsf-docs/.gitignore | 1
xsf-docs/Makefile | 49 +--
xsf-docs/asciidoc-xhtml11.css | 424 ++++++++++++++++++++++++++++++
xsf-docs/asciidoc-xhtml11.js | 128 +++++++++
xsf-docs/faq/general.mdwn | 69 ----
xsf-docs/faq/general.txt | 81 +++++
xsf-docs/howto/build-mesa.mdwn | 201 --------------
xsf-docs/howto/build-mesa.txt | 220 +++++++++++++++
xsf-docs/howto/configure-input.mdwn | 176 ------------
xsf-docs/howto/configure-input.txt | 193 +++++++++++++
xsf-docs/howto/report-bugs.mdwn | 38 --
xsf-docs/howto/report-bugs.txt | 51 +++
xsf-docs/howto/triage-bugs.mdwn | 95 ------
xsf-docs/howto/triage-bugs.txt | 104 +++++++
xsf-docs/howto/use-gdb.mdwn | 141 ---------
xsf-docs/howto/use-gdb.txt | 176 ++++++++++++
xsf-docs/howto/use-xrandr.mdwn | 173 ------------
xsf-docs/howto/use-xrandr.txt | 214 +++++++++++++++
xsf-docs/index.mdwn | 37 --
xsf-docs/index.txt | 46 +++
xsf-docs/mdwn2html | 63 ----
xsf-docs/reference/dependencies.mdwn | 221 ---------------
xsf-docs/reference/dependencies.txt | 242 +++++++++++++++++
xsf-docs/reference/squeeze-backports.mdwn | 65 ----
xsf-docs/reference/squeeze-backports.txt | 71 +++++
xsf-docs/reference/upstream-contacts.mdwn | 43 ---
xsf-docs/reference/upstream-contacts.txt | 46 +++
xsf-docs/upstream-features.mdwn | 16 -
xsf-docs/upstream-features.txt | 17 +
xsf-docs/xsf.css | 104 -------
30 files changed, 2044 insertions(+), 1461 deletions(-)
New commits:
commit bd39472b0cc302d10c77cdcd0d5d739e99419e24
Author: Cyril Brulebois <kibi@debian.org>
Date: Sun Mar 20 20:56:33 2011 +0100
makefile: Rename into ADOC_JS_FILE for clarity.
diff --git a/xsf-docs/Makefile b/xsf-docs/Makefile
index a187ff0..cbd375c 100644
--- a/xsf-docs/Makefile
+++ b/xsf-docs/Makefile
@@ -10,11 +10,11 @@ TXT_TO_HTML = asciidoc -a linkcss
HTML_TO_PDF = wkhtmltopdf
CSS_FILE = xsf.css
ADOC_CSS_FILE= asciidoc-xhtml11.css
-JS_FILE = asciidoc-xhtml11.js
+ADOC_JS_FILE = asciidoc-xhtml11.js
SVG_LOGO = xsf.svg
PNG_LOGO = xsf.png
-all_files = $(html_files) $(pdf_files) $(txt_files) $(CSS_FILE) $(ADOC_CSS_FILE) $(JS_FILE) $(SVG_LOGO) $(PNG_LOGO)
+all_files = $(html_files) $(pdf_files) $(txt_files) $(CSS_FILE) $(ADOC_CSS_FILE) $(ADOC_JS_FILE) $(SVG_LOGO) $(PNG_LOGO)
all: html pdf $(PNG_LOGO)
@@ -32,10 +32,10 @@ pdf: $(pdf_files)
@echo " CSS $@"
@sed -i 's,\(rel="stylesheet" href="\)[^"]*,\1$(rel_path)$(CSS_FILE),' $@.tmp
@echo " JS $@"
- @sed -i 's,\(type="text/javascript" src="\)[^"]*,\1$(rel_path)$(JS_FILE),' $@.tmp
+ @sed -i 's,\(type="text/javascript" src="\)[^"]*,\1$(rel_path)$(ADOC_JS_FILE),' $@.tmp
@mv $@.tmp $@
-%.pdf: %.html $(CSS_FILE) $(ADOC_CSS_FILE) $(JS_FILE) $(SVG_LOGO)
+%.pdf: %.html $(CSS_FILE) $(ADOC_CSS_FILE) $(ADOC_JS_FILE) $(SVG_LOGO)
@echo " GEN $@"
@$(HTML_TO_PDF) $< $@
commit e9f976edb3505630c9dc3ed52c7ff1b2856d0739
Author: Cyril Brulebois <kibi@debian.org>
Date: Sun Mar 20 20:55:49 2011 +0100
makefile: Take the JS file into account.
diff --git a/xsf-docs/Makefile b/xsf-docs/Makefile
index 3826d73..a187ff0 100644
--- a/xsf-docs/Makefile
+++ b/xsf-docs/Makefile
@@ -14,7 +14,7 @@ JS_FILE = asciidoc-xhtml11.js
SVG_LOGO = xsf.svg
PNG_LOGO = xsf.png
-all_files = $(html_files) $(pdf_files) $(txt_files) $(CSS_FILE) $(ADOC_CSS_FILE) $(SVG_LOGO) $(PNG_LOGO)
+all_files = $(html_files) $(pdf_files) $(txt_files) $(CSS_FILE) $(ADOC_CSS_FILE) $(JS_FILE) $(SVG_LOGO) $(PNG_LOGO)
all: html pdf $(PNG_LOGO)
@@ -35,7 +35,7 @@ pdf: $(pdf_files)
@sed -i 's,\(type="text/javascript" src="\)[^"]*,\1$(rel_path)$(JS_FILE),' $@.tmp
@mv $@.tmp $@
-%.pdf: %.html $(CSS_FILE) $(ADOC_CSS_FILE) $(SVG_LOGO)
+%.pdf: %.html $(CSS_FILE) $(ADOC_CSS_FILE) $(JS_FILE) $(SVG_LOGO)
@echo " GEN $@"
@$(HTML_TO_PDF) $< $@
commit c6914c2c093809afc8a05838f2b0c268a7f80058
Author: Cyril Brulebois <kibi@debian.org>
Date: Sun Mar 20 20:54:39 2011 +0100
makefile: Take the @imported CSS file into account.
diff --git a/xsf-docs/Makefile b/xsf-docs/Makefile
index 5e684fb..3826d73 100644
--- a/xsf-docs/Makefile
+++ b/xsf-docs/Makefile
@@ -9,11 +9,12 @@ pdf_files = $(patsubst %.txt,%.pdf,$(txt_files))
TXT_TO_HTML = asciidoc -a linkcss
HTML_TO_PDF = wkhtmltopdf
CSS_FILE = xsf.css
+ADOC_CSS_FILE= asciidoc-xhtml11.css
JS_FILE = asciidoc-xhtml11.js
SVG_LOGO = xsf.svg
PNG_LOGO = xsf.png
-all_files = $(html_files) $(pdf_files) $(txt_files) $(CSS_FILE) $(SVG_LOGO) $(PNG_LOGO)
+all_files = $(html_files) $(pdf_files) $(txt_files) $(CSS_FILE) $(ADOC_CSS_FILE) $(SVG_LOGO) $(PNG_LOGO)
all: html pdf $(PNG_LOGO)
@@ -34,7 +35,7 @@ pdf: $(pdf_files)
@sed -i 's,\(type="text/javascript" src="\)[^"]*,\1$(rel_path)$(JS_FILE),' $@.tmp
@mv $@.tmp $@
-%.pdf: %.html $(CSS_FILE) $(SVG_LOGO)
+%.pdf: %.html $(CSS_FILE) $(ADOC_CSS_FILE) $(SVG_LOGO)
@echo " GEN $@"
@$(HTML_TO_PDF) $< $@
commit 1b5990593356cdb7a1bc6ea19671319c74634e37
Author: Cyril Brulebois <kibi@debian.org>
Date: Sun Mar 20 20:34:32 2011 +0100
css: Get rid of text-align: justify.
It isn't always appropriate, especially when there are a lot of verbatim
text, causing huuuge blanks in some documents, which looks ugly. Remove
it, at least for now.
diff --git a/xsf-docs/xsf.css b/xsf-docs/xsf.css
index 7c5bb7b..855416f 100644
--- a/xsf-docs/xsf.css
+++ b/xsf-docs/xsf.css
@@ -6,7 +6,3 @@ h1 {
background-position: center right;
background-size: auto 95%;
}
-
-p, li {
- text-align: justify;
-}
commit 5675420a7f378733d9a86ad4736317be12d2381e
Author: Cyril Brulebois <kibi@debian.org>
Date: Sun Mar 20 20:17:44 2011 +0100
css: Get rid of the Firefox hack.
background-size isn't understood before 3.6.x[1], and squeeze has 3.5.x,
so forget about background entirely.
1. https://developer.mozilla.org/en/CSS/-moz-background-size
diff --git a/xsf-docs/xsf.css b/xsf-docs/xsf.css
index 39dbc6f..7c5bb7b 100644
--- a/xsf-docs/xsf.css
+++ b/xsf-docs/xsf.css
@@ -7,17 +7,6 @@ h1 {
background-size: auto 95%;
}
-/* Firefox before version 4 don't support SVG in backgrounds, use a
- ugly workaround to change the background to the PNG version for
- Mozilla-based browsers:
- https://bugzilla.mozilla.org/show_bug.cgi?id=231179
-*/
-@-moz-document url-prefix() {
- h1 {
- background-image: url("xsf.png");
- }
-}
-
p, li {
text-align: justify;
}
commit 2c5b4bd051cb59047459d02ece430c33927351ec
Author: Cyril Brulebois <kibi@debian.org>
Date: Sun Mar 20 20:14:33 2011 +0100
css: Specify the background image for h1.
This gets us rid of issues with h1's bottom border, aligning, etc.
diff --git a/xsf-docs/xsf.css b/xsf-docs/xsf.css
index 8678353..39dbc6f 100644
--- a/xsf-docs/xsf.css
+++ b/xsf-docs/xsf.css
@@ -1,9 +1,10 @@
@import url("asciidoc-xhtml11.css");
-body {
+h1 {
background-image: url("xsf.svg");
background-repeat: no-repeat;
- background-position: top right;
+ background-position: center right;
+ background-size: auto 95%;
}
/* Firefox before version 4 don't support SVG in backgrounds, use a
@@ -12,7 +13,7 @@ body {
https://bugzilla.mozilla.org/show_bug.cgi?id=231179
*/
@-moz-document url-prefix() {
- body {
+ h1 {
background-image: url("xsf.png");
}
}
commit 8e33cda93297987e489419dbfc90b92622db0a57
Author: Cyril Brulebois <kibi@debian.org>
Date: Sun Mar 20 17:56:22 2011 +0100
report-bugs: Use pretty quoting.
diff --git a/xsf-docs/howto/report-bugs.txt b/xsf-docs/howto/report-bugs.txt
index 5a3a8f1..7ffa33c 100644
--- a/xsf-docs/howto/report-bugs.txt
+++ b/xsf-docs/howto/report-bugs.txt
@@ -12,7 +12,9 @@ Initial report
Unless you know which package to report the bug against, you can
report the bug against the `xorg` metapackage:
- reportbug xorg
+----
+reportbug xorg
+----
Like most packages related to the X server, reporting a bug against
this package triggers a bug script which is going to collect X-related
@@ -38,7 +40,9 @@ reassigned to an X-related package, we might need more
information. You can run the bug script manually and attach its output
to your mail to the bug report:
- /usr/share/bug/xserver-xorg-core/script 3>/tmp/script.log
+----
+/usr/share/bug/xserver-xorg-core/script 3>/tmp/script.log
+----
****
.Note
commit 39e3a5fea7fae03c7386b30f6d1518294a8407c9
Author: Cyril Brulebois <kibi@debian.org>
Date: Sun Mar 20 17:55:15 2011 +0100
configure-input: Use pretty quoting.
diff --git a/xsf-docs/howto/configure-input.txt b/xsf-docs/howto/configure-input.txt
index 0db2ea4..3ec15ca 100644
--- a/xsf-docs/howto/configure-input.txt
+++ b/xsf-docs/howto/configure-input.txt
@@ -59,10 +59,12 @@ The `keyboard-configuration` package ships `/etc/default/keyboard`
which can be used to set the following `xkb` items: model, layout,
variant, and options. Here’s an example:
- XKBMODEL="pc105"
- XKBLAYOUT="fr"
- XKBVARIANT="oss"
- XKBOPTIONS="compose:menu,terminate:ctrl_alt_bksp"
+----
+XKBMODEL="pc105"
+XKBLAYOUT="fr"
+XKBVARIANT="oss"
+XKBOPTIONS="compose:menu,terminate:ctrl_alt_bksp"
+----
Quick words about the options:
@@ -110,13 +112,15 @@ Available options are documented in the `evdev` manpage. Let’s check
what a configuration snippet (mentioned in _General considerations_)
would look like. Here is a fictional `/etc/X11/xorg.conf.d/42-evdev.conf`:
- Section "InputClass"
- Identifier "evdev pointer tweaked catchall"
- MatchIsPointer "on"
- Driver "evdev"
- Option "Emulate3Buttons" True"
- Option "SwapAxes" "True"
- EndSection
+----
+Section "InputClass"
+ Identifier "evdev pointer tweaked catchall"
+ MatchIsPointer "on"
+ Driver "evdev"
+ Option "Emulate3Buttons" True"
+ Option "SwapAxes" "True"
+EndSection
+----
Line by line walkthrough:
@@ -151,13 +155,15 @@ Let’s check what a configuration snippet (mentioned in _General
considerations_) would look like. Here is a fictional
`/etc/X11/xorg.conf.d/42-synaptics.conf`:
- Section "InputClass"
- Identifier "touchpad tweaked catchall"
- MatchIsTouchpad "on"
- Driver "synaptics"
- Option "TapButton1" "1"
- Option "HorizEdgeScroll" "1"
- EndSection
+----
+Section "InputClass"
+ Identifier "touchpad tweaked catchall"
+ MatchIsTouchpad "on"
+ Driver "synaptics"
+ Option "TapButton1" "1"
+ Option "HorizEdgeScroll" "1"
+EndSection
+----
Line by line walkthrough:
commit 23ebb64e884f071f91197296137990fc4b340ff9
Author: Cyril Brulebois <kibi@debian.org>
Date: Sun Mar 20 17:52:28 2011 +0100
build-mesa: Use pretty quoting.
There are some more items within lists to take care of.
diff --git a/xsf-docs/howto/build-mesa.txt b/xsf-docs/howto/build-mesa.txt
index 34e0934..78fb5b2 100644
--- a/xsf-docs/howto/build-mesa.txt
+++ b/xsf-docs/howto/build-mesa.txt
@@ -85,8 +85,10 @@ To get started, installing all build dependencies of the `mesa` source
package should be sufficient, along with the essential build tools,
and `git`:
- $ sudo apt-get install build-essential git
- $ sudo apt-get build-dep mesa
+----
+$ sudo apt-get install build-essential git
+$ sudo apt-get build-dep mesa
+----
If you’re on `squeeze` you may need to install a few more packages:
newer `libdrm-dev` (*FIXME:* talk about picking it from `wheezy`? or
@@ -96,23 +98,27 @@ Make sure you have some disc space available, since the git repository
is over 120MB, and since the mesa directory is over 500MB after a
build. Once you’re ready, grab the upstream mesa sources:
- $ git clone git://anongit.freedesktop.org/mesa/mesa mesa.git
- $ cd mesa.git
- $ autoreconf -vfi
+----
+$ git clone git://anongit.freedesktop.org/mesa/mesa mesa.git
+$ cd mesa.git
+$ autoreconf -vfi
+----
Here’s what the `./configure` call will look like:
- $ ./configure --enable-driglx-direct \
- --enable-gallium \
- --enable-gles-overlay \
- --enable-gles1 \
- --enable-gles2 \
- --enable-glx-tls \
- --with-driver=dri \
- --with-dri-driverdir=/usr/lib/dri \
- --with-egl-platforms='drm x11' \
- --with-state-trackers=egl,glx,dri,vega \
- …
+----
+$ ./configure --enable-driglx-direct \
+ --enable-gallium \
+ --enable-gles-overlay \
+ --enable-gles1 \
+ --enable-gles2 \
+ --enable-glx-tls \
+ --with-driver=dri \
+ --with-dri-driverdir=/usr/lib/dri \
+ --with-egl-platforms='drm x11' \
+ --with-state-trackers=egl,glx,dri,vega \
+ …
+----
Now, what are the parameters to replace “++…++” with? Basically, if
you determined an Intel driver (`i915` or `i965`), you want to use the
@@ -146,8 +152,9 @@ Examples for common drivers:
Now, once you’ve run `./configure`, time for your favorite beverage:
- $ make
-
+----
+$ make
+----
<<<
Running the newly-built mesa libraries
@@ -158,7 +165,9 @@ classic drivers, while Gallium drivers end up under `lib/gallium`. If
you’re not an Intel user, overwrite the classic drivers with the
Gallium ones:
- $ mv lib/gallium/* lib/
+----
+$ mv lib/gallium/* lib/
+----
Now, 3 variables need to be set, so that the locally-built libraries
are used.
commit 33951b3b1c8afbf6e3673aa777ef73d63abbc714
Author: Cyril Brulebois <kibi@debian.org>
Date: Sun Mar 20 17:49:43 2011 +0100
use-xrandr: Use pretty quoting.
diff --git a/xsf-docs/howto/use-gdb.txt b/xsf-docs/howto/use-gdb.txt
index 059845f..8de06f0 100644
--- a/xsf-docs/howto/use-gdb.txt
+++ b/xsf-docs/howto/use-gdb.txt
@@ -62,18 +62,24 @@ Getting a core file
`/usr/share/gdm/gdm.schemas`. Sample `/etc/gdm3/daemon.conf`
excerpt:
- [daemon]
- LocalXserverCommand=/usr/bin/Xorg -br -verbose -audit 0 -novtswitch -core
+----
+[daemon]
+LocalXserverCommand=/usr/bin/Xorg -br -verbose -audit 0 -novtswitch -core
+----
* Using `kdm`: One should look for the `ServerArgsLocal` variable in
the `/etc/kde4/kdm/kdmrc` file, and add `-core` there. Example:
- ServerArgsLocal=-br -nolisten tcp -core
+----
+ServerArgsLocal=-br -nolisten tcp -core
+----
* Using `xdm`: It’s sufficient to add `-core` to the command
configured through `/etc/X11/xdm/Xservers`, for example:
- :0 local /usr/bin/X :0 vt7 -nolisten tcp -core
+----
+:0 local /usr/bin/X :0 vt7 -nolisten tcp -core
+----
Loading a core file
~~~~~~~~~~~~~~~~~~~
@@ -81,7 +87,9 @@ Loading a core file
That’s trivial, one just needs to pass both the core file and the path
to the binary:
- # gdb -c /etc/X11/core /usr/bin/Xorg
+----
+# gdb -c /etc/X11/core /usr/bin/Xorg
+----
Now `gdb` is ready to display backtraces.
@@ -92,19 +100,23 @@ The way of starting X doesn’t really matter, as `gdb` makes it
possible to attach a running process. If there’s a single X instance
running, that will do the job:
- # gdb attach $(pidof X)
- [---GDB starts---]
- (gdb) handle SIGPIPE nostop
- (gdb) cont
+----
+# gdb attach $(pidof X)
+[---GDB starts---]
+(gdb) handle SIGPIPE nostop
+(gdb) cont
+----
If there are several instances, one can use `ps aux` to determine the
PID of the appropriate instance (2nd column → `$pid`), and then attach
it:
- # gdb attach $pid
- [---GDB starts---]
- (gdb) handle SIGPIPE nostop
- (gdb) cont
+----
+# gdb attach $pid
+[---GDB starts---]
+(gdb) handle SIGPIPE nostop
+(gdb) cont
+----
Starting X from gdb
~~~~~~~~~~~~~~~~~~~
@@ -113,10 +125,12 @@ In case X crashes at start-up, one can start X from `gdb` in the
following way. In this example, the only parameter is the display, but
more parameters can be added.
- # gdb --args Xorg :0
- [---GDB starts---]
- (gdb) handle SIGPIPE nostop
- (gdb) run
+----
+# gdb --args Xorg :0
+[---GDB starts---]
+(gdb) handle SIGPIPE nostop
+(gdb) run
+----
What is SIGPIPE?
~~~~~~~~~~~~~~~~
@@ -136,8 +150,10 @@ a backtrace (`bt`) or a full backtrace (`bt full`). The latter is what
developers are usually interested in, because variable values are also
available.
- (gdb) bt
- (gdb) bt full
+----
+(gdb) bt
+(gdb) bt full
+----
How to save a backtrace?
~~~~~~~~~~~~~~~~~~~~~~~~
@@ -145,12 +161,16 @@ How to save a backtrace?
To save a recording of the gdb session to a file (`gdb.txt` by
default):
- (gdb) set logging on
+----
+(gdb) set logging on
+----
To save in a different file, use this instead:
- (gdb) set logging file my-file.txt
- (gdb) set logging on
+----
+(gdb) set logging file my-file.txt
+(gdb) set logging on
+----
Once logging is enabled, you can request a (full) backtrace using the
previous commands.
diff --git a/xsf-docs/howto/use-xrandr.txt b/xsf-docs/howto/use-xrandr.txt
index 4c11f93..499bb2a 100644
--- a/xsf-docs/howto/use-xrandr.txt
+++ b/xsf-docs/howto/use-xrandr.txt
@@ -60,16 +60,18 @@ modes will probably be different.
All outputs may be configured through `xrandr`. To see the available
outputs, just run `xrandr`:
- $ xrandr
- Screen 0: minimum 320 x 200, current 1280 x 800, maximum 4096 x 4096
- VGA1 disconnected (normal left inverted right x axis y axis)
- LVDS1 connected 1280x800+0+0 inverted X and Y axis (normal left inverted right x axis y axis) 261mm x 163mm
- 1280x800 59.8*+
- 1024x768 60.0
- 800x600 60.3 56.2
- 640x480 59.9
- DVI1 disconnected (normal left inverted right x axis y axis)
- TV1 disconnected (normal left inverted right x axis y axis)
+----
+$ xrandr
+Screen 0: minimum 320 x 200, current 1280 x 800, maximum 4096 x 4096
+VGA1 disconnected (normal left inverted right x axis y axis)
+LVDS1 connected 1280x800+0+0 inverted X and Y axis (normal left inverted right x axis y axis) 261mm x 163mm
+ 1280x800 59.8*+
+ 1024x768 60.0
+ 800x600 60.3 56.2
+ 640x480 59.9
+DVI1 disconnected (normal left inverted right x axis y axis)
+TV1 disconnected (normal left inverted right x axis y axis)
+----
Comments:
@@ -85,7 +87,9 @@ Comments:
When manipulating `VGA1` output properties, you should use:
- $ xrandr --output VGA1 <options>
+----
+$ xrandr --output VGA1 <options>
+----
Adding/removing heads dynamically
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -95,11 +99,15 @@ are gone. With `RandR` 1.2, you can plug/unplug monitors whenever you
want. Running the following line will query all outputs and enable
them with their default mode:
- $ xrandr --auto
+----
+$ xrandr --auto
+----
You may also disable one output using:
- $ xrandr --output LVDS1 --off
+----
+$ xrandr --output LVDS1 --off
+----
This may be useful for some buggy application that don’t support
multiple outputs well. Also, due to CRTC limitations (see the Caveats
@@ -112,17 +120,23 @@ Changing the mode
With the above `xrandr` output, you may change the `LVDS1` mode to
`1024x768` using:
- $ xrandr --output LVDS1 --mode 1024x768
+----
+$ xrandr --output LVDS1 --mode 1024x768
+----
The refresh rate may also be changed, either at the same time or
independently:
- $ xrandr --output LVDS1 --mode 1024x768 --rate 75
- $ xrandr --output LVDS1 --rate 75
+----
+$ xrandr --output LVDS1 --mode 1024x768 --rate 75
+$ xrandr --output LVDS1 --rate 75
+----
To get back to the default mode:
- $ xrandr --output LVDS1 --auto
+----
+$ xrandr --output LVDS1 --auto
+----
<<<
@@ -135,8 +149,10 @@ A bit of configuration for non-KMS setups:
Let’s have a look at the maximal virtual screen size, we see
`4096x4096` in this example:
- $ xrandr|head -1
- Screen 0: minimum 320 x 200, current 1280 x 800, maximum 4096 x 4096
+----
+$ xrandr|head -1
+Screen 0: minimum 320 x 200, current 1280 x 800, maximum 4096 x 4096
+----
With KMS (*FIXME: Link to a page which explains what KMS is*),
there's no need to specify any `Virtual` option. With DRI and without
@@ -148,13 +164,15 @@ If you plan to use multiple outputs displaying different zones, you
should configure your `xorg.conf` by adding a `Virtual` line to the
`Display` subsection in the `Screen` section.
- Section "Screen"
- ...
- SubSection "Display"
- Depth 24
- Virtual 3000 2000
- EndSubSection
- EndSection
+----
+Section "Screen"
+ …
+ SubSection "Display"
+ Depth 24
+ Virtual 3000 2000
+ EndSubSection
+EndSection
+----
Place outputs
~~~~~~~~~~~~~
@@ -163,7 +181,9 @@ Outputs are placed using the following options:
`--right-of`/`--left-of`/`--above`/`--below`. For instance, to place
the `VGA1` output virtually-right of the internal panel (`LVDS1`):
- $ xrandr --output VGA1 --right-of LVDS1
+----
+$ xrandr --output VGA1 --right-of LVDS1
+----
Note that hardware and memory limitations may severely restrict the
size of your virtual screen, see the Caveats section below.
@@ -180,11 +200,15 @@ was using it and you disabled it in the meantime.
If a mode exist, you may add it to one output with:
- $ xrandr --addmode VGA1 800x600
+----
+$ xrandr --addmode VGA1 800x600
+----
If the mode does not exist, you may first create it by passing a modeline:
- $ xrandr --newmode <ModeLine>
+----
+$ xrandr --newmode <ModeLine>
+----
You may create a modeline using the `gtf` or `cvt` tools (shipped in
the `xserver-xorg-core` package).
commit c333fe7b6f080b6e7f681972a10ee0cba852226c
Author: Cyril Brulebois <kibi@debian.org>
Date: Sun Mar 20 17:24:36 2011 +0100
triage-bugs: Use pretty quoting.
diff --git a/xsf-docs/howto/triage-bugs.txt b/xsf-docs/howto/triage-bugs.txt
index 033126e..3440938 100644
--- a/xsf-docs/howto/triage-bugs.txt
+++ b/xsf-docs/howto/triage-bugs.txt
@@ -13,9 +13,11 @@ http://bugs.freedesktop.org/ for most packages), and marked as such.
A mail to `control@bugs.debian.org` would look like:
- tag X upstream
- forwarded X https://bugs.freedesktop.org/show_bug.cgi?id=Y
- thanks
+----
+tag X upstream
+forwarded X https://bugs.freedesktop.org/show_bug.cgi?id=Y
+thanks
+----
Then http://bts-link.alioth.debian.org/[`bts-link`] comes into play
and helps us tracking upstream status, which is pretty nice to have.
@@ -86,16 +88,17 @@ Needed steps for that to happen:
* profit!
To move the usertags, something like that should do the job:
-
- # Adding usertags:
- user $package1@packages.debian.org
- usertag X xset
- usertag Y xrandr
- user $package2@packages.debian.org
- usertag Z i810
-
- # Removing tags which are no longer needed:
- user debian-x@lists.debian.org
- usertag X - xset
- usertag Y - xrandr
- usertag Z - i810
+----
+# Adding usertags:
+user $package1@packages.debian.org
+usertag X xset
+usertag Y xrandr
+user $package2@packages.debian.org
+usertag Z i810
+
+# Removing tags which are no longer needed:
+user debian-x@lists.debian.org
+usertag X - xset
+usertag Y - xrandr
+usertag Z - i810
+----
commit 0cfd192aded2b8ae4ec126c03c5cc9794c06fa7f
Author: Cyril Brulebois <kibi@debian.org>
Date: Sun Mar 20 17:20:08 2011 +0100
faq/general: Fix typo introduced during the conversion.
diff --git a/xsf-docs/faq/general.txt b/xsf-docs/faq/general.txt
index 0faae3e..f2ea07a 100644
--- a/xsf-docs/faq/general.txt
+++ b/xsf-docs/faq/general.txt
@@ -62,7 +62,7 @@ Nouveau driver
interfaces aren’t stable yet, so the driver has particular
dependencies on the kernel, which are documented in `README.Debian`
(view it online:
- http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-nouveau.git;a=blob;f=debian/README.Debian;h=27ced6b1bf5102a5b72525318439efdfb330745d;hb=6c2f12ca18f55b55d49e083d86d87d970ce53a07[for squeeze]),
+ http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-nouveau.git;a=blob;f=debian/README.Debian;h=27ced6b1bf5102a5b72525318439efdfb330745d;hb=6c2f12ca18f55b55d49e083d86d87d970ce53a07[for squeeze],
http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-nouveau.git;a=blob;f=debian/README.Debian[for sid]).
commit d0281ee9f294ff5e2578b177773beedb663c9c72
Author: Cyril Brulebois <kibi@debian.org>
Date: Sun Mar 20 17:19:45 2011 +0100
faq/general: Use pretty quoting.
diff --git a/xsf-docs/faq/general.txt b/xsf-docs/faq/general.txt
index 07fd84b..0faae3e 100644
--- a/xsf-docs/faq/general.txt
+++ b/xsf-docs/faq/general.txt
@@ -47,12 +47,12 @@ Intel driver
http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-intel.git;a=blob;f=debian/README.Debian[git.debian.org]). Please
note that you need to disable `KMS` if you want to use the `vesa`
driver. A minimal `xorg.conf` would look like:
-
- Section "Device"
- Identifier "MyBuggyCard"
- Driver "fbdev"
- EndSection
-
+----
+Section "Device"
+ Identifier "MyBuggyCard"
+ Driver "fbdev"
+EndSection
+----
Nouveau driver
~~~~~~~~~~~~~~
@@ -76,5 +76,6 @@ Session management
* _How to start a bare X session (without Gnome, KDE, etc.)?_ +
Assuming there’s no X running on the `:1` display, run this from a
VT:
-
- startx /usr/bin/xterm -- :1
+----
+startx /usr/bin/xterm -- :1
+----
commit 4be2ea8cc8ddf299acfad3842d487cd07c87f04d
Author: Cyril Brulebois <kibi@debian.org>
Date: Sun Mar 20 17:13:29 2011 +0100
dependencies: Use pretty quoting.
diff --git a/xsf-docs/reference/dependencies.txt b/xsf-docs/reference/dependencies.txt
index c1820e0..8e32cf1 100644
--- a/xsf-docs/reference/dependencies.txt
+++ b/xsf-docs/reference/dependencies.txt
@@ -32,11 +32,12 @@ Conclusion: We need to keep track of both major and minor.
Thanks to `pkg-config` we can query them:
- $ pkg-config --variable=abi_videodrv xorg-server
- 9.0
- $ pkg-config --variable=abi_xinput xorg-server
- 12.1
-
+----
+$ pkg-config --variable=abi_videodrv xorg-server
+9.0
+$ pkg-config --variable=abi_xinput xorg-server
+12.1
+----
<<<
Debian-side: Using virtual packages
@@ -68,8 +69,9 @@ in `xserver-xorg-dev`, to be used while building drivers:
Example for `xinputdep`:
- xorg-input-abi-11, xserver-xorg-core (>= 2:1.8.99.904)
-
+----
+xorg-input-abi-11, xserver-xorg-core (>= 2:1.8.99.904)
+----
To make sure we bump the `debian/serverminver` when there’s a minor
ABI change, there’s a `abibumpcheck` target (on which `clean`
depends), which extracts input and video ABI from the upstream header,
@@ -83,13 +85,15 @@ Driver’s control file
Drivers also use substitution variables in their control file,
replaced at build time.
- # Input driver:
- Depends: ${xinpdriver:Depends}, …
- Provides: ${xinpdriver:Provides}
-
- # Video driver:
- Depends: ${xviddriver:Depends}, …
- Provides: ${xviddriver:Provides}
+----
+# Input driver:
+Depends: ${xinpdriver:Depends}, …
+Provides: ${xinpdriver:Provides}
+
+# Video driver:
+Depends: ${xviddriver:Depends}, …
+Provides: ${xviddriver:Provides}
+----
For now, `${xinpdriver:Provides}` is always replaced with
`xorg-driver-input`, and `${xviddriver:Provides}` is always replaced
@@ -146,49 +150,53 @@ The following assumes:
Sample debian/control file
~~~~~~~~~~~~~~~~~~~~~~~~~~
- Build-Depends:
- debhelper (>= 8),
- dh-autoreconf,
- quilt,
- xserver-xorg-dev (>= 2:1.9.4),
- …
-
- Depends:
- ${shlibs:Depends},
- ${misc:Depends},
- ${xviddriver:Depends},
- Provides:
- ${xviddriver:Provides}
-
+----
+Build-Depends:
+ debhelper (>= 8),
+ dh-autoreconf,
+ quilt,
+ xserver-xorg-dev (>= 2:1.9.4),
+----
+
+----
+Depends:
+ ${shlibs:Depends},
+ ${misc:Depends},
+ ${xviddriver:Depends},
+Provides:
+ ${xviddriver:Provides}
+----
Sample debian/rules file
~~~~~~~~~~~~~~~~~~~~~~~~
- #!/usr/bin/make -f
+----
+#!/usr/bin/make -f
- # Configuration:
- #override_dh_auto_configure:
- # dh_auto_configure -- --with-FOO --without-BAR
+# Configuration:
+#override_dh_auto_configure:
+# dh_auto_configure -- --with-FOO --without-BAR
- # Install in debian/tmp to retain control through dh_install:
- override_dh_auto_install:
- dh_auto_install --destdir=debian/tmp
+# Install in debian/tmp to retain control through dh_install:
+override_dh_auto_install:
+ dh_auto_install --destdir=debian/tmp
- # Kill *.la files, and forget no-one:
- override_dh_install:
- find debian/tmp -name '*.la' -delete
- dh_install --fail-missing
+# Kill *.la files, and forget no-one:
+override_dh_install:
+ find debian/tmp -name '*.la' -delete
+ dh_install --fail-missing
- ## Debug package:
- #override_dh_strip:
- # dh_strip --dbg-package=xserver-xorg-video-DRIVER-dbg
+## Debug package:
+#override_dh_strip:
+# dh_strip --dbg-package=xserver-xorg-video-DRIVER-dbg
- # That's a plugin, use appropriate warning level:
- override_dh_shlibdeps:
- dh_shlibdeps -- --warnings=6
+# That's a plugin, use appropriate warning level:
+override_dh_shlibdeps:
+ dh_shlibdeps -- --warnings=6
- %:
- dh $@ --with quilt,autoreconf,xsf --builddirectory=build/
+%:
+ dh $@ --with quilt,autoreconf,xsf --builddirectory=build/
+----
Some comments:
commit 4742873e6e9af78fded3dd56702ec0b311e99ea1
Author: Cyril Brulebois <kibi@debian.org>
Date: Sun Mar 20 17:05:24 2011 +0100
dependencies: Insert page breaks.
diff --git a/xsf-docs/reference/dependencies.txt b/xsf-docs/reference/dependencies.txt
index 27d35a9..c1820e0 100644
--- a/xsf-docs/reference/dependencies.txt
+++ b/xsf-docs/reference/dependencies.txt
@@ -38,6 +38,7 @@ Thanks to `pkg-config` we can query them:
12.1
+<<<
Debian-side: Using virtual packages
-----------------------------------
@@ -131,6 +132,7 @@ To make it easy to compute substvars when using `dh`, a `dh` sequence
repetitive tasks could also be automated this way.
Reply to: