debian/changelog | 8 + xsf-docs/index.txt | 1 xsf-docs/reference/squeeze-backports.txt | 130 ++++++++++++++----------------- 3 files changed, 69 insertions(+), 70 deletions(-)
New commits: commit 98adffe5cd75b7934b704b77dd2f60ccc5e4e62a Author: Cyril Brulebois <[email protected]> Date: Sun Aug 14 22:52:54 2011 +0200 Set urgency to “medium” for the HAL vs. GNU/kFreeBSD bug fix. diff --git a/debian/changelog b/debian/changelog index 0477e3f..ad05ec5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -xorg (1:7.6+8) UNRELEASED; urgency=low +xorg (1:7.6+8) UNRELEASED; urgency=medium [ Julien Cristau ] * Add Provides: xserver to xserver-xorg. @@ -10,6 +10,7 @@ xorg (1:7.6+8) UNRELEASED; urgency=low [ Cyril Brulebois ] * Merge xsf-docs up to the 58c0ca7f5c commit: - Update: reference/squeeze-backports + * Set urgency to “medium” for the HAL vs. GNU/kFreeBSD bug fix. -- Julien Cristau <[email protected]> Mon, 01 Aug 2011 01:23:42 +0200 commit 149c5d376910adb36aa26bb64f0bed1467a814ed Author: Cyril Brulebois <[email protected]> Date: Sun Aug 14 22:51:03 2011 +0200 Document the xsf-docs merge. diff --git a/debian/changelog b/debian/changelog index 35ba425..0477e3f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,16 @@ xorg (1:7.6+8) UNRELEASED; urgency=low + [ Julien Cristau ] * Add Provides: xserver to xserver-xorg. * Add Serbian cyrillic and Serbian latin debconf translations (closes: #635009, #635016). Thanks, Zlatan Todoric! * Use dbus activation to restart hal on kfreebsd, its init script is gone (closes: #624398). + [ Cyril Brulebois ] + * Merge xsf-docs up to the 58c0ca7f5c commit: + - Update: reference/squeeze-backports + -- Julien Cristau <[email protected]> Mon, 01 Aug 2011 01:23:42 +0200 xorg (1:7.6+7) unstable; urgency=low commit 58c0ca7f5c2de8edd1ad5c1a32e71d65cc577432 Author: Cyril Brulebois <[email protected]> Date: Sun Aug 14 22:43:18 2011 +0200 squeeze-backports: Fix typo. diff --git a/xsf-docs/reference/squeeze-backports.txt b/xsf-docs/reference/squeeze-backports.txt index a54ebd0..214a003 100644 --- a/xsf-docs/reference/squeeze-backports.txt +++ b/xsf-docs/reference/squeeze-backports.txt @@ -12,7 +12,7 @@ to: the server itself, input and video drivers, libdrm, and mesa. To keep things simple, the idea is to backport all of those to `squeeze` through `squeeze-backports`, along with some of the additional packages which might be involved (like `libxfont` or -`x11proto-xfixes-dev`). +`x11proto-fixes-dev`). The backports were prepared so that it’s possible to upgrade the `input-all` and `video-all` meta packages on `amd64` and `i386`. If commit d60d3c7c6cdef76b029c0832fd277ca89e8b592e Author: Cyril Brulebois <[email protected]> Date: Sun Aug 14 22:39:45 2011 +0200 squeeze-backports: Update title, and drop ToC. diff --git a/xsf-docs/reference/squeeze-backports.txt b/xsf-docs/reference/squeeze-backports.txt index 300596d..a54ebd0 100644 --- a/xsf-docs/reference/squeeze-backports.txt +++ b/xsf-docs/reference/squeeze-backports.txt @@ -1,6 +1,5 @@ -Backports policy for squeeze -============================ -:toc: +Backports for squeeze +===================== Cyril Brulebois <[email protected]> commit abb2a7005f0fadec0213962f06af3efa8a9ad0b5 Author: Cyril Brulebois <[email protected]> Date: Sun Aug 14 22:38:34 2011 +0200 squeeze-backports: Mention best effort. diff --git a/xsf-docs/reference/squeeze-backports.txt b/xsf-docs/reference/squeeze-backports.txt index 5e0f265..300596d 100644 --- a/xsf-docs/reference/squeeze-backports.txt +++ b/xsf-docs/reference/squeeze-backports.txt @@ -15,6 +15,13 @@ To keep things simple, the idea is to backport all of those to additional packages which might be involved (like `libxfont` or `x11proto-xfixes-dev`). +The backports were prepared so that it’s possible to upgrade the +`input-all` and `video-all` meta packages on `amd64` and `i386`. If +specific drivers (maintained by the X Strike Force) are wanted, +requesting them on the `debian-backports@` / `debian-x@` mailing lists +should do the trick. For other drivers, please contact the relevant +package maintainers. + Instructions ------------ commit 5b047a8a718a5e2aadfd06ad731b1996eb3181c2 Author: Cyril Brulebois <[email protected]> Date: Sun Aug 14 22:06:42 2011 +0200 squeeze-backports: Rework doc. diff --git a/xsf-docs/reference/squeeze-backports.txt b/xsf-docs/reference/squeeze-backports.txt index 11c2e30..5e0f265 100644 --- a/xsf-docs/reference/squeeze-backports.txt +++ b/xsf-docs/reference/squeeze-backports.txt @@ -4,73 +4,59 @@ Backports policy for squeeze Cyril Brulebois <[email protected]> -Proposed plans --------------- +Bird’s-eye view +--------------- If one forgets about libraries and clients, a whole X stack boils down to: the server itself, input and video drivers, libdrm, and mesa. -Since upgrading the server means upgrading all input and video drivers -(more than 50 source packages), that’s certainly too much to backport, -since we’re already trying to support `stable` (through stable -updates), `testing`/`unstable`, and `experimental`. For example, in -February 2011, that means `xorg-server` 1.7 in `stable`, 1.9 in -`unstable` (and “soon” in `testing`), and 1.10 in `experimental`. - -So the plan is to keep `xorg-server` as it is in `squeeze` (possibly -preparing/testing targeted fix if appropriate), and backporting -drivers when possible. With API/ABI updates, the minimal server -version required tend to get raised from time to time, but usually -drivers can be built against a rather large range of server -versions. In case a driver stop building against the server available -in `stable`, we’ll likely stick to the highest version still building -against it, and then tell people to upgrade the whole stack if they -need something more recent (unless some trivial cherry-picking is -possible, of course). - -The plan is to backport a few drivers on a possibly regular fashion, -and other drivers upon request. - - -Input drivers -~~~~~~~~~~~~~ - - * `evdev`: Linux-only keyboard & mouse/pointer driver. - * `keyboard` and `mouse`: Needed for non-Linux ports. - * `synaptics`: Better touchpad support than `evdev`. - - -Video drivers -~~~~~~~~~~~~~ - - * `ati`: Drivers for ATI cards. - * `intel`: Driver for Intel cards. - * `nouveau`: Driver for NVidia cards. Not possible since upstream’s http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-nouveau.git;a=commit;h=a4d580bf05d7aac1d486e5d1ba9a2201c026e5f5[a4d580bf05]. - * `fbdev` and `vesa`: Generic drivers. - * `dummy`: Dummy driver, suitable when there’s no monitor connected. - -.Note -There are a few other drivers for ATI cards (`mach64`, `r128`), which -are pulled by `ati`, but there are versions available in `squeeze` -already, so backporting them isn’t required. - - -Libraries -~~~~~~~~~ - -The important libraries are `libdrm` and `mesa`. The former will -likely get pulled at some point by a driver, so a backport will be -needed for this library. The latter is under very heavy development, -so one may want to try a new release or a snapshot without having to -upgrade everything to `unstable`. It’s a huge package to build, so we -link:../howto/build-mesa.html[documented how to build it] locally. But -there’s some hope to make some weekly or daily builds available at -some point. - - -Kernel -~~~~~~ - -Some of those drivers might need a more recent kernel version than -the one in `squeeze`, but hopefully it’ll be available through -`squeeze-backports` as well. +To keep things simple, the idea is to backport all of those to +`squeeze` through `squeeze-backports`, along with some of the +additional packages which might be involved (like `libxfont` or +`x11proto-xfixes-dev`). + + +Instructions +------------ + +The usual link:http://backports-master.debian.org/[backports instructions] +apply. But let’s gather everything in a single place. + +Add that to your `sources.list`: +---- +deb http://backports.debian.org/debian-backports squeeze-backports main +---- + +Update your cache: +---- +apt-get update +---- + +If you’re interested in just upgrading the usual `mesa` packages: +---- +apt-get install -t squeeze-backports libgl1-mesa-dri libgl1-mesa-glx +---- + +If you want the whole stack, we should distinguish between two +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 +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 +---- + +In case only the needed packages were installed, like the `synaptics` +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 +---- commit 625993d1fc0086dd2af11a225310270ba32b7e89 Author: Cyril Brulebois <[email protected]> Date: Fri Jun 3 23:51:07 2011 +0200 index: Add link to git-usage. diff --git a/xsf-docs/index.txt b/xsf-docs/index.txt index c1043a6..b244dce 100644 --- a/xsf-docs/index.txt +++ b/xsf-docs/index.txt @@ -31,6 +31,7 @@ How to… 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/upstream-contacts.html[Upstream contacts] -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected] Archive: http://lists.debian.org/[email protected]
