xorg: Changes to 'debian-unstable'
debian/changelog | 12 ++++++++++++
xsf-docs/faq/general.txt | 5 +++++
xsf-docs/howto/build-mesa.txt | 8 ++------
xsf-docs/howto/use-gdb.txt | 5 ++++-
xsf-docs/index.txt | 2 +-
xsf-docs/reference/dependencies.txt | 18 ++++++++++++++++++
xsf-docs/reference/squeeze-backports.txt | 10 ++++------
7 files changed, 46 insertions(+), 14 deletions(-)
New commits:
commit e7cfecc2ba6a1c5da3312cccaab384128a5260d1
Author: Cyril Brulebois <kibi@debian.org>
Date: Mon Jun 25 22:33:01 2012 +0200
Bump changelog.
diff --git a/debian/changelog b/debian/changelog
index bda4a0b..eb33042 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+xorg (1:7.7+1) UNRELEASED; urgency=low
+
+ * Merge xsf-docs up to 6b4a944090 commit:
+ - index: Improve wording.
+ - faq/general: Add a reference to how to build mesa.
+ - howto/build-mesa: Update the section about nouveau.
+ - howto/use-gdb: Mention new gdm3 setting (thanks to Joss).
+ - reference/dependencies: Add how to handle transitions.
+ - reference/squeeze-backports: Update for current situation.
+
+ -- Cyril Brulebois <kibi@debian.org> Mon, 25 Jun 2012 22:29:22 +0200
+
xorg (1:7.6+13) unstable; urgency=high
[ Julien Cristau ]
commit 6b4a944090829d8477dc4dad2af5583b1c7d9bf5
Author: Cyril Brulebois <kibi@debian.org>
Date: Mon Jun 25 22:26:55 2012 +0200
Document -core for latest gdm3.
diff --git a/xsf-docs/howto/use-gdb.txt b/xsf-docs/howto/use-gdb.txt
index 8de06f0..dce7d02 100644
--- a/xsf-docs/howto/use-gdb.txt
+++ b/xsf-docs/howto/use-gdb.txt
@@ -56,7 +56,10 @@ Actual gdb work
Getting a core file
~~~~~~~~~~~~~~~~~~~
- * Using `gdm3`: The idea is to tweak the daemon’s
+ * Using `gdm3` 3.4.1 and above: uncomment `Enable = true` in the
+ `[debug]` section of the `/etc/gdm3/daemon.conf` file.
+
+ * Using an older `gdm3` package: The idea is to tweak the daemon’s
`LocalXserverCommand` setting, adding the `-core` option. As of
`gdm3 2.30`, the defaults can be found in
`/usr/share/gdm/gdm.schemas`. Sample `/etc/gdm3/daemon.conf`
commit c256d67ce9d3c828a7f998dd6232db669247b4a0
Author: Cyril Brulebois <kibi@debian.org>
Date: Tue Aug 30 09:07:52 2011 +0200
dependencies: Mention how to request a transition page.
diff --git a/xsf-docs/reference/dependencies.txt b/xsf-docs/reference/dependencies.txt
index 8e32cf1..4cdf7a9 100644
--- a/xsf-docs/reference/dependencies.txt
+++ b/xsf-docs/reference/dependencies.txt
@@ -226,6 +226,24 @@ can be used as an example.
<<<
+Handling a transition
+---------------------
+
+When a new major version of the server comes up, it can be updated
+following its `README.source`. Usually, drivers can be rebuilt using
+binNMUs. Be sure `xorg-server` is marked as `Installed` on all
+buildds, or set a `dep-wait`.
+
+On the release team side, a transition page can be asked for, to track
+fully rebuilt drivers. For the input 12→13 and video 10→11
+transitions, the settings are:
+
+ * Affected: `.build-depends ~ /xserver-xorg-dev/`
+ * Good: `.depends ~ /xorg-input-abi-13/ | .depends ~ /xorg-video-abi-11/`
+ * Bad: `.depends ~ /xorg-input-abi-12/ | .depends ~ /xorg-video-abi-10/`
+
+
+<<<
Staying tuned
-------------
commit 195f1f51562592732464226894883339fddf32ca
Author: Cyril Brulebois <kibi@debian.org>
Date: Tue Aug 30 00:05:44 2011 +0200
faq: Mention how to gather intel about 3D.
diff --git a/xsf-docs/faq/general.txt b/xsf-docs/faq/general.txt
index 015c6af..b0554e5 100644
--- a/xsf-docs/faq/general.txt
+++ b/xsf-docs/faq/general.txt
@@ -30,6 +30,11 @@ All drivers
preferences, through the `-dpi` X server command line option (see
++Xserver++’s manual page), or through ++xrandr++’s `--dpi` option.
+ * _How do I get some info about 3D support?_ +
+ Look at the link:../howto/build-mesa.html[instructions to build mesa],
+ there are a few commands to learn about 3D support, the current driver,
+ etc.
+
Ati driver
~~~~~~~~~~
commit 3121efb27aa2c84a04f0d159ef867b15aef86ddb
Author: Cyril Brulebois <kibi@debian.org>
Date: Tue Aug 30 00:02:08 2011 +0200
build-mesa: libdrm-dev is available in squeeze-backports.
diff --git a/xsf-docs/howto/build-mesa.txt b/xsf-docs/howto/build-mesa.txt
index 6840179..ade3771 100644
--- a/xsf-docs/howto/build-mesa.txt
+++ b/xsf-docs/howto/build-mesa.txt
@@ -87,8 +87,8 @@ $ 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
-about a local installation?), as well as `libxmu-dev`, `libxi-dev`.
+newer `libdrm-dev` (it is available in `squeeze-backports`),
+as well as `libxmu-dev`, `libxi-dev`.
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
commit 28e8d6f2c8194791aa1d679e728f9fdd853945af
Author: Cyril Brulebois <kibi@debian.org>
Date: Tue Aug 30 00:00:07 2011 +0200
build-mesa: Update comment, we are shipping nouveau_vieux_dri.so now.
diff --git a/xsf-docs/howto/build-mesa.txt b/xsf-docs/howto/build-mesa.txt
index c6e1b90..6840179 100644
--- a/xsf-docs/howto/build-mesa.txt
+++ b/xsf-docs/howto/build-mesa.txt
@@ -34,10 +34,6 @@ Before reading further, be aware that `nouveau` is a bit special:
* It’s considered experimental, and shipped in the
`libgl1-mesa-dri-experimental` package accordingly.
* It may fail to build (both API and ABI are still changing).
- * We’re not shipping `nouveau_vieux_dri.so` yet (for cards from NV04
- to NV2X; `nouveau_dri.so` is for NV30 and later). See the upstream
- http://nouveau.freedesktop.org/wiki/FeatureMatrix[FeatureMatrix]
- page to determine a card’s series.
****
commit a685059d176bd7cea66aa2094d2136318cd3f770
Author: Cyril Brulebois <kibi@debian.org>
Date: Wed Aug 24 16:20:44 2011 +0200
index: Better name for the squeeze-backports page.
diff --git a/xsf-docs/index.txt b/xsf-docs/index.txt
index b244dce..48400e9 100644
--- a/xsf-docs/index.txt
+++ b/xsf-docs/index.txt
@@ -33,7 +33,7 @@ Reference documentation
* link:reference/git-usage.html[Using git for X repositories]
* link:reference/dependencies.html[Dependencies between server and drivers]
- * link:reference/squeeze-backports.html[Backports policy for squeeze]
+ * link:reference/squeeze-backports.html[Backports of the whole X stack for squeeze]
* link:reference/upstream-contacts.html[Upstream contacts]
Other documentation
commit 5cc1993275041323aa2521bbd613f115381a03e1
Author: Cyril Brulebois <kibi@debian.org>
Date: Wed Aug 24 16:19:54 2011 +0200
squeeze-backports: wacom should no longer cause issues.
(Backport uploaded.)
diff --git a/xsf-docs/reference/squeeze-backports.txt b/xsf-docs/reference/squeeze-backports.txt
index 2243ff2..20fb996 100644
--- a/xsf-docs/reference/squeeze-backports.txt
+++ b/xsf-docs/reference/squeeze-backports.txt
@@ -48,15 +48,11 @@ cases.
In the usual case, both the `xserver-xorg-input-all` and
`xserver-xorg-video-all` meta packages were installed, and pulled a
-lot of packages, which should work for most users. In that case, due
-to a bug in `apt`, one has to remove the `wacom` input package before
-proceeding to the upgrade (the `xserver-xorg-input-all` package might
-be scheduled for removal as a consequence, but that doesn’t
-hurt). Then specifying a few packages to upgrade should pull
+lot of packages, which should work for most users.
+Specifying a few packages to upgrade should pull
everything from `squeeze-backports`.
----
-apt-get purge xserver-xorg-input-wacom
apt-get install -t squeeze-backports xorg xserver-xorg xserver-xorg-core xserver-xorg-input-all xserver-xorg-video-all
apt-get install -t squeeze-backports libgl1-mesa-dri libgl1-mesa-glx
----
commit e8476c81d8087d30036f634fada328c7bc3a8e45
Author: Cyril Brulebois <kibi@debian.org>
Date: Sat Aug 20 00:22:41 2011 +0200
squeeze-backports: Make sure to tell people to pull libgl1-mesa-glx as well.
diff --git a/xsf-docs/reference/squeeze-backports.txt b/xsf-docs/reference/squeeze-backports.txt
index e9e3a1f..2243ff2 100644
--- a/xsf-docs/reference/squeeze-backports.txt
+++ b/xsf-docs/reference/squeeze-backports.txt
@@ -58,6 +58,7 @@ everything from `squeeze-backports`.
----
apt-get purge xserver-xorg-input-wacom
apt-get install -t squeeze-backports xorg xserver-xorg xserver-xorg-core xserver-xorg-input-all xserver-xorg-video-all
+apt-get install -t squeeze-backports libgl1-mesa-dri libgl1-mesa-glx
----
In case only the needed packages were installed, like the `synaptics`
@@ -65,6 +66,7 @@ input driver and the `intel` video driver, the following should be
sufficient:
----
apt-get install -t squeeze-backports xorg xserver-xorg xserver-xorg-core xserver-xorg-input-synaptics xserver-xorg-video-intel
+apt-get install -t squeeze-backports libgl1-mesa-dri libgl1-mesa-glx
----
It is probably a very good idea to install the Linux kernel from
Reply to: