xorg-server: Changes to 'refs/tags/debian/1.11.4-0ubuntu10.3'
Tag 'debian/1.11.4-0ubuntu10.3' created by Chase Douglas <chase.douglas@canonical.com> at 2012-06-20 16:13 +0000
tagging version debian/1.11.4-0ubuntu10.3
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
iQIcBAABAgAGBQJP4fajAAoJEI3Z6a9pX7cq9AkP/3wrISl/TJzLv33FyhdewKDM
/1LHtEf/RlNM3kt/2Y9bmjIg4nZ0y3hPK+AHcFJWNaYuXiDjV3QfdwaYtwQpQYWa
YDWqV5KV5uc5t/JYcxTarYYwsCZrYCgjKBYpkE0rl6yGXcqc5/IoWTBhjY23TVAJ
kPHn/Iw2JDkn9iaq+7/P9lKijDb1hdiiF8Wixep3z/VyX5VJuD2O242XundU7K7r
ePig9hk+Wx2CTQAvj9syK14eYZhSKl4gdybay6XJbXWX0O034FPbdJDDi03AqZHJ
G1Qyc6r4ArtH+OblKb/xBhZsG9FTEGLGxQM/eTPIVltB08gaIim4Jlub5Q5B7tjX
kg6yb7+QH0cN1PIYL2M4kZiZWqnyb9bobkoDfx3fElkBIik0j0omCAUPoOP3JnSd
k0/rPjQnyqeBIRUUI3Mnt0HaUx1NBRxqrqrdrvMsAqmL6TuIoz2ho1HRkcuMjZR7
6J83LRkfQQT7cuc9nlAC5ibPW7Gmk8sW2o+AqLr91UP4JnKerf25Ji1ZvyTGWM37
nLrgSFgMdFVcnoewFDIB/TcKAtbfRRazz/gLiYoAKAz2LJ2Kfa4Csyn+ZnpQgfU0
isYBgilWS6Zi4gQuHFtm7m7NtnD7imbOnqCQ0RjTL+J8uqX48TNgHVvRlvxH37Ra
ESNwbHIXLGdaB+Hc+lg0
=wOOU
-----END PGP SIGNATURE-----
Changes since xorg-server-2_1.11.2.902-1:
Aaron Plattner (3):
randr: check rotated virtual size limits correctly
linux: Retry VT ioctls while errno == EINTR
randr: Compare all the bytes in RRPostPendingProperties
Adam Jackson (4):
glx: Fix fbconfigs with no corresponding visual
xace: ricer tuning for XaceHook
dix: Tune dtrace hooks around Dispatch
dix: Tune dixLookupDrawable for success
Alan Coopersmith (8):
"privates.h", line 198: warning: void function cannot return value
fbbltone.c: Mark bitmasks as unsigned ints
Don't require ld -wrap for tests that don't need it
Enable memory checking during unit testing
Make XIGetKnownProperty take a const char * argument
Change disable_clientpointer return type to void
Add Solaris support to DetermineClientCmd
Convert DetermineClientCmd to use strdup instead of malloc+strncpy
Alberto Milone (14):
Make 190_cache-xkbcomp_output_for_fast_start_up.patch build again with xserver 1.7.
Update the debian/changelog with the changes from the previous commit.
Pull doko's changes
Use alternatives to make it easier to switch between X11 and 3rd party modules.
Update changelog.
Look for XvMCConfig in /usr/lib/xvmcconfig-standard and install
Install libglx.so and libdri.so in /usr/lib/standard-x11 as X
* debian/rules:
* debian/patches/191-Xorg-add-an-extra-module-path.patch:
* Release 2:1.7.3.902-1ubuntu5.
* Release 2:1.7.3.902-1ubuntu6
Add 191-Xorg-add-an-extra-module-path.patch as it was introduced
Adding changes from Alexander Sack to add support for omapfb
Fall back to autoconfiguration for graphics drivers in some cases
Alexandr Shadchin (1):
Fix position _X_EXPORT
Andreas Wettstein (1):
xkb: Support noLock and noUnlock flags for LockMods
Benjamin Otte (1):
dix: fix an out-of-memory crash
Brice Goglin (2):
Add fix-dga-removal.patch
Prepare changelog for upload
Bryce Harrington (180):
Fixing from line as requested by Bart Trojanowski
Adding patch from StevenK to fix touchscreen issues for ubuntu-mobile
Adding a patch with quirks for various monitors with bad EDID info
Adding other patch found by Tormod, to permit users to override the
150_config_file_preferred_mode.patch already exists as patch 43.
Patch to enable setting greedy mode, for fixing bug 177492 (EXA w/ 965
Adding patch
Merge branch 'ubuntu' of ssh://bryce-guest@alioth.debian.org/git/pkg-xorg/xserver/xorg-server into ubuntu
1ubuntu3 was already released; incrementing to 4...
Adding XAA Option Inversion patch (#182038)
Fix for bug 217647 - crash on PS3 closing unopened dir
Adding patch from martin-eric for autoconfing geode
Revert "Adding patch from martin-eric for autoconfing geode"
Fixing up patches to apply
Releasing
Adding patch for #219424
adding patch 169
Merge branch 'ubuntu' of ssh://bryce-guest@alioth.debian.org/git/pkg-xorg/xserver/xorg-server into ubuntu
Security fixes
Adding patch to fix bug with gdk apps crashing when using -vesa
In theory, this should help fix LP #247537.
debian/rules: Add --enable-xcsecurity --enable-appgroup.
Merge branch 'ubuntu' of ssh://bryce-guest@alioth.debian.org/git/pkg-xorg/xserver/xorg-server into ubuntu
Add 135_rethrow_signals.patch
Update 135_rethrow_signals.patch to catch a wider variety of signals.
140_quell_acpid_errmsgs.patch
Provide fallbacks for non-x86 platforms.
release
Fix for 281610
Updating patch for xserver 1.6 and reenable
Release to jaunty
Cherrypick upstream fix for bug 313567.
Fix up patch 155 to better match the latest changes in the upstream tree
null pointer check for vid mode selection
Couple more patches
Add kees' maxclient patch, and renumber steven's patch for consistency.
Fix build issue so maxclient patch applies to current xserver source.
Add timestamping to the Xorg log file
Cleanup log format.
Revert maxclients patch; it breaks -nvidia. Boo proprietary drivers.
Adding cherrypicked patch for bug 318261
Patch for crash in bug #139990
Noting bug which will be fixed with the xserver 1.6 merge
Null pointer check for error that happens when two cards are present.
More details on bugs fixed with this upload
Add fix for bug 296167
Patch 163 is already in 1.6.0; drop it in favor of message about fix.
Prep for release
Add patch for getting modes detected when no preferred monitor is
Fix large font issue with monitors that mix up physical size and aspect
Updating changelog for release
Fix man page to not list Device identifier as mandatory
Add null pointer check patch
Null pointer dereference check to prevent crash on resume
Update changelog for release
Patch from kees to send glibc traces to stderr instead of vt7
Fix for 333222 - crash when plugging/unplugging USB devices
Found another bug that I think will be fixed by this
prep for release
Null ptr check for cwGetBackingPicture()
Tormod's quirk patch for philips lcds
Concurrent invocations can lead to race condition with server number
Fix documentation to more clearly explain error exit codes
cl entry for bug 328205
Add Xephyr man page
Fixed missing newline
Patch from Alberto to set composite overlay window background to None
Add patch from redhat to fix vino mouse behavior
Fix crash with animated cursors, quell exaCopyDirty warnings, and revert
Add xserver-1.5.0-bad-fbdev-thats-mine.patch
Patch from Sarvatt to autodetect nvidia
Updated patch fixing some syntax errors
Add similar patch for -fglrx
Guess we can also do -radeonhd
Okay, let's be ballsy and even try -fglrx on older cards; who knows, it
Add 178_glx_flush_cache.patch to fix crash during compiz startup
Add patch 179 as well
Add several patches from fedora
Patch to fix the random blanking issue
Add another patch for blanking
Add support for vbox and non-cirrus qemu devices
Cherrypick from upstream to return BadWindow instead of BadMatch
Add geode autoconfigure support
Merge commit 'xorg-server-2_1.6.4-2' from Debian into ubuntu
Drop patches that are upstream now
Update changelog with remaining ubuntu changes
Patch for reverting the dga removal change.
Retain the DGA removal change.
Omit patch 188 from changelog
Add mention of bugs believed fixed as of this upload.
Add quirk for invalid edid
Apply de-bashed patch for fixing xvfb concurrent invocations
Default to first busid as primary
Default to first busid if X can't determine primary
Add two moblin patches to improve boot
Looks like kees slipped in a patch without updating git. Merge it in.
Refresh patch 188
Add description for patch 188
Refresh patch 169. The MIPOINTER() macro still returns NULL in some
Refresh patch 168, which we need for apport to catch x crashes.
Refresh patch 135, which we still need for apport to catch crashes
Updated patch 190
Drop 158; we've carried it disabled long enough.
Refresh 160 for 1.7 codebase and re-enable it to provide timings
Finish removal of patch 156
...and update changelog
Revert 190; I seem to have loused it up refreshing it.
Really update patch 190
Sign patch
Re-enable patch 190
Disable 190 - fails to build according to Sarvatt
Update rethrow_signals patch to build.
Rename patch 135 to 100
s/karmic/lucid/
Add bug #
Don't write to log file after it's been closed. Duh.
Timestamping is no longer needed
Disable patch 100. Apport off.
Fix from martin to get signal handling code to stop crashing during
Add xrandr support to xvfb
Add -nohwaccess patch
Add two patches Robert Collins requested
tidy
Automatically detect nouveau
Add patch to re-enable record extension
Add fix for segfault on swsusp resume
Update patch number
Fix patch to compile
Merge branch 'ubuntu' of ssh://bryce-guest@alioth.debian.org/git/pkg-xorg/xserver/xorg-server into ubuntu
Add null ptr deref patch from upstream for glyph crash
Merge asac's patch (and renumber for consistency)
Finalize changelog
Merge branch 'ubuntu' of ssh://bryce-guest@alioth.debian.org/git/pkg-xorg/xserver/xorg-server into ubuntu
Backport patch to make mod() define not open an exploit when using XAA
Extend to also cover another mod() in mi code
Fix release tag
asac's patch (missing from prior push)
Pilfer fedora's patch to stifle aiglx error messages for nouveau
Adding patch from Sarvatt for bug #550218 to fix clutter close crash
Add several patches cherrypicked from upstream xserver tree.
Plain text patches iz better
Merge branch 'ubuntu' of ssh://bryce-guest@alioth.debian.org/git/pkg-xorg/xserver/xorg-server into ubuntu
Merge branch 'ubuntu' of ssh://bryce-guest@alioth.debian.org/git/pkg-xorg/xserver/xorg-server into ubuntu
Update patches in previous upload to fix FTBS issue.
Add check for bounds on millis variable to prevent xauth overflow
Release
Drop duplicate patch
Drop glx 1.4 patches
Drop 114; with glx 1.4 gone this is no longer relevant
Changelog entry explaining dropping of several patches
Target to lucid since this will go out with the release
Incorporate fix for crash in miCopyRegion.
Add Debian's 19-exa-handle-pixmap-create-destroy-in-lower-layers.diff
Add fix from Martin Pitt to ignore XKBMODE=="SKIP" and "U.S. English"
Target to -proposed
Refer users to support instead of emailing maintainers
Oddly, BUILDER must not be quoted
Prepare changelog for upload
Patch from cnd to up abi version for gestures support
Patch for crash bug 597895
Make layout switching key combos not interfere with application shortcut
Restore 208_switch_on_release.diff - the patch does not appear to be upstream actually. Users confirm the fix regressed without it. (LP: #711842)
Since we're frozen at the moment, going to hold off on this upload, but
Add 210_pixman_null_ptr_check.patch: pixman_image_create_bits() can return NULL under a variety of circumstances, thus needs checked before dereferencing it in the pixman_image_set_has_client_clip() call. (LP: #705078)
* Add 211_glx_fix_bindtextimageext_length_check.patch,
Add 213_xichangehierarchy-check-oom.patch: Another NULL pointer check for out-of-memory conditions, this time leading to a segfault in an unchecked calloc in XISendDeviceHierarchyEvent(). (LP: #720445)
Bump for release.
Patch from upstream to revert commit 6dd775f which causes some graphics
Bump for release
Bump
patches/111_armel-drv-fallbacks.patch: Always fallback to -fbdev, not just when no other X driver matches. (Thanks jcristau)
Bump for release
Tweak formatting to be more consistent
releasing version 2:1.10.1-1ubuntu2
patch rule depends on stampdir creation
Add a check target which invokes xvfb-run to verify it works.
Add a check target to rules, which invokes xvfb-run to verify it works.
Include mention of a LP bug fixed in the new upstream release
Fix crash after connecting a bluetooth keyboard (LP: #930936)
Enable 227_null_ptr_midispcur.patch to apply
Carlos Garnacho (2):
Xi: assign correct grab_mode/other_device_mode in XI2 passive grabs
dix: fix xi2 mask/filter when delivering grabbed events
Chase Douglas (113):
add explict breaks from xserver-xorg-core
Fix udev USB product ID parsing (LP: #628214)
releasing version 2:1.9.0-0ubuntu3
Refresh xf86CoordinatesToWindows patch
Refresh gesture extension patch for 1.10 and re-enable it
Add in preliminary xi2.1 support
Two fixes for xi 2.1 support
Fix history tracking for unowned non-pointer-emulated touches
Fix a crasher when beginning a touch during an active pointer grab
Cancel touch clients if emulated button press is delivered. (LP: #725191)
Check slave device touch selection mask during implicit grab. (LP: #725241)
Cancel slave touch selections when attached to master device. (LP: #723904)
Check for touch selections only when there are active clients. (LP: #723900)
Prevent pointer motion when more than one touch on touchpad. (LP: #730881)
Add bug number to changelog for previous commit
Fix changelog attribution snafu due to rebase
Process ownership properly when activating an async passive grab (LP: #733483)
Fix jumpy cursor in XI 1.x applications (LP: #736500)
Fix masked transformed valuator handling (LP: #774938)
Fix event handling when neither X nor Y coordinates are set (LP: #806256)
Add fixes for touch grab handling, courtesy of Carlos Garnacho
Fix touch ownership processing for subsequent touch grabs (LP: #861896)
releasing version 2:1.10.4-1ubuntu3
Send touch ownership event for subsequent touch grabs (LP: #861906)
releasing version 2:1.10.4-1ubuntu4
Sync with oneiric security update
Fix crash on accepting a touch grab from an indirect device (LP: #877825)
A few random fixes that are needed due to backport cherry-picking
Merge remote-tracking branch 'origin/debian-unstable' into ubuntu
Drop prototype XI multitouch patches
Merge branch 'upstream-1.11+input' into ubuntu
Merge in input changes from upstream master through commit 7da7aa9
Bump input ABI
Refresh patches
releasing version 2:1.11.2.902-1ubuntu1
Merge remote-tracking branch 'upstream/server-1.11-branch' into upstream-1.11+input
Merge branch 'upstream-1.11+input' into ubuntu
Bump changelogs.
dix: add TouchGetPointerEventType helper function
Merge branch 'upstream-1.11+input' into ubuntu
Merge in input changes from upstream master through commit e7df42a
Bump input ABI
Bump x11proto-input-dev build dependency version
Add temporary patch for fixing a test case loop
releasing version 2:1.11.3-0ubuntu1
test/xi2: Really fix infinite loop in test_convert_XITouchOwnershipEvent
Merge branch 'upstream-1.11+input' into ubuntu
releasing version 2:1.11.3-0ubuntu2
Add temporary patch for fixing grab time bug
releasing version 2:1.11.3-0ubuntu3
Use event time instead of CurrentTime for grab times
Merge branch 'upstream-1.11+input' into ubuntu
Merge in input changes from upstream master through commit 954bb99
Remove temporary patch 220_grab_event_time.patch
releasing version 2:1.11.3-0ubuntu4
Add Breaks clause for XInput changes
releasing version 2:1.11.3-0ubuntu5
Bump Build-Depends on x11proto-input-dev to 2.1.99.5
releasing version 2:1.11.3-0ubuntu6
Fixes for relative devices
releasing version 2:1.11.3-0ubuntu7
Allow for non-root config paths so xorg-gtest can be run without root
Only scale direct device touch coordinates
Only update pointer motion data for pointer emulated touch events
Don't set X and Y valuators for indirect touch events
Merge branch 'upstream-1.11+input' into ubuntu
Update to 1.11.99.902 input stack
Drop input patches that have been merged upstream:
Add reviewed input patches that have not been merged upstream yet:
Bump deps on x11proto-input-dev to 2.1.99.6
releasing version 2:1.11.4-0ubuntu1
Fix crash when punting a touch to a non-existent owner
releasing version 2:1.11.4-0ubuntu2
Fix touch class memory corruption
releasing version 2:1.11.4-0ubuntu3
Store window pointer in touch listener record
Factor out TouchEnd generation and delivery
Export TouchEventRejected as TouchRejected
Move AllowTouch to dix/touch.c, and rename to TouchAcceptReject
Check for proper window ID when processing touch allow requests
Implement early touch reject
Implement touch early accept
Merge branch 'upstream-1.11+input' into ubuntu
Update to 1.12 input stack
Drop input patches that have been merged upstream:
Fix indirect touch grab handling (LP: #929408)
releasing version 2:1.11.4-0ubuntu5
Revert "xfree86: duplicate name and driver from pInfo for NewInputDeviceRequest"
Revert "xfree86: use NewInputDeviceRequest for xorg.conf devices too"
Merge branch 'upstream-1.11+input' into ubuntu
Fix crash at startup due to input option abi break (LP: #931397)
Fix mouse warping and clipping (LP: #948938)
Implement passive touch ungrab (LP: #968726)
Bump lintian standards to 3.9.3
releasing version 2:1.11.4-0ubuntu8
Report button press when touchscreen touch is active (LP: #972985)
releasing version 2:1.11.4-0ubuntu9
Fix touchscreen pointer emulation (LP: #949791)
releasing version 2:1.11.4-0ubuntu10
Merge commit '0e7b1080415c85f55462ad863de36df7011bf869' into upstream-1.11+input
Xi: Fix TouchEnd to TouchUpdate change for one accepted grab
Use a new sprite trace for indirect touches when all touches have physically ended
Implement passive touch ungrabbing
Merge branch 'upstream-1.11+input' into tmp
Update to xserver 1.12.1 for the input stack
Drop patches merged upstream in 1.12.1:
Fix patch 506_touchscreen_pointer_emulation_checks.patch after upstream review
Fix various touchscreen issues (LP: #974887)
Update version number for SRU
releasing version 2:1.11.4-0ubuntu10.1
Release buttons when device is disabled on suspend (LP: #968845)
releasing version 2:1.11.4-0ubuntu10.2
releasing version 2:1.11.4-0ubuntu10.3
Chris Nasho (1):
debian/rules: Added --enable-record.
Christopher James Halse Rogers (108):
Merge new upstream release from debian-experimental
Add git-buildpackage config
Merge branch 'debian-experimental' into ubuntu
Merge Bryce's changes
Drop 109_fix-swcursor-crash.patch; merged upstream
Fix 122_xext_fix_card32_overflow_in_xauth to actually prevent the crash
Cherry pick from Debian-experimental:
Merge from debian experimental
Update changelog for merge
Fix version in changelog
Stop shipping upstream changelog completely, to save CD space
Merge from Debian experimental. Long, slightly evil list of Ubuntu changes
Refresh patches for new upstream
Drop unused xvfb patch
Drop DRI2 segfault fix patch.
Merge branch 'upstream-experimental' into debian-experimental
Update changelog
Merge 1.9RC5 from debian-experimental
Add first-pass at DPI patch
Merge from Debian to pick up fixed changelog entries
Fix up some typos in DPI patch
Update changelog entries
Refresh 111_armel-drv-fallbacks.patch to build on arm
Drop DPI patch for now.
Add Gesture support patches
Merge remote branch 'origin/ubuntu' into ubuntu
Merge branch 'debian-experimental' into ubuntu
Merge from Debian experimental
Add 204_fix-neg-sync-transition, fixing GNOME screensaver's fade-to-screensaver
Finalise changelog for Maverick
Mark latest changelog as UNRELEASED, as it isn't :)
Merge upgrade-fixing uploads into git
Don't autoload intel on the annoying i8xx cards
Document Xinerama-fixing cherry-pick
Remove 143_default_to_vesa.patch. It's obsolete with the proper
Remove 158_raise_maxclients.patch. This was never applied,
Merge from pre-Debian-experimental 1.10 package
Refresh 121_only_switch_vt_when_active.diff for new upstream
Refresh 190_cache-xkbcomp_output_for_fast_start_up.patch for new upstream
Refresh 197_xvfb-randr.patch for new upstream
Drop patches merged upstream
Re-add “-nr” option as a synonym for “-background none”.
Set UNRELEASED; this isn't yet releaseable
Drop xvfb-randr.patch; the server infrastructure this hooks into has gone away
Fix typo in debian/changelog
Merge branch 'upstream-experimental-1.10' into ubuntu
Update version for post RC1 snapshot
Refresh patches for new snapshot
Temporarily unapply 202_xf86CoordinationsToWindows.patch; let Chase update it
Drop 204_fix-neg-sync-transition.patch; upstream
Drop diff to debian/local/64-xorg-xkb.rules.
Update changelog for Debian merge
Drop 187_edid_quirk_hp_nc8430.patch; upstream
Drop debian/rules dh_installchangelogs diff.
Bump serverminver, videoabiver, inputabiver for new upstream versions.
Merge remote branch 'origin/ubuntu' into ubuntu
Add Breaks: to prevent broken upgrades with fglrx & nvidia.
Release to Natty
Search for DRI drivers in the same directories as mesa
Fix --disable-builddocs option; Non-chroot builds are now less fragile
Add UNRELEASED tag.
Bump build-depends on mesa to pick up drisearchdirs variable
UNRELEASED → natty
Merge from Debian experimental 1.9.99.902-2
Drop cherry-picked patches now in the tarball
Clean out some no-longer-applied patches
Fix nouveau missing DRI error silencing
Pull patch from xorg-devel@ to fix use-after-free of GLXdrawables
Don't free the handle returned by dlopen. That way lies madness, and LP: 722563
(Temporarily) re-add inputabiver and videoabiver.
Bump serverminver for Xi 2.1 patch
Release to natty
Merge from (unreleased) Debian experimental
Bump debian/videoabiver to match reality
Merge branch 'upstream-ubuntu' into ubuntu
Update to 1.10 final
Cherry-pick 216_fix_sdksyms_build.diff to make 1.10 actually build a udeb
Remove usused patch
Bump debian/serverminver for 1.10 final, as we haven't had a 1.9.99.903 release in Ubuntu
Bump mesa-common-dev b/d to pick up multiarch DRI paths
Add prerequisite commit to pointer-barrier patch to fix build
Release to oneiric
Search also search for GLX modules in the multiarch path.
Release to oneiric
Backport XI2.1 patch to send raw events regardless of grab state
Changelog entry for 220_xi21_always_deliver_raw_events, release to oneiric
Re-enable i8xx cards. Here's hopin'!
Merge from Debian experimental
Disable multitouch patches until Chase updates them
Refresh 100_rethrow_signals patch
Refresh 165_man_xorg_conf_no_device_ident for changed paths
Refresh 214_glx_dri_searchdirs. Much of this has landed upstream. Yay
Drop patches now included upstream
Add patch from Sam to fix SendEvent with ShapeNotify
Add Launchpad-fu to close XSendEvent bug from the changelog
Release to Oneiric
Cherry-pick commit fixing BadWindow error returns; fixes some g-s-d crashers
Merge branch 'ubuntu' into ubuntu+1
Add initial implementation of XFIXES 6.0 protocol
Bump build-dep to ensure XFIXES 6.0 protocol headers are available
Fix screen-edge barrier event behaviour on nvidia 295.20 drivers
First set of tests for pointer-barriers
Test barrier blocking behaviour
Properly hook up gtest autofoo, and clean tests
Fix non-Velocity barriers.
Multiple additions to pointer-barrier patch:
Merge SIGIO-safe barrier patch.
Fix arm autoprobe patch (LP: #959928)
Cyril Brulebois (19):
Mention git URL in a comment.
Bump libgl1-mesa-dri versioned Recommends to 7.10.2-4.
Add Breaks against pre-multiarch libgl1-mesa-dri* packages.
Upload to unstable.
Xext: Fix buggy checks.
Merge branch 'upstream-unstable' into debian-unstable
Bump changelogs.
Close dix/background bug.
Drop 20-workaround-36986.diff, fixed upstream.
Bump Standards-Version to 3.9.2 (no changes).
Upload to unstable.
Merge branch 'upstream-unstable' into debian-unstable
Bump changelogs.
Remove the Replaces: xdmx from xdmx-tools, that was before lenny.
Add a Breaks: libgl1-mesa-dri-no-multiarch, to handle upgrades from squeeze-backports (without multiarch) to wheezy (with multiarch).
Bump urgency.
Merge remote-tracking branch 'origin/debian-unstable' into debian-unstable
Upload to unstable.
Upload to unstable.
Daniel Stone (9):
Add the touch input API stubs
input: add a TouchClassRec to the devices
dix: add GetTouchOwnership event API
dix: generate touchpoints from driver-submitted data
Xi: allow selecting for touch events
dix: add helper functions to build up/verify the sprite trace
dix: when a window disappears, remove it from the touch sprite trace
dix: Remove touch grabs if the grab disappears
UngrabAllDevices: Don't kill clients if not told to
Dave Airlie (2):
test: fix input test
test: fix two more failing FP3232 tests
Gaetan Nadon (2):
dmx: fix distcheck failure, missing compsize.h in Makefile.am
test: add new test cases to .gitignore
George Staplin (2):
XQuartz: Fix a memory leak with surfaces that a new test found.
XQuartz: Add diagnostic error checking to xp_destroy_surface.
Jeremy Huddleston (31):
Send events that were missing from RRSelectInput
XQuartz: GLX: Create a new dispatch table rather than modifying the existing one
XQuartz: Add missing include for <pthread.h>
glx: Add _glapi_create_table_from_handle
XQuartz: GLX: Use _glapi_create_table_from_handle to create out dispatch table
configure.ac: Bump version to 1.10.2.901 (1.10.3 RC1)
XQuartz: Make a call to activateIgnoringOtherApps in our NSApplicationActivatedEventType handler
configure.ac: Bump version to 1.10.2.902 (1.10.3 RC2)
configure.ac: Bump version to 1.10.3
XQuartz: Add some sanity checking and a fallback for the bundle id.
XQuartz: DRI: Dead code removal
XQuartz: Add a scroll_in_device_direction preference
XQuartz: Add GUI controls to toggle scroll_in_device_direction
XQuartz: Add english NIB changes for scroll_in_device_direction
XQuartz: Localization updates
XQuartz: Adjust BUNDLE_ID_PREFIX to LAUNCHD_ID_PREFIX for server-1.10-branch
configure.ac: Bump version to 1.10.3.901 (1.10.4 RC1)
XQuartz: Use CFSTR to avoid implicit cast warning of NSString * to CFStringRef
XQuartz: xpr: Don't FatalError if xp_unlock_window fails
configure.ac: Bump version to 1.10.3.902 (1.10.4 RC2)
configure.ac: Bump version to 1.10.4
dix: add utility functions for double to/fro FP1616/FP3232 conversion
test: Silence some debug lines from the input unit tests
mieq: Provide better adaptability and diagnostics during mieq overflow
mieq: Reserve some space in EQ for release and other special events
test: Add unit test for mieq
configure.ac: 1.11.3
configure.ac: Make Xephyr dependency error message more informative
kdrive/linux: Fix compilation with -Werror=int-to-pointer-cast -Werror=pointer-to-int-cast
XQuartz: Bump bundle version to 2.7.1
Revert "dix: don't XWarpPointer through the last slave anymore (#38313)"
Jon TURNEY (2):
Guard use of backtrace() with HAVE_BACKTRACE
glx: Remove a few lingering traces of __GLXscreen.GLXVersion
Julien Cristau (8):
Merge commit '76702dde1b2f4afc96f56b30fb5dfb30e55ac955' into ubuntu
Merge commit 'origin/ubuntu' into ubuntu
Add Breaks on drivers abandoned between lenny and squeeze.
Set default xkb rules to evdev on linux
Xquartz: include new localization files in the tarball
Xephyr/dri: register screen and window privates on init
Fix ShmPutImage for XYBitmap
os: don't ignore failure from dladdr
Keith Packard (13):
Merge remote-tracking branch 'whot/next'
Merge remote-tracking branch 'whot/next'
Merge remote-tracking branch 'whot/for-keith'
Merge remote-tracking branch 'whot/two-screen-coordinates'
Merge remote-tracking branch 'whot/for-keith'
Merge remote-tracking branch 'whot/for-keith'
Merge remote-tracking branch 'whot/for-keith'
Save major/minor opcodes in ClientRec for RecordAReply
test/xi2: Fix infinite loop in test_convert_XITouchOwnershipEvent
Merge remote-tracking branch 'whot/for-keith'
Merge remote-tracking branch 'whot/multitouch'
Merge remote-tracking branch 'whot/multitouch'
Merge remote-tracking branch 'whot/for-keith'
Linus Arver (1):
Xext: panoramiXprocs: fix typo
Loïc Minier (14):
Merge commit 'origin/debian-experimental' into ubuntu
Update patch 142_psb_auto to try vesa if psb fails; thanks Oliver Grawert.
Refresh patch 100_xserver_exa_force_greedy to apply cleanly.
Let xserver-xorg-core conflict with xserver-xorg-video-psb << 0.15.0-0ubuntu1~804um5 as these versions didn't have an ABI provide.
Update patch 142_psb_auto to also try psb and vesa for 0x8109.
Apply and drop patch 123_no_composite_for_xvfb_run which was changing files below debian/ (xvfb-run, to disable the Composite extension by default).
Release
Shut up rmdir error when trying to remove dirs; this might confuse debconf.
Release
Update patch 142_psb_auto to only try vesa, not even psb, as this requires the psb driver to be loadable, and it's not available anymore (and broken anyway).
Release
Cherrypick to avoid resetting IDLETIME on DPMS
Enable 187_lastdeviceeventtime-no-reset.patch
Release 2:1.6.3-1ubuntu7
Maarten Lankhorst (1):
Add upstream patches for proper device disabling (LP: #1009629)
Marko Macek (1):
DIX: Set backgroundState correctly for root window
Matthieu Herrb (1):
Add OpenBSD support to DetermineClientCmd()
Michael Vogt (1):
Add 101_nv-crash-fix.diff: Do not crash if gamma_set is NULL.
Michel Dänzer (1):
EXA/mixed: Update sys_pitch in MPH even when there's no system memory copy.
Nicolas Kaiser (1):
randr: void function cannot return value
Peter Hutterer (105):
test: fix memset size for WindowRec (#37801)
test: don't test for double alignment on i386. (#36986)
dix: fix an error message.
dix: release all buttons and keys before reattaching a device (#34182)
input: Only release SD buttons for explicit floating/reattachment (#36146)
input: add POINTER_NORAW to avoid generation of raw events (#30068)
xfree86: Remove devices that failed to enable on startup
xfree86: duplicate xorg.conf device information before xf86NewInputDevice
xfree86: NULL option values are technically valid, don't strdup them
Initialize the fd to -1 for xorg.conf input devices.
dix: only transform valuators when we need them.
xfree86: don't warn about duplicate core devices
xfree86: when implicitly choosing a core device, set the option to a value
test: add a option duplication test
xfree86: improve readability of synthesized device.
xfree86: nest loops instead of 0x1 pointers.
xfree86: update comment for InitInput
xfree86: factor out adding/removing a device from the input device array
xfree86: use xf86AllocateInput for implicit devices too
Revert "Attempt to add the 'mouse' driver in more situations."
config: return the new InputOption from add_option.
config: use add_option for '_source' too
dix: rename mieqSwitchScreen argument fromDix → set_dequeue_screen, document
mi: fix comment typo, whitespace in miPointerSetPosition
test: add a test for GetMaster() behaviour
dix: add KEYBOARD_OR_FLOAT and POINTER_OR_FLOAT to GetMaster()
Xi: silence compiler warnings (set but not used)
mi: fix compiler warnings ("foo" set but not used)
dix: fix compiler warnings ("foo" set but not used)
input: provide a single function to init DeviceEvents to 0
dix: abstract XI2 filter mask lookup
dix: use helper functions in EventIsDeliverable
dix: don't XWarpPointer through the last slave anymore (#38313)
xfree86: comment typo fix
Add null-terminated list interface.
xfree86: fix comment typo
xfree86: use subheader for Pointer Acceleration parts in xorg.conf(5)
xfree86: expose Option "TransformationMatrix"
xfree86: use xf86AddNewOption instead of xf86addNewOption
xfree86: Fix a comment, the old function doesn't exist anymore
dix: move #if statement to stop compiler warning
xfree86: use NewInputDeviceRequest for xorg.conf devices too
xfree86 doc: replace driver "keyboard" with "kbd"
dix: add ScrollInfo to DeviceChangedEvents
dix: drop unused argument from XISendDeviceChangedEvent
dix: pass the flags into the CreateClassesChangedEvent
Xi: ensure the deviceid for DeviceChangedEvents is always the right one
dix: accept a NULL master for CreateClassesChangedEvent
Xi: send DeviceChangedEvents when the scroll valuators change value
test: fix test with new double -> fp3232 conversion functions
Use new FP1616/FP3232 conversion functions
xfree86: duplicate name and driver from pInfo for NewInputDeviceRequest
input: replace remaining GetPairedDevice() with GetMaster()
dix: don't retrieve the syncEvents tail on an empty list
dix: button state must show the logical buttons, not physical buttons
dmx: force -fno-strict-aliasing for xinput example
include: fix BUG_WARN_MSG for constant messages only
dix: split positionSprite into scale_to_desktop and positionSprite
Xi: split ProcessOtherEvent into ProcessDeviceEvent
Xi: add a FIXME
Require inputproto 2.1.99.3
tests: update for touch support
include: RawTouchEnd is the last event now
include: add a bunch of flags for GetTouchEvent processing
Hook up TouchBegin/Update/End events
Xi: process raw touch events
Hook up the ownership events
xfree86: bump the input ABI for the touch changes
dix: add helper functions to create DDX touch recs
dix: if we run out of space for new touch events, resize the queue
dix: add DIX API to create touchpoints
dix: handle DIX-submitted touch events
Support XI 2.2 officially
dix: add touch event history helper functions
dix: add helper functions for adding/removing touch listeners
dix: add TouchResourceIsOwner helper function
Xi: make UpdateDeviceState aware of touch events
dix: set core and button state based on the touch state
Process and deliver touch events
dix: add real_event parameter to ActivatePassiveGrab
dix: add touch to pointer event conversion helper
Xi: hook up pointer emulation for emulating touches
Xi: hook up touch ownership handling
Xi: handle grab accept/reject requests
Xi: add the hooks for passive touch grabs
dix: hook up passive grabs and pointer emulated passive grabs
mi: split move to new screen logic to a helper function
mi: handle screen switching on pointer emulated touch events
dix: remove requirement for client_id be the first element
test: drop printfs from protocol-eventconvert.c
test: add a basic test for ownership event values
Xi: only activate the device grab if we don't already have one
test: fix grab mode value tests for new XIGrabModeTouch
dix: Update pointer limits for floating devices too (#43635)
render: don't bother with animated cursors on floating slaves (#39989)
Xext: don't swap CARD8 in SProcSELinuxQueryVersion
xfree86: split warning about missing identifier or input driver
include: Fix comment typo
Revert "dix: deduplicate callers of DeliverDeviceEvents in DeliverGrabbedEvents"
Xi: handle new XIAllowEvents request in inputproto 2.1.99.6
dix: avoid NULL-pointer dereference on button-only devices (#38313)
Xext: return BadAccess if PickPointer fails (#45796)
dix: when rescaling from master, rescale from desktop dimensions (#46657)
dix: fix compiler warning "unused variable 'scr'"
dix: set raw event values before adding up relative values (#46976)
Ricardo Salveti de Araujo (1):
Include support for the pvr driver available on OMAP 4 (LP: #828494)
Robert Hooker (19):
Fix 196_xvfb-fbscreeninit-handling.patch and 197_xvfb-randr.patch so they actually work.
Fix up 109_fix-swcursor-crash.patch.
Fix up 190_cache-xkbcomp_output_for_fast_start_up.patch so it works.
Drop obsolete patch: 164_trap-aspect-ratios.patch
debian/rules: Adjust confflag targets so xcsecurity isn't enabled for udeb with disabled xace.
Replace 190_cache-xkbcomp_output_for_fast_start_up.patch with meego's rebased version.
Revert "Replace 190_cache-xkbcomp_output_for_fast_start_up.patch with meego's rebased version."
Fix up some of the Breaks: so they apply to ubuntu versions.
debian/control: also fix vmmouse breaks.
Drop 184_virtual_devices_autodetect.patch
Import changes from xorg-server 1.8.99.905-1ubuntu2, adding gesture extension support.
Merge commit 'xorg-server-2_1.9.0.902-1' into ubuntu
Drop 205_udev-product-ids.patch (upstream)
debian/changelog: Update for natty and fix up merge conflict in it.
Drop old nvidia/fglrx autodetection patches, replace with a working one that combines both.
Enable 105_nvidia_fglrx_autodetect.patch.
Switch to using keyboard-config for keyboard layouts.
64-xorg-xkb.rules: Re-add broken model handling
Drop 214_glx_dri_searchdirs.patch from the patch stack.
Steve Langasek (2):
debian/patches/511_Update_border_clip_in_compAllocPixmap.patch: patch from upstream to fix window border traces left behind when switching windows in metacity. LP: #759203.
releasing version 2:1.10.4-1ubuntu5
Timo Aaltonen (242):
Change maintainer address.
set Conflicts: xkb-data (<< 0.9)
xvfb Depends on xauth, xfonts-base.
Change osvendor to Ubuntu.
Add 100_avoid_acpi_insanity.diff
Close console fd only when using --sharevts.
Add 104_fedora_init_origins_fix.patch
Add 106_ubuntu_fpic_libxf86config.patch
Add 107_fedora_dont_backfill_bg_none.patch
Add 110_fedora_no_move_damage.patch
Add 121_only_switch_vt_when_active.diff
Add 123_no_composite_for_xvfb_run.patch
Add 133_psb_auto.patch
Add 138_fedora_xserver-1.3.0-default-dpi.patch
Add 139_fedora_xserver-1.3.0-document-fontpath-correctly.patch
Add 142_fedora_xserver-1.3.0-no-pseudocolor-composite.patch
Add 144_fedora_xserver-1.3.0-xnest-exposures.patch
Prepare the changelog for upload.
Brown paper bag release: include all the patches.
Merge branch 'debian-unstable' into ubuntu
Bring back old changelog entries.
Add 120_fedora_xserver-xaa-evict-pixmaps.patch
Prepare changelog for upload.
Modify patch 138 to change default DPI to 96 instead of 100.
Merge branch 'debian-unstable' into ubuntu
Add patch 101_fedora-apm-typedefs.patch
Merge branch 'debian-unstable' into ubuntu
Merge branch 'debian-unstable' into ubuntu
Patch from Fedora to use openchrome instead of via.
Merge commit 'origin/ubuntu' into ubuntu
Merge tag 'xorg-server-2_1.4.1-git20080118-1' into ubuntu
Prepare changelog for upload.
105_reduce_wakeups_from_smart_scheduler.diff:
Merge branch 'debian-unstable' into ubuntu
Patch from upstream/Fedora to honor the DisplaySize-setting.
Add patches to fix broken -amd support.
Drop patch 100_avoid_acpi_insanity.diff, superseded by patch 45.
Add 151_x86emu_handle_cpuid.patch to fix X86EMU CPUID handling.
Add some patches from upstream 1.4-branch or proposed set
Prepare the changelog for upload
157_fix_exa_pixmap_width.diff
158_xkb_wrapping.diff
Re-enable 51_xkb-and-loathing.diff:
Prepare the changelog for upload
159_xkb_default_to_null.diff:
Add various patches from the stable branch, and a couple of other fixes.
Actually add the patches this time.
166_fix_lpl_monitors.diff: fix LPL monitors properly (LP: #204065)
167_xf86AutoConfig_geode_addition.diff: Autodetect geode video devices (LP: #219630)
Merge branch 'debian-experimental' into ubuntu
Merge with Debian experimental
Re-enable dri & glx.
Merge branch 'debian-experimental' into ubuntu
XAANoOffscreenPixmaps is now the default, remove the patch.
"Clarify" the removal of 168_closedir.patch
Merge branch 'debian-experimental' into ubuntu
Merge branch 'debian-experimental' into ubuntu
More crack for the masses. Fix the changelog and release.
Merge with debian git
Merge branch 'debian-experimental' into ubuntu
Drop 120_fedora_xserver-xaa-evict-pixmaps.patch
Drop 124_fix_randr_no_crtc.patch, fixed upstream.
Add 130_fedora_call_switchcorekeyboard.patch
Update the changelog and release
Squeeze a couple of patches in before uploading:
Add a couple of patches from Fedora to allow clients to change the layout.
actually add the patches.
Add support for input-device properties.
Bump the build-depends on x11proto-input-dev and libxi-dev.
Prepare changelog for upload.
Merge commit 'origin/debian-experimental' into ubuntu
Drop obsolete patches
Fix build-dep on inputproto to >= 1.4.3-2ubuntu2 for DeviceControlChanged.
Prepare the changelog for upload.
Don't require inputproto 1.4.4 in configure.ac..
Fix typos in patch 140.
Fix changelog, release.
Bump the serverminver because of input properties.
Merge commit 'origin/debian-experimental' into ubuntu
Update the changelog. Merge with Debian experimental.
141_improved_driver_selection.patch
Update changelog, release.
Merge commit 'xorg-server-2_1.5.1-1' into ubuntu
Prepare changelog for release.
Merge branch 'debian-experimental' into ubuntu
Prepare changelog for upload.
Merge patches 138 and 139 into 137
Bump the build-dep on x11proto-input-dev.
Bump the build-dep on libxi-dev.
Fix 137 backport, one line missing from XIGetDeviceProperty
Add Breaks for synaptics, evdev and bump serverminver.
Merge commit 'upstream/server-1.5-branch' into ubuntu
Update the changelog.
Prepare the changelog for upload
debian/patches/150_no_visibility_notify_on_unredirect.patch
143_default_to_vesa.patch
Merge commit 'xorg-server-2_1.5.3-1' into ubuntu
add a missing patch to git
Update the changelog
Update the changelog and release
Merge branch 'debian-experimental' into ubuntu
Merge branch 'debian-experimental' into ubuntu
Merge 1.6beta3
Add a couple of patches from the proposed queue
bah, fix patch 150
Disable patch 136 for now.
Add 153_make_dmx_compile.patch
Drop patch 136 for good
Merge branch 'debian-experimental' into ubuntu
patch 153 is not from the proposed queue, clarify the changelog.
Patch 135 updated so that apport actually works now.
Add 154_force-copykeyclass-for-key-events.patch
disable patch 135 until it is updated for 1.6.
Update the changelog and release.
Merge commit 'upstream/server-1.6-branch' into ubuntu
Update the changelog.
debian/rules: Disable builtin fonts
Enable dbus-support.
use the correct option to enable dbus.
Merge commit 'upstream/server-1.6-branch' into ubuntu
Update the changelog to reflect the merge.
Disable patch 107 for now.
Remove patches 150, 151, applied upstream.
Merge branch 'debian-experimental' into ubuntu
Remove patches applied upstream.
Update changelog for release
fix the changelog author headers
Merge branch 'debian-experimental' into ubuntu
Include xorg-server.conf for dbus support.
Handle xorg-server.conf installation in debian/rules.
update the changelog to reflect the previous change.
Release 2:1.5.99.901-1ubuntu1
Merge commit 'xorg-server-1.5.99.902' into ubuntu
Release 2:1.5.99.902-0ubuntu1
Merge branch 'debian-experimental' into ubuntu
Drop patches 159, 161
Apply changes from 0ubuntu5
Re-enable 999_default_modedebug_on.patch to provide debug info in Xorg.0.log for development series.
Merge commit 'xorg-server-2_1.6.1.901-2' into ubuntu
Purge a bunch of obsolete patches.
Disable 143_default_to_vesa.patch for now, breaks autoconfiguration when the pci-ids directory exists but has no match. (LP: #379504)
Disable SELinux support for now, because libaudit-dev needs to be moved to main first.
Explain in the changelog why the patches had been dropped.
Release 2:1.6.1.901-2ubuntu1
Fix DOS formatting from the nvidia patch, and renumber it as patch 104
Merge commit 'xorg-server-2_1.6.2.901-1' into ubuntu
Update the changelog
Drop patch 170, and disable the nvidia/fglrx patches for now
Release 2:1.6.2.901-1ubuntu1
Merge commit 'xorg-server-2_1.6.3-1' into ubuntu
Drop libaudit-dev from build-deps, since SELinux-support is disabled for now.
Drop 182_fedora_quirk_pea.patch, included in 1.6.3.
Release 1.6.3-1ubuntu1
Merge commit 'xorg-server-2_1.7.2-2' into ubuntu
Update the changelog.
Drop libaudit-dev from build-deps yet again.
debian/control: Drop obsolete Conflicts/Breaks against -psb, -synaptics and -evdev.
debian/local/xserver-xephyr.1: Delete, upstream has Xephyr.1 now.
fix the changelog
Delete, refresh and disable a bunch of patches.
Drop patch 140, since it's implemented upstream.
Add a note about patch 140 being dropped.
control, local/64-xorg-xkb.rules: Don't depend on keyboard-configuration until we have it.
Remove a stray patch.
Delete patch 177_animated_cursor_change_master.patch
Disable patch 135 for now.
rules, local/64-xorg-xkb.rules: Use input_id from udev.
Fix the import of settings from /etc/default/console-setup.
Release 2:1.7.2-2ubuntu1
local/64-xorg-xkb.rules: Use "program" instead of "file" when grepping the XKB settings from console-setup.
Merge commit 'xorg-server-2_1.7.3.901-1' into ubuntu
Merge from Debian experimental.
Release 2:1.7.3.901-1ubuntu2
Merge commit 'xorg-server-2_1.7.3.902-1' into ubuntu
Update the changelog.
Add a changelog entry about Alberto's libglx/libdri change.
Release 2:1.7.3.902-1ubuntu1
Call config_init() later
Release 2:1.7.3.902-1ubuntu3
Merge commit 'xorg-server-2_1.7.4-2' into ubuntu
Merge from Debian unstable.
Merge commit 'xorg-server-2_1.7.5-1' into ubuntu
Release 1.7.5-1ubuntu1.
Add 107_dont_filter_input_subsys.diff so for instance serial wacom devices are initialized by the udev backend (LP: #522318)
Replace patch 108 with the one from 1.7-nominations branch.
Release 2:1.7.5-1ubuntu2
Merge commit 'xorg-server-2_1.7.6-1' into ubuntu
Drop obsolete patches.
control: Drop the udeb, we don't need it for lucid.
control: Relax/drop some build-deps caused by the udeb.
Finalize the changelog.
Merge branch 'debian-unstable' into ubuntu
Update patch 111
Add a bug closer
Add another bug closer.
Merge commit 'xorg-server-2_1.7.6-2' into ubuntu
Release 2:1.7.6-2ubuntu1
Merge commit 'xorg-server-2_1.8.1-1' into ubuntu
Fix changelog whitespace.
debian/local/xvfb-run: Don't disable composite, seems to run fine with it nowadays.
Fix a thinko in the changelog.
Was a merge, not a new upstream.
Don't mention patch 164 as being part of the diff.
debian/patches/216_dix-valuator-count-of-0-is-valid.diff:
Remove 169_mipointer_nullptr_checks.patch, fixed in another way upstream since 1.6.1.901.
Merge from Debian experimental.
Merge commit 'xorg-server-2_1.10.0.902-1' into ubuntu
Removed patches included upstream
releasing version 2:1.10.0.902-1ubuntu1
Add 218_revert-release-all-buttons.diff
Merge commit 'xorg-server-2_1.10.1-1' into ubuntu
Drop patch 218, included upstream.
releasing version 2:1.10.1-1ubuntu1
Add 218_randr-check-rotated-virtual-size-limits-correctly.diff
releasing version 2:1.10.1-1ubuntu3
Merge commit 'xorg-server-2_1.10.2-1' into ubuntu
Drop patch 215, refresh 500_xi2.1.patch to apply
Drop patch 121_only_switch_vt_when_active.diff, doesn't seem to work anymore.
videoabiver, inputabiver, xserver-xorg-dev.install: Drop changes that are obsolete post-natty.
XC-SECURITY is enabled in debian, drop the diff
Add 219_fedora-pointer-barrier.diff: Pointer barrier and cursor confinement patch backported to 1.10.
Update the cursor confinement patch with one that should work.
Update crtc confinement patch so it builds.
Add a reference to the crtc confinement bug.
Merge remote-tracking branch 'upstream/server-1.10-branch' into ubuntu
Pull changes from server-1.10-branch, last commit being 79ef102c
Drop patches 20, 218, fixed upstream.
Merge commit 'xorg-server-2_1.10.2.902-1' into ubuntu
releasing version 2:1.10.2.902-1ubuntu1
Merge branch 'ubuntu' of ssh+git://git.debian.org/git/pkg-xorg/xserver/xorg-server into ubuntu
Merge branch 'debian-unstable' into ubuntu
Merge commit 'xorg-server-1.10.4' into debian-unstable
Update changelogs.
Merge commit 'xorg-server-2_1.10.4-1' into ubuntu
debian/rules: Modify the patch stampdir creation.
Reply to: