ChangeLog | 489 +++++++++++++++++++++++++---------------- debian/changelog | 7 debian/xprint-common-overrides | 2 3 files changed, 310 insertions(+), 188 deletions(-)
New commits: commit 1c5699a6b169b44ab4093312f0cfbb759a56f284 Author: Drew Parsons <[email protected]> Date: Sat Nov 21 19:16:47 2009 +1100 update upstream ChangeLog diff --git a/ChangeLog b/ChangeLog index a2a8ac6..8f479bc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,122 @@ +commit 1e67eb53a5ecdfa2ca503a45366c77f5012db036 +Author: Drew Parsons <[email protected]> +Date: Thu Oct 29 21:46:19 2009 +1100 + + Disable all xservers other than Xprint. + + References to other servers in configure.ac are left in place since + they may set variables used when compiling. + +commit 9ecb7e1f8dab2aedd2fdbab067eddb2909894c0d +Author: Drew Parsons <[email protected]> +Date: Thu Oct 29 21:23:22 2009 +1100 + + xprint 1.6.0 + + xprint was still in xorg-xserver at 1.5.3 and was removed in 1.5.99.1. + Hence the next version of standalone xprint should be 1.6.0. + +commit e5dfe6b4987b5723ea0c7fe88f5ff821ee3e44f5 +Author: Drew Parsons <[email protected]> +Date: Thu Oct 29 20:26:23 2009 +1100 + + README discusses build issues around libXfont 1.4. + + libXfont 1.4 removed Xprint font support, so need built-in fonts: + Need ./configure --enable-builtin-fonts + However this causes unresolved segfaults in client programs. + + The default situation (--disable-builtin-fonts) successfully uses + external fonts but only builds against libXfont 1.3. + + Also included suggestion to use libcairo instead of Xprint for those who + need the WYSIWYG or print-to-pdf/postscript functionality. + +commit 48dcb52fb56999b59d8b8ff037a127cbd4fddca1 +Author: Drew Parsons <[email protected]> +Date: Thu Oct 29 20:04:49 2009 +1100 + + Revert "By default, enable built-in fonts in configure script." + + This reverts commit f7b940677eae414ab08ce41fe6bdb7253b7a7864. + + The built-in fonts (--enable-builtin-fonts) trigger a segfault with + clients. That is, Xprt will build and run successfully with them, but + when a client such as xpsimplehelloworld tries to print via Xprt, it + segfaults. Since Xprint is deprecated, motivation is not high for + fully debugging this problem. + + The workaround around will be to not use built-in fonts (i.e. + reverting the previous commit to use --disable-builtin-fonts by + default again), and build against libXfont 1.3 (rather than the latest + libXfont 1.4, which has Xprint support removed). + +commit 2686a3828720ee65a67896b74a9d02ca7f00e479 +Author: Drew Parsons <[email protected]> +Date: Sun Oct 18 15:54:27 2009 +1100 + + Add Xprint FAQ. + + Copied from http://xprint.mozdev.org/docs/Xprint_FAQ.html. + Useful document. + +commit f7b940677eae414ab08ce41fe6bdb7253b7a7864 +Author: Drew Parsons <[email protected]> +Date: Sun Oct 18 14:18:15 2009 +1100 + + By default, enable built-in fonts in configure script. + + BUILTIN_FONTS, used by dix/dixfonts.c, is now defined by default via + the builtin-fonts variable in the configure scripts. It may be + disabled by using ./configure --disable-builtin-fonts. + + This has been done since Xprint support was removed from libXfont 1.4. + + If built-in fonts are disabled then PrinterFontRegisterFpeFunctions, + FontFileCheckRegisterFpeFunctions and check_fs_register_fpe_functions + will not be defined in dix/dixfonts.c, when libXfont 1.4 is used (they + were previously defined by libXfont 1.3). Hence, assume built-in fonts + are used by default. + (see also commit 6f47f7c0585c2b621c39cae9eef2a04d7f81bcc0 ). + +commit 0f375aae8b3ae2694e13f810340d144fda560fb4 +Merge: 6ed7500 6f47f7c +Author: Drew Parsons <[email protected]> +Date: Thu Oct 15 01:40:20 2009 +1100 + + Merge branch 'upstream-unstable' of git+ssh://git.debian.org/git/pkg-xorg/xserver/xprint into upstream-unstable + +commit 6f47f7c0585c2b621c39cae9eef2a04d7f81bcc0 +Author: Drew Parsons <[email protected]> +Date: Wed Oct 14 21:11:04 2009 +1100 + + dix: append "built-ins" to the font path in SetDefaultFontPath + + With this commit, Xprt gets "built-ins" appended to its FontPath. + Fixes the "could not open default font 'fixed'" problem; required now + that libxfont 1.4 does not support Xprint. + + Adapted from xserver-xorg commit f56cbe1ef24415d0142b9a7d0ab0a031069ccb52 + +commit 6ed750096da185276cc680adac9de5c3e43677f1 +Author: Alan Coopersmith <[email protected]> +Date: Tue Oct 13 15:46:33 2009 -0700 + + Move Xprt server docs from xorg-docs module + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit c7164e9c393a7e333063ac5af89b130e179c072e +Author: Drew Parsons <[email protected]> +Date: Sun May 18 01:34:40 2008 +1000 + + Create dummy modinit.h for Xext. + + modinit.h had been part of hw/xfree86/dixmods/extmod, enabling + initialisation of extension modules. Xprint does not implement + extension modules, so the header file is provided as a dummy file + instead, now that the xprint ddx is separated from the xfree86 ddx.. + commit 46f6e0d89e2f695e8980b76c7120358e07fe4f74 Author: Adam Jackson <[email protected]> Date: Mon May 12 13:52:33 2008 -0400 @@ -80,7 +199,7 @@ Date: Fri May 9 15:38:44 2008 -0700 <http://bugs.opensolaris.org/bugdatabase/view_bug.do?bug_id=4258475> commit 7b3066d9b9099135d9c49e0682161d5568fc535b -Merge: 2a3d142... 315f089... +Merge: 2a3d142 315f089 Author: Drew Parsons <[email protected]> Date: Sat May 10 00:01:15 2008 +1000 @@ -180,7 +299,7 @@ Date: Thu May 8 16:04:24 2008 -0400 Bug #13104: Remove broken XAA a1 glyph fast path. commit ddaecfa13cefee7c66b39b606c8640c6544d4943 -Merge: 9c2e087... cf20df3... +Merge: 9c2e087 cf20df3 Author: Adam Jackson <[email protected]> Date: Thu May 8 14:33:58 2008 -0400 @@ -1630,7 +1749,7 @@ Date: Thu Apr 3 14:50:05 2008 -0400 EXA: Fix TS origin computation when implementing RenderComposite with tiling. commit 539bf3c2836727e7560c64144071b086f8ea32fe -Merge: 3ab33e7... 6c0cfe3... +Merge: 3ab33e7 6c0cfe3 Author: Sascha Hlusiak <[email protected]> Date: Mon Apr 7 00:10:16 2008 +0200 @@ -2038,7 +2157,7 @@ Date: Thu Mar 27 15:18:39 2008 +1000 RH BZ 435216 commit 9df915b84d45d39aed7557c98883b20a66da2e96 -Merge: 47eb658... 333e712... +Merge: 47eb658 333e712 Author: Sascha Hlusiak <[email protected]> Date: Tue Mar 25 17:50:50 2008 +0100 @@ -3888,7 +4007,7 @@ Date: Mon Jan 28 12:18:43 2008 -0800 (cherry picked from commit 116800279d2ec783c63f43d3902627edde6a4cff) commit 16b0614c8c441eb1692bde9e58fadf54a9c6f00f -Merge: 1a88aed... e915a26... +Merge: 1a88aed e915a26 Author: David Nusinow <[email protected]> Date: Sat Jan 26 16:13:25 2008 -0500 @@ -4860,7 +4979,7 @@ Date: Fri Dec 14 00:53:54 2007 -0500 Bump video driver ABI and extension ABI for devPrivates rework. commit 86b2e59bfb79bd042a13c35fbb4ccecec576f629 -Merge: 1c1a4bc... cb0d7e2... +Merge: 1c1a4bc cb0d7e2 Author: Eamon Walsh <[email protected]> Date: Fri Dec 14 00:32:24 2007 -0500 @@ -4908,7 +5027,7 @@ Date: Thu Dec 13 15:55:28 2007 -0800 (cherry picked from commit fc04c9759b30d062111d4a7f3f411ed0f18cbde4) commit c8feb73f5841e7812d8dfdb91f1064e2033d028c -Merge: 9a7ce57... a125ce4... +Merge: 9a7ce57 a125ce4 Author: Eamon Walsh <[email protected]> Date: Thu Dec 13 18:38:25 2007 -0500 @@ -6185,7 +6304,7 @@ Date: Mon Nov 19 21:01:22 2007 -0500 during merge conflict resolution. commit 2d17f47cc7d6b174857617d31ad1b437d8e97d94 -Merge: 60be452... ea9c63e... +Merge: 60be452 ea9c63e Author: Eamon Walsh <[email protected]> Date: Mon Nov 19 18:10:46 2007 -0500 @@ -6366,7 +6485,7 @@ Date: Thu Nov 8 17:25:36 2007 -0500 Don't sleep(1) at server exit. commit 1603130236c55ddabc3854d4ba62d544debcf1f5 -Merge: f207e69... f7dd0c7... +Merge: f207e69 f7dd0c7 Author: Eamon Walsh <[email protected]> Date: Wed Nov 14 13:35:50 2007 -0500 @@ -6549,7 +6668,7 @@ Date: Wed Nov 7 16:33:10 2007 -0800 Don't frob timers unless SmartSchedule is running commit e94ab0b502160376d1956345196f7e1c7e2e886f -Merge: 26e1fc7... 9bee1c6... +Merge: 26e1fc7 9bee1c6 Author: Dodji Seketeli <[email protected]> Date: Wed Nov 7 19:04:24 2007 +0100 @@ -6646,7 +6765,7 @@ Date: Tue Nov 6 16:26:09 2007 -0500 on the x11perf benchmark. commit aaa50b64113b122aaebd46e3b78e3fb7a8d70500 -Merge: 868e303... ddce48e... +Merge: 868e303 ddce48e Author: Dodji Seketeli <[email protected]> Date: Tue Nov 6 16:25:40 2007 +0100 @@ -6673,7 +6792,7 @@ Date: Tue Nov 6 09:40:14 2007 +0000 to subsequent assertion failure in libdbus. commit a52c9b2a59f27266557ff9d5d2c08492e04135a6 -Merge: c7e18be... 5833289... +Merge: c7e18be 5833289 Author: Eamon Walsh <[email protected]> Date: Mon Nov 5 19:08:36 2007 -0500 @@ -6701,7 +6820,7 @@ Date: Mon Nov 5 15:01:13 2007 -0500 xselinux: Register SELinux extension protocol names. commit 632c33c5c18b3e091c4fce98280af4d583e99640 -Merge: 4113f04... dda10c9... +Merge: 4113f04 dda10c9 Author: Dodji Seketeli <[email protected]> Date: Mon Nov 5 17:52:33 2007 +0100 @@ -7371,7 +7490,7 @@ Date: Thu Oct 25 12:35:01 2007 -0400 xselinux: Label the default device directly with the process context. commit b633d54b94d746d26e13014634d9f63bbb7e8f7d -Merge: 4b05f19... 48ca596... +Merge: 4b05f19 48ca596 Author: Eamon Walsh <[email protected]> Date: Thu Oct 25 12:19:30 2007 -0400 @@ -7548,7 +7667,7 @@ Date: Fri Oct 19 16:34:54 2007 -0700 they should be. commit a3a95d3475dc91ed2e8a55bf484a6b3f2b5ac32a -Merge: a358b87... 7e1cada... +Merge: a358b87 7e1cada Author: Eric Anholt <[email protected]> Date: Fri Oct 19 15:44:17 2007 -0700 @@ -7719,7 +7838,7 @@ Date: Wed Oct 17 16:09:40 2007 -0400 Need to merge so this type of thing stops happening. commit c3f7b862550fa8f46633162f83db8c27e46fc672 -Merge: af4dde0... feac075... +Merge: af4dde0 feac075 Author: Eamon Walsh <[email protected]> Date: Wed Oct 17 15:00:54 2007 -0400 @@ -8058,7 +8177,7 @@ Date: Sun Oct 14 14:59:12 2007 -0400 Fix GLX byteswapping. commit 927757e1028f45f7fd94b9a2ab35567e0f34b2a8 -Merge: ccda4b6... 17ffc34... +Merge: ccda4b6 17ffc34 Author: Kristian Høgsberg <[email protected]> Date: Fri Oct 12 19:28:39 2007 -0400 @@ -8312,7 +8431,7 @@ Date: Mon Oct 8 13:25:38 2007 +0200 EXA: dude, don't validation driver hooks twice ! commit 4611f9568cdadf9c00f4b7ca4c77c8c6f07e94f8 -Merge: ab11bad... 3549a12... +Merge: ab11bad 3549a12 Author: Dodji Seketeli <[email protected]> Date: Thu Oct 4 13:07:50 2007 +0200 @@ -8385,7 +8504,7 @@ Date: Thu Oct 4 11:38:01 2007 +0200 it for them completely. commit 604ebb5a6de372e6a8a96e0ee997db7929126860 -Merge: 1365aef... 4ba76a7... +Merge: 1365aef 4ba76a7 Author: Dodji Seketeli <[email protected]> Date: Wed Oct 3 16:13:16 2007 +0200 @@ -8471,7 +8590,7 @@ Date: Tue Oct 2 13:13:51 2007 -0700 Also fix incorrect library inclusion by kdrive which broke the build. commit 439edc768eea17667846ce573c843b8377e0dfb4 -Merge: c8ccf46... 93ae6fe... +Merge: c8ccf46 93ae6fe Author: Eric Anholt <[email protected]> Date: Tue Oct 2 12:14:04 2007 -0700 @@ -9291,7 +9410,7 @@ Date: Wed Sep 26 19:42:46 2007 -0700 "ix86Pci.c", line 214: too many struct/union initializers commit 27612748e0ec20f3a23839f0a12e39f598dd722c -Merge: b614614... 3b114f2... +Merge: b614614 3b114f2 Author: Eamon Walsh <[email protected]> Date: Wed Sep 26 07:47:29 2007 -0400 @@ -9543,7 +9662,7 @@ Date: Wed Sep 19 04:46:10 2007 -0700 hey -- you have to start somewhere. ;) commit 97c150b61bbe436453b05d3c07cd2173870aac40 -Merge: 57907e0... 547ad21... +Merge: 57907e0 547ad21 Author: Eamon Walsh <[email protected]> Date: Wed Sep 19 07:25:55 2007 -0400 @@ -9668,7 +9787,7 @@ Date: Sat Sep 15 14:01:57 2007 +0200 Initialize output->pendingProperties. commit b9f7aeb20015290a8acf938a11bf9272bf3527cf -Merge: e4d11e5... 06d27f8... +Merge: e4d11e5 06d27f8 Author: Eric Anholt <[email protected]> Date: Thu Sep 13 00:15:45 2007 +0000 @@ -10011,7 +10130,7 @@ Date: Wed Sep 5 17:46:23 2007 -0700 broken uses. commit e332335241af28ef0ab66b102d0cbc4e5c73ac68 -Merge: 7381e91... accd71b... +Merge: 7381e91 accd71b Author: Ben Byer <[email protected]> Date: Wed Sep 5 15:51:23 2007 -0700 @@ -10056,7 +10175,7 @@ Date: Wed Sep 5 14:31:01 2007 -0700 so it doesn't make sense to require it when building on OSX/Darwin. commit ff01e44e33fd072958fb0157dae072f1b1c88944 -Merge: 8ba8c16... 47300ed... +Merge: 8ba8c16 47300ed Author: Ben Byer <[email protected]> Date: Wed Sep 5 13:56:08 2007 -0700 @@ -10167,7 +10286,7 @@ Date: Tue Sep 4 14:49:49 2007 -0700 Revert part of 529acb175440969af9d7fa38aab8d7dea0dc2661 because libtool is smart. commit bf5948518763b5e21eff806a0a9abc5f7757fa10 -Merge: 4062db4... 735da3d... +Merge: 4062db4 735da3d Author: Matthieu Herrb <[email protected]> Date: Tue Sep 4 22:40:31 2007 +0200 @@ -10483,7 +10602,7 @@ Date: Tue Aug 28 09:28:25 2007 -0400 FontRec privates. commit 85547073265ae9bc4ae3af920a6d3214fd1ca0c5 -Merge: 860a09c... 7d54399... +Merge: 860a09c 7d54399 Author: Eamon Walsh <[email protected]> Date: Tue Aug 28 07:25:21 2007 -0400 @@ -10583,7 +10702,7 @@ Date: Fri Aug 24 16:00:31 2007 -0700 Bump video driver ABI for pci-rework. commit 91f358336f77c0e4f577be65cca977d17298e36c -Merge: b9a806f... 8b6b40b... +Merge: b9a806f 8b6b40b Author: Ian Romanick <[email protected]> Date: Fri Aug 24 15:04:21 2007 -0700 @@ -10637,7 +10756,7 @@ Date: Fri Aug 24 13:04:48 2007 +0200 case. commit 8b6b40b7271acd81a9548f502c18f46f3b640640 -Merge: ab7a6d8... 3305d17... +Merge: ab7a6d8 3305d17 Author: Ian Romanick <[email protected]> Date: Thu Aug 23 18:19:17 2007 -0700 @@ -10765,7 +10884,7 @@ Date: Wed Aug 22 16:54:29 2007 +0100 Fix <pixman.h> include to <pixman/pixman.h> commit b6a7c0112c42a3287e53647c38b2c0c5bf8fefa0 -Merge: 53941c8... 6ef4ecd... +Merge: 53941c8 6ef4ecd Author: Søren Sandmann Pedersen <[email protected]> Date: Tue Aug 21 14:26:34 2007 -0400 @@ -11371,7 +11490,7 @@ Date: Wed Jul 25 14:57:13 2007 -0700 ProcRenderAddGlyphs: Convert while loops to for loops where more natural commit e34fcd2bf42dbd72ab6ce2df80f2dcaa13416e74 -Merge: 32c0dcc... f3955c0... +Merge: 32c0dcc f3955c0 Author: Eamon Walsh <[email protected]> Date: Thu Aug 2 14:27:03 2007 -0400 @@ -12561,7 +12680,7 @@ Date: Tue Jun 19 09:11:16 2007 +0200 for pointing out the problem. commit ab7a6d860d4a275a810a64b1ba7b13726ed10575 -Merge: e9130b8... 2e7fef7... +Merge: e9130b8 2e7fef7 Author: Ian Romanick <[email protected]> Date: Mon Jun 18 16:51:13 2007 -0700 @@ -12626,7 +12745,7 @@ Date: Mon Jun 11 21:25:42 2007 -0400 Delete fbBltmmx(). commit e2a720c9a17dc860ee0a858c2b21fd71e86cdcd0 -Merge: 878cac7... 3f9adb1... +Merge: 878cac7 3f9adb1 Author: Eamon Walsh <[email protected]> Date: Mon Jun 11 15:29:11 2007 -0400 @@ -12921,7 +13040,7 @@ Date: Tue May 29 14:54:27 2007 -0600 Remove wscons keyboard handling stuff that doesn't belong there anymore. commit 60de6c7ef9bdcee043f63e8e0d493e6feba6a9d0 -Merge: 3a6549a... 2f13b7c... +Merge: 3a6549a 2f13b7c Author: Matthieu Herrb <[email protected]> Date: Tue May 29 12:14:49 2007 -0600 @@ -13094,7 +13213,7 @@ Date: Wed May 23 12:56:04 2007 -0400 Add missing offsets for window coordinates - reported by Colin Harrison commit 2a4aa63a23ddd816b647b851a01865861827a7eb -Merge: 9cee4ec... cc648e6... +Merge: 9cee4ec cc648e6 Author: Eamon Walsh <[email protected]> Date: Tue May 22 14:50:26 2007 -0400 @@ -13480,7 +13599,7 @@ Date: Mon Apr 30 10:33:12 2007 -0600 fix __glXErrorCallBack() proto commit 6b33459bf5aac23c3ecc7002d091c02f327d907a -Merge: 18252a5... 3c91a99... +Merge: 18252a5 3c91a99 Author: Brian <[email protected]> Date: Mon Apr 30 10:26:19 2007 -0600 @@ -14117,7 +14236,7 @@ Date: Tue Apr 17 13:46:55 2007 -0400 security: remove debugging code. commit 1f06d32ef58749d0f0c062193d237ee98f60e90f -Merge: cf962a8... fc162c6... +Merge: cf962a8 fc162c6 Author: Eamon Walsh <[email protected]> Date: Tue Apr 17 12:10:22 2007 -0400 @@ -14446,7 +14565,7 @@ Date: Fri Apr 6 13:38:12 2007 +0300 GLcore: fix after moving xf86glx_util.[hc] to Mesa. commit cf962a849db2b259ca558c6265ea7e3328a4d312 -Merge: 5ad5625... 5a804f2... +Merge: 5ad5625 5a804f2 Author: Eamon Walsh <[email protected]> Date: Thu Apr 5 14:41:39 2007 -0400 @@ -14574,7 +14693,7 @@ Date: Tue Apr 3 09:27:57 2007 -0600 about setting the XFree86Server symbol. commit 1cc8db72816cd079f30255046e10043c350bf683 -Merge: 645d87c... a39f297... +Merge: 645d87c a39f297 Author: Matthieu Herrb <matth...@roadrock.(none)> Date: Tue Apr 3 16:04:45 2007 +0200 @@ -14721,7 +14840,7 @@ Date: Fri Mar 30 16:05:46 2007 -0600 values of 1280 (my screen width). commit e9130b8bac73a0843d5ff6b2216eccfb3e094a48 -Merge: 2c6d471... 92e8cdb... +Merge: 2c6d471 92e8cdb Author: Ian Romanick <[email protected]> Date: Fri Mar 30 13:39:15 2007 -0700 @@ -14829,7 +14948,7 @@ Date: Wed Mar 28 12:57:11 2007 -0400 xace: provide creation-time resource hook call in CreateWindow(). commit 99b220969f2f8ba829bc8294b27ca90fd9311be4 -Merge: 728ad64... 82a8b99... +Merge: 728ad64 82a8b99 Author: Eamon Walsh <[email protected]> Date: Wed Mar 28 12:54:04 2007 -0400 @@ -14842,7 +14961,7 @@ Date: Wed Mar 28 12:03:19 2007 -0400 Refuse to create tiny modes from EDID detailed timing. commit 2c6d47108880584f1221ff86c6c8947627f9f607 -Merge: c4fe1bc... 8522044... +Merge: c4fe1bc 8522044 Author: Ian Romanick <[email protected]> Date: Wed Mar 28 08:08:04 2007 -0700 @@ -14912,7 +15031,7 @@ Date: Mon Mar 26 16:04:50 2007 -0700 Fix indentation of fakexa help text. commit 728ad64d979fd9e5cca28e8c15118c18d707c431 -Merge: 0331c6a... 6a0bed1... +Merge: 0331c6a 6a0bed1 Author: Eamon Walsh <[email protected]> Date: Tue Mar 27 13:16:40 2007 -0400 @@ -14949,7 +15068,7 @@ Date: Mon Mar 26 12:44:58 2007 -0700 Update xorg.conf manpage for new RandR 1.2 monitor options. commit 0331c6a8fcba1dc27ef45aaf5f694799d0085413 -Merge: 84a066c... f7c5aa0... +Merge: 84a066c f7c5aa0 Author: Eamon Walsh <[email protected]> Date: Mon Mar 26 10:28:05 2007 -0400 @@ -15486,7 +15605,7 @@ Date: Wed Mar 7 09:57:02 2007 -0500 devPrivates rework: move reset functions into a single call. commit bb111291d854b4329e47367ce3c67e8a2785e6e9 -Merge: 74175e0... e9bfb2b... +Merge: 74175e0 e9bfb2b Author: Eamon Walsh <[email protected]> Date: Wed Mar 7 09:03:46 2007 -0500 @@ -15540,7 +15659,7 @@ Date: Tue Mar 6 11:09:30 2007 -0800 updated todo list commit 81d581e655fc989da3be4256b83849a63b8607b7 -Merge: a05ffca... d5aba03... +Merge: a05ffca d5aba03 Author: Ben Byer <bb...@bbyer.(none)> Date: Tue Mar 6 10:37:29 2007 -0800 @@ -15571,7 +15690,7 @@ Date: Tue Mar 6 02:31:59 2007 -0800 moved new event-handling code from X11Application.m to darwinEvents.c in preparation for making all Darwin servers use it commit 0ccd1443fd6db397b42e5b99ce733ce1316c785e -Merge: ec1ef8a... 9b6bb06... +Merge: ec1ef8a 9b6bb06 Author: Ben Byer <bb...@bbyer.(none)> Date: Tue Mar 6 01:04:50 2007 -0800 @@ -15646,7 +15765,7 @@ Date: Mon Mar 5 12:34:37 2007 -0500 devPrivates rework: remove some debugging code from dixFreePrivates. commit 23fc429aad5b2721911862617772c314e1036bb0 -Merge: e684824... fe7b8f4... +Merge: e684824 fe7b8f4 Author: Eamon Walsh <[email protected]> Date: Mon Mar 5 12:18:54 2007 -0500 @@ -15825,7 +15944,7 @@ Date: Mon Feb 26 17:45:40 2007 -0800 Return BadMatch if a client tries to clone non-cloneable outputs. commit d9bcb22d199e8444b9762a35754e04d327dd5915 -Merge: 272d934... c16343a... +Merge: 272d934 c16343a Author: Ben Byer <[email protected]> Date: Tue Feb 27 16:28:20 2007 -0800 @@ -16228,14 +16347,14 @@ Date: Thu Feb 15 17:07:42 2007 +0200 http://xorg.freedesktop.org/wiki/XDC2007Notes#head-2719037a1905516c45cf74f0e155c8703221e446 commit f452507ca9209598401d15da0039aaa4e1fed1a3 -Merge: 0463283... 8116757... +Merge: 0463283 8116757 Author: Eamon Walsh <[email protected]> Date: Thu Feb 15 09:47:20 2007 -0500 Merge branch 'master' into my-XACE-SELINUX commit 04632835b7402456fdcf6c8fa01970cd2804e27c -Merge: 88f89b9... 9ecf79c... +Merge: 88f89b9 9ecf79c Author: Eamon Walsh <[email protected]> Date: Thu Feb 15 09:27:05 2007 -0500 @@ -16276,7 +16395,7 @@ Date: Wed Feb 14 17:09:33 2007 +1030 fix: WarpCursor needs to send MotionNotify. commit c4fe1bcce1c1e4822e688959b331b47a051d6e0a -Merge: e540d57... d570ff7... +Merge: e540d57 d570ff7 Author: Ian Romanick <[email protected]> Date: Wed Feb 14 15:39:52 2007 -0800 @@ -16325,7 +16444,7 @@ Date: Mon Feb 12 17:18:29 2007 -0500 Remove spurious LIBADD from xf4bpp commit 16eb7254f861465f988ae3861ac3449c2c966062 -Merge: 3814862... c4b7e9d... +Merge: 3814862 c4b7e9d Author: Ian Romanick <[email protected]> Date: Fri Feb 9 12:38:49 2007 -0800 @@ -16488,7 +16607,7 @@ Date: Mon Jan 29 17:30:59 2007 -0800 Typical results were failure to sync, and a black screen. commit 3814862a869ee83d307eb01225d5949039f435d8 -Merge: a216de9... 31f2d4a... +Merge: a216de9 31f2d4a Author: Ian Romanick <[email protected]> Date: Mon Jan 29 15:14:31 2007 -0800 @@ -16524,7 +16643,7 @@ Date: Fri Jan 26 13:00:45 2007 +0100 Xorg #9692 commit a216de9b7ff55e2b73c487d037f248f00bd2e63b -Merge: 24506ea... cf7ca9d... +Merge: 24506ea cf7ca9d Author: Ian Romanick <[email protected]> Date: Thu Jan 25 10:17:32 2007 -0800 @@ -16559,7 +16678,7 @@ Date: Wed Jan 24 15:33:49 2007 -0800 read_legcay_BIOS, and delete all remnants of it from all other places. commit fdb3a0798f0d17e72ec7293d59a7a81b5ffdf95b -Merge: 39b51e1... a53586e... +Merge: 39b51e1 a53586e Author: Ian Romanick <[email protected]> Date: Wed Jan 24 14:49:39 2007 -0800 @@ -16587,7 +16706,7 @@ Date: Thu Jan 25 00:29:20 2007 +0800 Make Xinearama screen information reflect CRTC rotation. commit 39b51e1bfc4924fc3bda4342ef9c6c0125d9f4fa -Merge: 637b19b... 788cfce... +Merge: 637b19b 788cfce Author: Ian Romanick <[email protected]> Date: Tue Jan 23 13:25:56 2007 -0800 @@ -16629,7 +16748,7 @@ Date: Mon Jan 22 09:13:59 2007 -0800 ARCH_PCI_OS_INIT mechanism useless. Remove it. commit 7dfb3cea913b02a6b36c308d1330bd40abe6b41f -Merge: c279d5f... 2dc8662... +Merge: c279d5f 2dc8662 Author: Ian Romanick <[email protected]> Date: Mon Jan 22 08:44:36 2007 -0800 @@ -16667,7 +16786,7 @@ Date: Fri Jan 19 14:52:23 2007 -0800 -ardelay and -arinterval, respectively. commit c279d5fdc53612a90f33fafe9e9c59ced008dd51 -Merge: 88f248e... 14d6a9b... +Merge: 88f248e 14d6a9b Author: Ian Romanick <[email protected]> Date: Fri Jan 19 12:59:54 2007 -0800 @@ -16937,7 +17056,7 @@ Date: Tue Jan 9 16:34:40 2007 -0800 Track rename of DamagePost -> DamageAdd. commit da09964a931cc64d05ab571bf545fdad35a6d395 -Merge: e1f73d2... e3aa6ad... +Merge: e1f73d2 e3aa6ad Author: Ian Romanick <[email protected]> Date: Tue Jan 9 15:27:34 2007 -0800 @@ -17010,7 +17129,7 @@ Date: Thu Jan 4 15:37:33 2007 -0800 Incorporate new byte-order related configure changes. commit 8dd5771a1b91c331860b667fb18e484452000aad -Merge: 45aa26c... 7d2ec92... +Merge: 45aa26c 7d2ec92 Author: Ian Romanick <[email protected]> Date: Thu Jan 4 15:01:38 2007 -0800 @@ -17176,7 +17295,7 @@ Date: Thu Dec 28 13:15:11 2006 -0800 Export exaMove{In,Out}Pixmap(). commit 683ca3f7afaf15fd3ca7918f6175b5a9e4a6f05b -Merge: 05f9150... 9563b2e... +Merge: 05f9150 9563b2e Author: Eric Anholt <[email protected]> Date: Wed Dec 27 16:11:31 2006 -0800 @@ -17217,7 +17336,7 @@ Date: Sat Dec 9 22:51:59 2006 +0200 Make sure we're not copying sym_interpret across from an empty source. commit 43a4376bd72ef1b6486cddb60ad57b2d6169292a -Merge: 4b1c9ac... d9e079d... +Merge: 4b1c9ac d9e079d Author: Eamon Walsh <[email protected]> Date: Fri Dec 22 13:53:55 2006 -0500 @@ -17249,7 +17368,7 @@ Date: Tue Dec 19 16:38:34 2006 -0800 xorg.conf man page should say "XFree86-DGA", not "Xorg-DGA" commit a81dbaae0597492f0245080c6f5af7158e05e2d0 -Merge: fb6d676... d442998... +Merge: fb6d676 d442998 Author: Eamon Walsh <[email protected]> Date: Tue Dec 19 16:11:19 2006 -0500 @@ -17289,7 +17408,7 @@ Date: Tue Dec 19 18:45:25 2006 +0100 This affects drivers with no UploadToScreen or UploadToScreen failures. commit 4334860e69e7d5b156082bd05c7a86708e5bad4c -Merge: 7e47176... fdcc22c... +Merge: 7e47176 fdcc22c Author: Michel Dänzer <[email protected]> Date: Tue Dec 19 16:29:26 2006 +0100 @@ -17506,7 +17625,7 @@ Date: Tue Dec 12 15:59:08 2006 -0500 Split AssignClientState() into two routines, new routine is server-specific. commit 62e7722ebd8d341a23eb56cb330eeb00e6a975a6 -Merge: e124806... f3c6090... +Merge: e124806 f3c6090 Author: Eamon Walsh <[email protected]> Date: Tue Dec 12 13:54:33 2006 -0500 @@ -17600,7 +17719,7 @@ Date: Sun Dec 10 11:24:05 2006 -0500 Accept EDID > 1.3 but < 2.0 if we find it, assume it's compatible. commit e1f73d220873fa091695e46b7fcd008663a95a6f -Merge: 27d682f... d56249a... +Merge: 27d682f d56249a Author: Ian Romanick <[email protected]> Date: Fri Dec 8 17:24:15 2006 -0800 @@ -17620,7 +17739,7 @@ Date: Fri Dec 8 17:24:15 2006 -0800 hw/xfree86/utils/scanpci/Makefile.am commit d56249a15ead51ad4d2117d5538ada24af05b693 -Merge: f1f8df1... ec84f72... +Merge: f1f8df1 ec84f72 Author: Jeremy C. Reed <[email protected]> Date: Fri Dec 8 15:52:37 2006 -0600 @@ -17823,7 +17942,7 @@ Date: Thu Nov 30 23:16:42 2006 -0800 (cherry picked from 66b6358a393972946f16394918db2401c51dc5ed commit) commit ccd804c6c01cdfffe938fa5336be9b5668a6f0c0 -Merge: 9423ac1... 82912ad... +Merge: 9423ac1 82912ad Author: Drew Parsons <[email protected]> Date: Fri Dec 1 15:21:57 2006 +1100 @@ -17862,7 +17981,7 @@ Date: Wed Nov 29 22:19:57 2006 -0500 Add required root window context to config file. commit 143558500a89a5c887c75c03798bae68c953cac9 -Merge: e3d3d29... ee9bdd3... +Merge: e3d3d29 ee9bdd3 Author: Eamon Walsh <[email protected]> Date: Wed Nov 29 20:41:41 2006 -0500 @@ -17974,7 +18093,7 @@ Date: Mon Nov 27 16:21:31 2006 -0800 Move mode handling helpers from ddcProperty.c to xf86Mode.c. commit b4b0d901d98371a8aa7b17d195e18e83e2a6a618 -Merge: 64de3ba... d6cd031... +Merge: 64de3ba d6cd031 Author: Eric Anholt <[email protected]> Date: Mon Nov 27 15:43:15 2006 -0800 @@ -18039,7 +18158,7 @@ Date: Tue Nov 21 21:23:17 2006 +0000 This ensures that all calls to FatalError() will shutdown the input devices. commit ca2874b273232d9f51881b1cd754ed6847bfaf47 -Merge: c9a5f9d... e2f6dac... +Merge: c9a5f9d e2f6dac Author: Alan Hourihane <[email protected]> Date: Sat Nov 18 19:56:32 2006 +0000 @@ -18120,7 +18239,7 @@ Date: Tue Nov 14 15:33:07 2006 +0100 Bug #9023: Only check mice for "mouse" or "void" if identifier is != NULL. commit a724b7f1302ba7a59f140b521f13d2ddf0fcf9bf -Merge: 6facd95... f80a8ae... +Merge: 6facd95 f80a8ae Author: Jeremy C. Reed <[email protected]> Date: Mon Nov 13 20:32:26 2006 -0600 @@ -18444,7 +18563,7 @@ Date: Tue Nov 7 15:48:05 2006 -0800 A couple more cases of error message before freeing strings. commit 05f1c302460a14c8fa9a943a12d69adcd3c30d58 -Merge: 3e7e0e3... 46af6d1... +Merge: 3e7e0e3 46af6d1 Author: Adam Jackson <[email protected]> Date: Tue Nov 7 18:42:54 2006 -0500 @@ -18490,7 +18609,7 @@ Date: Tue Nov 7 01:29:51 2006 -0800 getevents.c commit c20d3bf7533da0bf26beaf7d8c359d18edbd70e8 -Merge: 028bbdc... 3d39c02... +Merge: 028bbdc 3d39c02 Author: Keith Packard <[email protected]> Date: Tue Nov 7 01:21:28 2006 -0800 @@ -18529,14 +18648,14 @@ Date: Mon Nov 6 00:30:09 2006 +0100 Fix typo in Xvesa: incorrect reporting of DAC capabilities. commit 028bbdc0417173803695808ba9f48498519273a3 -Merge: 50504c6... 8deaaa3... +Merge: 50504c6 8deaaa3 Author: Keith Packard <[email protected]> Date: Sat Nov 4 17:46:26 2006 -0800 Merge master back to randr-1.2 commit 50504c68e1d407232cf83465981b235e542ef31f -Merge: 8b87ce1... cde8806... +Merge: 8b87ce1 cde8806 Author: Keith Packard <[email protected]> Date: Sat Nov 4 17:43:19 2006 -0800 @@ -18616,7 +18735,7 @@ Date: Fri Oct 27 12:36:56 2006 -0700 and 1024x...@75 modes. commit 22ee2e4e1f1d9fd9ca9f25c9bf25370034b771d4 -Merge: 49a2668... bd0c829... +Merge: 49a2668 bd0c829 Author: Alan Coopersmith <[email protected]> Date: Fri Nov 3 12:54:56 2006 -0800 @@ -18729,7 +18848,7 @@ Date: Thu Nov 2 12:25:03 2006 +0100 Build with -D_PC on ix86 only. commit 543b397277d1f03b8091e44812010abcd5d80102 -Merge: 4056e6e... 645d057... +Merge: 4056e6e 645d057 Author: Keith Packard <[email protected]> Date: Thu Nov 2 19:00:35 2006 -0800 @@ -18800,14 +18919,14 @@ Date: Thu Nov 2 03:22:09 2006 +0200 bump to 1.2.99.0 commit 18c246a13b887b865de6a17e6cd1c259b9bc383d -Merge: 794f2e7... 4843d82... +Merge: 794f2e7 4843d82 Author: Daniel Stone <[email protected]> Date: Thu Nov 2 03:21:37 2006 +0200 Merge branch 'input-hotplug' commit 4843d823f4d38d8bd468ce3a8feddbff229ed416 -Merge: ba9f513... a7b944f... +Merge: ba9f513 a7b944f Author: Daniel Stone <[email protected]> Date: Thu Nov 2 03:18:13 2006 +0200 @@ -18823,7 +18942,7 @@ Date: Thu Nov 2 03:16:10 2006 +0200 config file. commit be291a6d9764cf29a7d9a8114d47d9f41ce856e9 -Merge: a2d6242... 6fdfd9d... +Merge: a2d6242 6fdfd9d Author: Daniel Stone <[email protected]> Date: Thu Nov 2 03:15:25 2006 +0200 @@ -18940,7 +19059,7 @@ Date: Sun Oct 29 17:49:46 2006 +0100 kill GNU-make'ism. commit 0107320fac0913aae2cb169992e31c670b4bd2f7 -Merge: 06b6b97... a34446f... +Merge: 06b6b97 a34446f Author: Thomas Hellstrom <thomas-at-tungstengraphics-dot-com> Date: Sun Oct 29 15:23:35 2006 +0100 @@ -19011,7 +19130,7 @@ Date: Fri Oct 27 18:26:30 2006 +0200 Import libdrm functions for the drm memory manager. commit e3d3d29db5eef057b4e8294377c9c3147436bc2f -Merge: 92387e9... 004d00e... +Merge: 92387e9 004d00e Author: Eamon Walsh <[email protected]> Date: Thu Oct 26 20:21:16 2006 -0400 @@ -19062,7 +19181,7 @@ Date: Thu Oct 26 20:38:58 2006 +0300 lnx_ia64.c. commit 8c0556e7cb1de8c387ddd886a03a8f8afff1fd0e -Merge: cdc8a4b... 004d00e... +Merge: cdc8a4b 004d00e Author: Daniel Stone <[email protected]> Date: Thu Oct 26 15:21:22 2006 +0300 @@ -19080,7 +19199,7 @@ Date: Thu Oct 26 01:10:08 2006 +0300 The fallthrough to gettimeofday() is preserved. commit cdc8a4b7b2f099b8860a54c5c9f488e6f7c4913a -Merge: 3da918a... d285833... +Merge: 3da918a d285833 Author: Daniel Stone <[email protected]> Date: Thu Oct 26 00:28:30 2006 +0300 @@ -19121,14 +19240,14 @@ Date: Wed Oct 25 11:39:27 2006 +0200 without pretending it's always on. commit 59511974db843fa7e11133894cfc10c20fdaf60f -Merge: 054f8cd... 598ac7a... +Merge: 054f8cd 598ac7a Author: Keith Packard <[email protected]> Date: Tue Oct 24 17:26:20 2006 -0700 Merge branch 'master' into randr-1.2 commit 598ac7a83698327b607084abaebcbd22f8d25fbb -Merge: 828c34e... 948a97b... +Merge: 828c34e 948a97b Author: Keith Packard <[email protected]> Date: Tue Oct 24 17:23:12 2006 -0700 @@ -19227,7 +19346,7 @@ Date: Tue Oct 24 09:04:14 2006 -0700 Fix from HEAD accidentally reverted during merge. commit 8b909135664abb69ada522e8e39495d9eca717ac -Merge: 21291d6... 948a97b... +Merge: 21291d6 948a97b Author: Ian Romanick <[email protected]> Date: Tue Oct 24 08:57:59 2006 -0700 @@ -19284,7 +19403,7 @@ Date: Mon Oct 23 05:12:15 2006 +0300 Remove unused xf86CheckButton. commit c5b5b046e86b159a9d32451308f38246cc4587f7 -Merge: fab1d37... 948a97b... +Merge: fab1d37 948a97b Author: Daniel Stone <[email protected]> Date: Mon Oct 23 02:58:30 2006 +0300 @@ -19470,7 +19589,7 @@ Date: Sat Oct 21 22:06:43 2006 +1000 Minor typos in Xserver man page. commit e26a494f417c3c700636ee68892c3015b2e0f27a -Merge: 736b0d5... aeba855... +Merge: 736b0d5 aeba855 Author: Zephaniah E. Hull <[email protected]> Date: Sat Oct 21 04:26:14 2006 -0400 @@ -19784,7 +19903,7 @@ Date: Fri Oct 13 17:34:53 2006 -0700 Separate configuration from layout changes to send correct events. commit 335b503c5e7041bb0c44611e496d1c46f554e630 -Merge: bd3d93b... cf948b7... +Merge: bd3d93b cf948b7 Author: Daniel Stone <[email protected]> Date: Fri Oct 13 18:10:45 2006 +0300 @@ -19798,7 +19917,7 @@ Date: Fri Oct 13 14:48:10 2006 +0100 to avoid cursor movements signalling io. commit 4b53a5e4b147ab748b28dffc1d330b7148d8efa6 -Merge: 23f6f08... 042d4a4... +Merge: 23f6f08 042d4a4 Author: Eamon Walsh <[email protected]> Date: Wed Oct 11 20:50:31 2006 -0400 @@ -20012,7 +20131,7 @@ Date: Sat Oct 7 14:16:51 2006 +0300 layer. commit 4c342246300e06bdf5c9c62cc1d2f6aa57a524db -Merge: 8382234... 49a70c8... +Merge: 8382234 49a70c8 Author: Alan Coopersmith <[email protected]> Date: Fri Oct 6 18:01:13 2006 -0700 @@ -20065,14 +20184,14 @@ Date: Thu Oct 5 16:07:26 2006 -0400 Improve error handling, messages during initialization. commit de63a469dcd0a8ae98554bca540ac0106cccf2a5 -Merge: 9c7440b... 8382234... +Merge: 9c7440b 8382234 Author: Daniel Stone <[email protected]> Date: Thu Oct 5 20:29:19 2006 +0300 Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-hotplug commit b4659faf9b455b44ac8e691cc7a8fc00a967c80b -Merge: c4f30c6... 8382234... +Merge: c4f30c6 8382234 Author: Keith Packard <[email protected]> Date: Wed Oct 4 14:46:04 2006 -0700 @@ -20108,7 +20227,7 @@ Date: Tue Oct 3 17:48:50 2006 -0700 Don't insert RCS tag into generated pci id header files -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected]
