--- xorg-server-1.18.2.orig/.dir-locals.el +++ xorg-server-1.18.2/.dir-locals.el @@ -0,0 +1 @@ +((c-mode . ((c-basic-offset . 4) (indent-tabs-mode . nil)))) \ No newline at end of file --- xorg-server-1.18.2.orig/ChangeLog +++ xorg-server-1.18.2/ChangeLog @@ -1,2500 +1,3 @@ -commit 93d4224ccf3dee5a51815a66f76c905450419b50 -Author: Adam Jackson -Date: Fri Mar 11 16:38:52 2016 -0500 - - xserver 1.18.2 - - Signed-off-by: Adam Jackson - -commit d88f8ffeb7ec0304d793388be5b65a293505bc3b -Author: Adam Jackson -Date: Fri Mar 11 13:50:32 2016 -0500 - - vidmode: Remove stray vidmodeproc.h from EXTRA_DIST - - Was removed from the tree in: - - commit f175cf45aebcdda53f3ae49c0eaf27da1f194e92 - Author: Olivier Fourdan - Date: Wed Feb 10 09:34:34 2016 +0100 - - vidmode: move to a separate library of its own - - but not removed from the Makefile, which broke 'make dist'. - - Signed-off-by: Adam Jackson - (cherry picked from commit 744c292ae49dd1f9d33b860d2b4f0ae27023809b) - -commit 643359fb03c51244c9ed5f5efab4c84594259e8c -Author: Dave Airlie -Date: Tue Feb 9 16:54:22 2016 +1000 - - present: fail flipping if we have any slave outputs - - Due to the way present currently works, we don't ever check with the - secondary adapters if we can flip at all. - - We shouldn't flip if the secondary adapters are attached to the pixmap - currently, however using the current check_flip callback isn't possible - as it passes the Window to the driver (something we shouldn't be doing), - so the slave driver can never get it's own screen ptr back. - - For now to fix the problem just block flips if we have any slaves - configured. We can fix the ABI up later, but this fix can be backported - to stable. - - Signed-off-by: Dave Airlie - Reviewed-by: Keith Packard - (cherry picked from commit 47bc7fcaa567b0d9e2627b4a21b112e96f81725b) - -commit 3e480c6f5168e7da1521bdcc15ed8b5b8762612d -Author: Adam Jackson -Date: Thu Jan 21 12:47:57 2016 -0500 - - glx: Implement GLX_EXT_fbconfig_packed_float - - The tokens for this are already defined by GLX_ARB_fbconfig_float, which - we already support, so just add the extension to the list and let the - driver provide those configs if it wants. - - Reviewed-by: Eric Anholt - Signed-off-by: Adam Jackson - (cherry picked from commit ef3005da3d5dc92b3ee5a0ee78164e739a3216dc) - -commit b9f7edda0634955711870bb1389095525d4496e3 -Author: Adam Jackson -Date: Mon May 18 13:00:02 2015 -0400 - - glx: Implement GLX_EXT_stereo_tree - - This is correct as it is, but only because we know no DRI drivers - implement stereo. - - v2: Use new ATTRIB macro - - Reviewed-by: James Jones - Reviewed-by: Eric Anholt - Signed-off-by: Adam Jackson - (cherry picked from commit d15cb654b6ba365dac9a62064e277adebde2fdab) - -commit 2b3363418a425bf432b55927d8f8dd93c004c791 -Author: Adam Jackson -Date: Thu Mar 3 16:50:02 2016 -0500 - - glx: Add GLX_SCREEN to the GetDrawableAttributes response - - libglvnd would like to use this to map from drawable to screen, so it - can know which driver to dispatch to. Refer to the spec proposal here: - - https://lists.freedesktop.org/archives/mesa-dev/2016-March/109543.html - - Reviewed-by: Eric Anholt - Signed-off-by: Adam Jackson - (cherry picked from commit a18238877bbf9aab95843d849a6f434275e9cd6c) - -commit 2541d765fdd1006d649063882e3a667438f1d30e -Author: Adam Jackson -Date: Thu Mar 10 12:29:34 2016 -0500 - - glx: Macroize building the attribute list in DoGetDrawableAttributes - - No functional change, just a little easier to read and harder to get - wrong. - - Reviewed-by: Eric Anholt - Signed-off-by: Adam Jackson - (cherry picked from commit 47c1d6b7abcfb1c6b478367bbc2e869c91485bc0) - -commit 2a7b6ea1a54a4c8174669c1ca38c4665505c4637 -Author: Eric Anholt -Date: Mon Feb 1 13:58:15 2016 -0800 - - ephyr: Fix redisplay with glamor on GLES. - - glamor_transfer.c is still totally broken, though. - - Reviewed-by: Adam Jackson - Signed-off-by: Eric Anholt - (cherry picked from commit c01094c5312fbd84146dd83122e5256a8e57d092) - -commit 5af20f15636aa2ede3dac1af9e9afa063564130c -Author: Olivier Fourdan -Date: Wed Mar 9 16:45:18 2016 +0100 - - glamor: do not build Xv support when --disable-xv - - Reviewed-by: Adam Jackson - Signed-off-by: Olivier Fourdan - (cherry picked from commit 25ce263fd88684be9370025f93ba3a2bfc72ff1a) - -commit 9fc05b85e544638ccc4b811c19e64312b387c799 -Author: Olivier Fourdan -Date: Wed Mar 9 16:21:18 2016 +0100 - - xwayland: add glamor Xv adaptor - - This adds an Xv adaptor using glamor. - - Reviewed-by: Adam Jackson - Signed-off-by: Olivier Fourdan - (cherry picked from commit da7724d3d277c6c8a814881785b716896802629a) - -commit 1aa9a2be313c51a78af9bceea865dcf069e9cebe -Author: Michel Dänzer -Date: Mon Dec 21 17:54:08 2015 +0900 - - modesetting: Allow CRTC transforms to actually take effect - - Setting crtc->transformPresent to FALSE was preventing the transform - from actually taking effect and putting RandR into a confused state. - - Now that the RandR 1.2 cursor code handles transforms correctly, we can - allow them to properly take effect. - - Reviewed-by: Keith Packard - (cherry picked from commit 24042b4e367803dd64f3fcdc1bef7b2bf36c4145) - -commit aa8770bf546a58e534ad2d0e0180f7e1013e24e9 -Author: Michel Dänzer -Date: Wed Oct 21 18:33:46 2015 +0900 - - xfree86: Re-set current cursor after RandR 1.2 CRTC configuration change - - Add xf86CursorResetCursor, which allows switching between HW and SW - cursor depending on the current state. - - Call it from xf86DisableUnusedFunctions, which is called after any CRTC - configuration change such as setting a mode or disabling a CRTC. This - makes sure that SW cursor is used e.g. while a transform is in use on - any CRTC or while there are active PRIME output slaves, and enables HW - cursor again once none of those conditions are true anymore. - - Reviewed-by: Keith Packard - (cherry picked from commit b04767c84deafc44993723add4b1c5163fc11711) - -commit 870d4e2e6b40f911049a5286d605814d2401741d -Author: Michel Dänzer -Date: Thu Dec 24 12:56:03 2015 +0900 - - xfree86/modes: Check for CRTC transforms in xf86_use_hw_cursor(_argb) (v2) - - We currently don't handle transforms for the HW cursor image, so return - FALSE to signal a software cursor must be used if a transform is in use - on any CRTC. - - v2: Check crtc->transformPresent instead of crtc->transform_in_use. The - latter is TRUE for rotation as well, which we handle correctly. - - Reviewed-by: Keith Packard - (cherry picked from commit a4ffa8721debb34bd36fd4624890d9c26886c618) - -commit af87ab62878334ee9d4e75c472fc80178329b4dd -Author: Michel Dänzer -Date: Thu Dec 24 16:20:49 2015 +0900 - - xfree86/modes: Refactor xf86_use_hw_cursor_argb to use xf86_use_hw_cursor (v2) - - This reduces code duplication. - - v2: No functional change this time. - - Reviewed-by: Keith Packard - (cherry picked from commit c3e4e9fc5d84bfc17b3ed63f67488ea25ba150ce) - -commit 87c23dc47160d7524b82b60abbc70d285708f7cb -Author: Michel Dänzer -Date: Tue Feb 23 17:19:03 2016 +0900 - - glamor: Source pictures are always depth 32 - - We were using the destination pixmap depth to determine the source - picture format. - - Fixes incorrect text rendering with some MATE desktop GTK3 themes. - - Reviewed-by: Adam Jackson - Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=94246 - Signed-off-by: Michel Dänzer - (cherry picked from commit a3e681eafa5355b8bb3b099d47983f14f0d5e197) - -commit 0220275531552a5400c22b56105257586f390260 -Author: Michel Dänzer -Date: Tue Feb 23 17:19:02 2016 +0900 - - glamor: Factor out glamor_set_color_depth from glamor_set_color - - The former takes explicit screen and depth parameters instead of - deriving them from a pixmap. - - Reviewed-by: Adam Jackson - Signed-off-by: Michel Dänzer - (cherry picked from commit b05ae79ee3bebef9790c97eedc033d1ffb3ec39a) - -commit 79985270f1d63a8b186640b81d0eb142ac532e6e -Author: Hans de Goede -Date: Wed Feb 10 16:40:43 2016 +0100 - - glamor: Fix XvPutImage when src_y != 0 - - We already take src_y into account when uploading the src data by - starting at the top line of the src data when uploading. - - Adjust src_y accordingly when rendering. - - Signed-off-by: Hans de Goede - (cherry picked from commit 947e94a341fa153258e9e86060b83af95934672b) - -commit ddca8e1647d3b79f803f4080be648e5475055fe8 -Author: Rui Matos -Date: Fri Mar 4 16:24:48 2016 +0100 - - build: Enable vidmode independently from Xorg - - This allows building Xwayland without Xorg and still include the - vidmode extension. - - v2: Use PKG_CHECK_EXISTS instead of PKG_CHECK_MODULES - - Signed-off-by: Rui Matos - Reviewed-by: Emil Velikov - (cherry picked from commit 40a164b8f4e720b0d6ebf228ee175eb397ffeec2) - -commit 7680f558e1584a191554658ff7b3b75c75d35e06 -Author: Julien Cristau -Date: Mon Mar 7 23:20:34 2016 +0100 - - xfixes: avoid double free if AddResource fails - - pChc is already freed through CursorFreeHideCount → - deleteCursorHideCount. - - Reviewed-by: Rémi Cardona - Signed-off-by: Julien Cristau - (cherry picked from commit 2be527b1d4ce2b0412c4484539a8c9607645ec6d) - -commit b7e1f25005f7b552870fe782fc927c9dc97f5ed0 -Author: Julien Cristau -Date: Mon Mar 7 23:20:33 2016 +0100 - - render: free already allocated formats in PictureInit failure case - - Probably pointless, if this fails you're not likely to get far... - - Reviewed-by: Rémi Cardona - Signed-off-by: Julien Cristau - (cherry picked from commit 4217db89ecd480fda2ee74fecba06c6713c2a0f0) - -commit 518a0c179f99e9ea33e9cd56ce215661d27cabb6 -Author: Julien Cristau -Date: Mon Mar 7 23:20:32 2016 +0100 - - record: don't call RecordDeleteContext when AddResource fails - - Reviewed-by: Rémi Cardona - Signed-off-by: Julien Cristau - (cherry picked from commit 054f80717812d4781741cd05393623fe6f6c627f) - -commit dae9c195a9db4d210855a16efce2037f3af454e1 -Author: Julien Cristau -Date: Mon Mar 7 23:20:31 2016 +0100 - - xwin: no need to free auth data if AddResource fails - - This is taken care of by SecurityDeleteAuthorization - - Reviewed-by: Rémi Cardona - Signed-off-by: Julien Cristau - (cherry picked from commit d0c1a5bc61a3d151f2234aa3820862f16c0f00c7) - -commit 4bbaffc8134a72d4e2dd21d4def1afc9ad29e815 -Author: Julien Cristau -Date: Mon Mar 7 23:20:30 2016 +0100 - - modesetting: avoid double free if AddResource fails - - ms_dri2_frame_event_client_gone or ms_dri2_frame_event_drawable_gone - already free the resource. - - Reviewed-by: Rémi Cardona - Signed-off-by: Julien Cristau - (cherry picked from commit acf263df81ad6813e0233033610fb44521cab1b4) - -commit 8616bd95de43aa63c959b0c978f1001ac38c0222 -Author: Julien Cristau -Date: Mon Mar 7 23:20:29 2016 +0100 - - dmx/glxProxy: don't free the glx pixmap twice if AddResource fails - - Reviewed-by: Rémi Cardona - Signed-off-by: Julien Cristau - (cherry picked from commit 164753f158e78f615f903467bfd234d7c58244ef) - -commit dcbf88aea74a00a8e09ffdc4de2b555911eb90fb -Author: Julien Cristau -Date: Mon Mar 7 23:20:28 2016 +0100 - - glx: don't call pGlxDraw->destroy() if AddResource fails - - AddResource will have called DrawableGone, which takes care of the - destruction. - - Reviewed-by: Rémi Cardona - Signed-off-by: Julien Cristau - (cherry picked from commit 59b9c3d5e4bf05aeaaac2ee4ea12c301a67aae2c) - -commit ab197ee9478a0e4e7a276c03645657b4f22ae9c0 -Author: Julien Cristau -Date: Mon Mar 7 23:20:26 2016 +0100 - - xvmc: Fix unchecked AddResource - - Reviewed-by: Rémi Cardona - Signed-off-by: Julien Cristau - (cherry picked from commit 119d5c0e2f800737c949ef760c5fe25d963200bf) - -commit bd022f03143723ac326b39d6e67853650aa1bf1d -Author: Jonas Ådahl -Date: Tue Mar 8 20:05:33 2016 +0800 - - xwayland: Correctly detect whether posix_fallocate exists - - We had HAVE_POSIX_FALLOCATE checks, but no such macros were ever - defined anywhere. This commit makes it so that this macro is defined if - the posix_fallocate is detected during configure. - - Signed-off-by: Jonas Ådahl - Reviewed-by: Julien Cristau - (cherry picked from commit a2c3c34b44b866440a152511e682c98879ee13b7) - -commit 23d9b2a566cdaeff71deae9c3a221ebf0cb5f550 -Author: Julien Cristau -Date: Tue Mar 1 21:39:01 2016 +0100 - - xv: fix double free in AddResource failure case - - XvdiDestroyVideoNotifyList already frees the list if AddResource fails, - so don't do it twice. And set tpn->client to NULL explicitly to avoid - confusing uninitialized memory with a valid value. - - Reviewed-by: Adam Jackson - Signed-off-by: Julien Cristau - (cherry picked from commit 939ce0bae68b682b57675f65c901653c1a094ebb) - -commit 90b854b2acc58a9936e9810f58b0bd1973697210 -Author: Adam Jackson -Date: Tue Mar 1 14:09:30 2016 -0500 - - dri1: Fix unchecked AddResource - - Signed-off-by: Adam Jackson - Reviewed-by: Julien Cristau - (cherry picked from commit 05e1bcf56e1c511a1ef539acfe11e37727e1179e) - -commit 0e3cc3d042a2da1ed781f6691dd7aca72d87046b -Author: Adam Jackson -Date: Tue Mar 1 14:09:29 2016 -0500 - - xv: Fix unchecked AddResource - - Reviewed-by: Julien Cristau - Signed-off-by: Adam Jackson - (cherry picked from commit 093f9505c12565cc19bdf6e33b263f31d104c3ef) - -commit 3d7bfe02cc3ad0f16403a073f1182d7019c98be3 -Author: Olivier Fourdan -Date: Tue Mar 1 17:03:44 2016 +0100 - - vidmode: build without xf86vidmodeproto - - git commit f175cf45: - - vidmode: move to a separate library of its own - - introduced a regression where the xserver would not build when - xf86vidmodeproto is not installed even if the configure option - "--disable-xf86vidmode" is specified. - - Fix build failure when xf86vidmodeproto is not installed. - - Reviewed-by: Adam Jackson - Signed-off-by: Olivier Fourdan - (cherry picked from commit ac4d8c7cee13947b688ebb26035f06f7744db201) - -commit a49e7b9c2ebeb2e2ccb922265798234a8ce9d242 -Author: Olivier Fourdan -Date: Mon Feb 8 17:48:26 2016 +0100 - - xwayland: fix a crash on output removal - - On output removal, the CRTC that was added in xwl_output_create() - is not removed in xwl_output_destroy() and would cause a segmentation - fault later on in ProcRRGetMonitors(): - - (EE) Segmentation fault at address 0x100000001 - (EE) - (EE) 10: ? (?+0x29) [0x29] - (EE) 9: /usr/bin/Xwayland (_start+0x29) [0x423299] - (EE) 8: /lib64/libc.so.6 (__libc_start_main+0xf0) [0x7fdd80e7f580] - (EE) 7: /usr/bin/Xwayland (dix_main+0x3b3) [0x544ef3] - (EE) 6: /usr/bin/Xwayland (Dispatch+0x31e) [0x54109e] - (EE) 5: /usr/bin/Xwayland (ProcRRGetMonitors+0x9b) [0x4ca18b] - (EE) 4: /usr/bin/Xwayland (RRMonitorMakeList+0x269) [0x4c9ba9] - (EE) 3: /usr/bin/Xwayland (RRMonitorSetFromServer+0x118) [0x4c9198] - (EE) 2: /usr/bin/Xwayland (MakeAtom+0x30) [0x530710] - (EE) 1: /lib64/libc.so.6 (__restore_rt+0x0) [0x7fdd80e93b1f] - (EE) 0: /usr/bin/Xwayland (OsSigHandler+0x29) [0x5792d9] - - Remove the output CRTC in xwl_output_destroy() to avoid the crash. - - Signed-off-by: Olivier Fourdan - Reviewed-by: Daniel Stone - (cherry picked from commit 2116f03be04240e961649ca750a7aa5438b8446c) - -commit c7735f102aa9daa604f304f2e8a2131fcdd652e8 -Author: Michel Dänzer -Date: Thu Feb 18 17:33:19 2016 +0900 - - present: Call present_restore_screen_pixmap from present_set_abort_flip - - After present_set_abort_flip, the screen pixmap will be used for all - screen drawing, so we need to restore the current flip pixmap contents - to the screen pixmap here as well. - - Improves flashing / stutter e.g. when something like a popup menu appears - on top of a flipping fullscreen window or when switching out of - fullscreen. - - Note that this means present_set_abort_flip now relies on screen->root - being non-NULL, but that's already the case in other present code. - - Reviewed-by: Keith Packard - Reviewed-by: Chris Wilson - (cherry picked from commit 1bee4e254ca0305cb23e574b4c8b250d276ee998) - -commit 05d9de4e9ac515176f41f9fd649935ae990d8fb3 -Author: Michel Dänzer -Date: Thu Feb 18 17:20:45 2016 +0900 - - present: Factor code for restoring screen pixmap out of present_unflip (v2) - - The following fix will use the refactored function. - - The logic in the refactored function is slightly simplified, exploiting - the fact that this function is only ever called with a valid flip - pixmap. - - v2: Assert that flip_pixmap is non-NULL instead of testing and bailing - on NULL, preserve test for flip_window being non-NULL before calling - present_set_tree_pixmap for it (Keith Packard) - - Reviewed-by: Chris Wilson (v1) - Reviewed-by: Keith Packard - (cherry picked from commit 4611e902c291b8a789f374cff3300f74645bc2b2) - -commit 49b2a0fb0e6ae0793171b5dbfe517fe06647c06d -Author: Michel Dänzer -Date: Thu Feb 18 18:23:47 2016 +0900 - - present: Only update screen pixmap from flip pixmap once per unflip - - present_unflip may be called several times from present_check_flip_window - during the same unflip. We can only copy to the screen pixmap the first - time, otherwise we may scribble over other windows. The flip pixmap - contents don't get updated after the first time anyway. - - Fixes at least the following problems, which were introduced by commit - 806470b9 ("present: Copy unflip contents back to the Screen Pixmap"): - - On xfwm4 without compositing, run glxgears and put its window into - fullscreen mode to start flipping. While in fullscreen, open the xfwm4 - window menu by pressing Alt-Space. The window menu was invisible most - of the time because it was getting scribbled over by a repeated unflip - copy. - - When switching a flipping window out of fullscreen, a repeated unflip - copy could leave artifacts of the flip pixmap on the desktop. - - Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=94325 - - Reviewed-by: Keith Packard - Reviewed-by: Chris Wilson - (cherry picked from commit 72328e5eb98a3f27e1f0a0e17beae6db447bd87c) - -commit d5b8bc69e2652d8b9b13065b6528d2e8b8188b57 -Author: Michel Dänzer -Date: Tue Dec 8 12:52:17 2015 +0900 - - dri3: Refuse to work for remote clients (v2) - - Prevents clients forwarded via SSH from hanging while waiting for the - reply from the DRI3Open request. - - Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=93261 - - v2: Return BadMatch instead of BadRequest (Keith Packard) - - Reviewed-by: Keith Packard - (cherry picked from commit 43eb5b6047c9b35c337e553ec054f08bdc835abb) - -commit 15454c5d26b00931b2099ccc6da356a1e5b6f88c -Author: Olivier Fourdan -Date: Wed Feb 10 09:35:39 2016 +0100 - - xwayland: add partial xvidmode extension support - - Older games (mostly those based on SDL 1.x) rely on the XVidMode - extension and would refuse to run without. - - Add a simple, limited and read-only xvidmode support that reports the - current mode used so that games that rely on xvidmode extension can run - on XWayland. - - Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=87806 - Reviewed-by: Adam Jackson - Signed-off-by: Olivier Fourdan - (cherry picked from commit 6070a749d953951bacbfb149c5c36451293aad35) - -commit f2b346f9ba86ba304baac5ed29f8caf3fefbdba0 -Author: Olivier Fourdan -Date: Fri Feb 5 09:48:25 2016 +0100 - - vidmode: remove redundant DIX function - - The API signature of the DIX xf86VidModeGetGammaRampSize() is now - identical to the xf86cmap's xf86GetGammaRampSize() and all it does is - actually call xf86GetGammaRampSize() so we can save one vfunc. - - Remove uneeded xf86VidModeGetGammaRampSize() function. - - Reviewed-by: Adam Jackson - Signed-off-by: Olivier Fourdan - (cherry picked from commit b430f53bb753f9b064ab62d014820c1c3c76a841) - -commit d381d59e44f675d01ca9ecab5a58c4864ae56c29 -Author: Olivier Fourdan -Date: Fri Feb 5 09:48:24 2016 +0100 - - vidmode: remove redundant check - - The DIX already checks for VidModePrivateKey to get the vfunc, so - checking for this again in the DDX is redundant. - - Remove the redundant function xf86VidModeAvailable() from the DDX. - - Reviewed-by: Adam Jackson - Signed-off-by: Olivier Fourdan - (cherry picked from commit 48fccde2bfb60efdbf45a96fa53bcd9a6570bf89) - -commit 349b71a37e4a87e3650b5c0df9651b2ce967293e -Author: Olivier Fourdan -Date: Wed Feb 10 09:34:34 2016 +0100 - - vidmode: move to a separate library of its own - - XVidMode extension might be useful to non hardware servers as well (e.g. - Xwayand) so that applications that rely on it (e.g. lot of older games) - can at least have read access to XVidMode. - - But the implementation is very XFree86 centric, so the idea is to add - a bunch of vfunc that other non-XFree86 servers can hook up into to - provide a similar functionality. - - Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=87806 - Reviewed-by: Adam Jackson - Signed-off-by: Olivier Fourdan - (cherry picked from commit f175cf45aebcdda53f3ae49c0eaf27da1f194e92) - -commit 860669b1867178fe46df9da98591ea5a47f427f1 -Author: Olivier Fourdan -Date: Fri Feb 5 09:48:22 2016 +0100 - - vidmode: rename DDX functions - - To avoid confusion as to what belongs on the DDX and what not. - - Reviewed-by: Adam Jackson - Signed-off-by: Olivier Fourdan - (cherry picked from commit 17097e083b2392c8989474f6e0da8cc234329e9c) - -commit 64053645cfd950bb0b6c3fda8deb60e1e540ce69 -Author: Olivier Fourdan -Date: Fri Feb 5 09:48:21 2016 +0100 - - vidmode: move display mode definitions - - To be able to reuse the VidMode extension in a non-hardware server, the - display mode definitions need to be accessible from DIX. - - Reviewed-by: Adam Jackson - Signed-off-by: Olivier Fourdan - (cherry picked from commit ddfb8c009ac651209eb0087aaf86b54e1446e8b2) - -commit 227b533bf414e03e9a73d0d9e47a761fc597c360 -Author: Olivier Fourdan -Date: Fri Feb 5 09:48:20 2016 +0100 - - vidmode: remove mode access from public API - - The mode access functions (namely VidModeCreateMode(), - VidModeCopyMode(), VidModeGetModeValue() and VidModeSetModeValue()) are - used only in xf86VidMode code and do not need to be available anywhere - else. - - Remove these functions from the public VidMode API and move them as - static where they are used. - - Reviewed-by: Adam Jackson - Signed-off-by: Olivier Fourdan - (cherry picked from commit e29a64de662112b8ebcd3f20c89df0e8c51890ef) - -commit 9824faaa58efe55a372d7dd0f6c5cbf84e77af61 -Author: Olivier Fourdan -Date: Fri Feb 5 09:48:19 2016 +0100 - - vidmode: use appropriate DisplayModePtr type - - The API uses an untyped pointer (void *) where a DisplayModePtr is - expected. - - Clean up the API to use the appropriate type, as DisplayModePtr is - really all that will be passed there. - - Reviewed-by: Adam Jackson - Signed-off-by: Olivier Fourdan - (cherry picked from commit b7962ade5265a21ac7c60da6cc07ece15ef7e648) - -commit 3b52aee6dddc2cd2780f729e9389a1515c544c61 -Author: Olivier Fourdan -Date: Fri Feb 5 09:48:18 2016 +0100 - - vidmode: remove VidModeGetMonitor() - - VidModeGetMonitor() is used solely in ProcXF86VidModeGetMonitor() to - get a untyped monitor pointer that is passed back straight again to - VidModeGetMonitorValue(). - - This is actually useless as VidModeGetMonitorValue() could as well get - the monitor from the ScreenPtr just like VidModeGetMonitor() does. - - Reviewed-by: Adam Jackson - Signed-off-by: Olivier Fourdan - (cherry picked from commit 12f714fd95dc9d912c0bf2524005a73ec6e8ee4f) - -commit b241fd6413775f76a5faaea0f685a8294322e2fc -Author: Olivier Fourdan -Date: Fri Feb 5 09:48:17 2016 +0100 - - vidmode: use ScreenPtr instead of screen index - - New code passes ScreenPtr instead of the screen index. - - Change the VidMode functions to take a ScreenPtr. - - Reviewed-by: Adam Jackson - Signed-off-by: Olivier Fourdan - (cherry picked from commit f6f7e21133c13c34f306a191137d566e83b40929) - -commit 2028b9066ddbbeaf585e154d19c2672cccdda9bb -Author: Olivier Fourdan -Date: Fri Feb 5 09:48:16 2016 +0100 - - vidmode: get rid of the CloseScreen wrapper - - As we rely on dixRegisterPrivateKey() to allocate the memory for us that - will be free automatically, we do not need the CloseScreen wrapper - anymore. - - Reviewed-by: Adam Jackson - Signed-off-by: Olivier Fourdan - (cherry picked from commit 6e898ef080df93e885ead9d6fee8854b34e0216f) - -commit cb3a8768db1b7b2f98f62e3075aa0dd2a46edd9d -Author: Olivier Fourdan -Date: Fri Feb 5 09:48:15 2016 +0100 - - vidmode: use appropriate API - - dixRegisterPrivateKey() can allocate memory that will be freed when the - screen is teared down. - - No need to calloc() and free the memory ourself using a broken ref - counting method. - - Reviewed-by: Adam Jackson - Signed-off-by: Olivier Fourdan - (cherry picked from commit 341f3bccafde71754a9ed2303df9908e509c6d31) - -commit 45d17e6bb0ee35662913cd6ce378460aa7e461cc -Author: Chris Wilson -Date: Fri Feb 12 11:59:53 2016 +0000 - - dri2: Allow many blocked clients per-drawable - - This patch was motivated by the need to fix the use-after-free in - dri2ClientWake, but in doing so removes an arbitrary restriction that - limits DRI2 to only blocking the first client on each drawable. In order - to fix the use-after-free, we need to avoid touching our privates in the - ClientSleep callback and so we want to only use that external list as - our means of controlling sleeps and wakeups. We thus have a list of - sleeping clients at our disposal and can manage multiple events and - sources. - - Reviewed-by: Adam Jackson - Signed-off-by: Chris Wilson - (cherry picked from commit d8882954570aba656d5a7be7d357feaba21cb099) - -commit 204e85786f24c1ab734ab9ee015efbb790dee130 -Author: Chris Wilson -Date: Fri Feb 12 11:59:52 2016 +0000 - - dix: Add ClientSignalAll() - - This is a variant of ClientSignal() that signals all clients with an - optional matching sleeping client, function and closure. - - Reviewed-by: Adam Jackson - Signed-off-by: Chris Wilson - (cherry picked from commit bc3634010c096dffd1935c0c6cf8ba37534ae3d8) - -commit c06a4b4a2422e937eda36a4ec10bdafc71001be7 -Author: Jon Turney -Date: Tue Aug 11 15:45:57 2015 +0100 - - xwin: Add SKIPTASKBAR hint to _NET_WM_WINDOW_TYPE_DOCK type windows - - Signed-off-by: Jon Turney - Reviewed-by: Colin Harrison - (cherry picked from commit f7d1e5acdf5ed4ab4ed5c18727aa6f3d379ef560) - -commit 6f099c7bd59039834c7b45289310b003b81cb3e3 -Author: Jon Turney -Date: Thu Jul 2 19:21:11 2015 +0100 - - xwin: In multiwindow mode, look up the HWND for the parent window - - Rather than only looking at the foreground window to see if it matches - the WM_TRANSIENT_FOR window XID, lookup that XID and fetch the HWND from - the window privates. - - Signed-off-by: Jon Turney - Reviewed-by: Colin Harrison - (cherry picked from commit e7f87f8f76e5ac9479a71e3daf2cfdefd4b5f684) - -commit 41cbb7da4e9337d4136d378f5fa45365f41f02e4 -Author: Jon Turney -Date: Mon Feb 22 17:41:14 2016 +0000 - - xwin: Keyboard layout updates - - layout zh_TW doesn't exist (anymore), try something else for that. - - layout it variant mac doesn't seem to exist anymore, try to handle - Macintosh keyboards (running under Parallels on Mac) and other oddities - in a more generic way, by falling back to matching only on the language - identifer part of the input locale identifer. - - v2: - Fix typo of 0xa0000 for 0xa000 - - Signed-off-by: Jon Turney - Reviewed-by: Colin Harrison - (cherry picked from commit 8c2006ddc5abbd4ac374dabf1cfdd3df8fc88779) - -commit da7745065ee27d62cc2eba4e860118459917dad9 -Author: Colin Harrison -Date: Wed Nov 19 22:33:39 2014 +0000 - - xwin: Add a tentative entry for the Korean keyboard to the list of known keyboard layouts - - Signed-off-by: Colin Harrison - Reviewed-by: Jon Turney - (cherry picked from commit 8c97a0078e7fe22e6159fa53490dfca2f4d267a9) - -commit c1eb12f89c2391cd99a834da6b342f104da1eb5c -Author: Jon Turney -Date: Tue Feb 10 14:36:37 2015 +0000 - - xwin: Update to XRANDR 1.2 internal interface to ensure an output is reported by XRANDR - - If using the X server internal XRANDR 1.0 interface, it seems we must - register a display size with RRRegisterSize() in order to make - RRGetInfo() call RRScanOldConfig() to generate an output and crtc for - us. - - Without this, the following GDM bug means that an XDMCP session to GDM - cannot be started. - - https://bugzilla.gnome.org/show_bug.cgi?id=736054 - - Instead, use the more recent XRANDR 1.2 internal interface to explicitly - create the output and crtc, and maintain a single mode which represents - the current display size. - - Also don't emit a RRScreenSizeNotify when a RRScreenSizeSize is done - which has no effect, this seems to throw the GDM greeter into a loop... - - v2: Maintain reference count for the mode we maintain more correctly, to - avoid double free causing a crash on shutdown - - Connect crtc to output, so a subsequent RRSetCrtcConfig request doesn't - change anything, so we don't fail due to our lack of rrSetConfig or - rrCrtcSet hooks. - - See https://cygwin.com/ml/cygwin-xfree/2015-02/msg00032.html - - v3: - Raise limit on X display size from 4Kx4K to 32Kx32K - - Signed-off-by: Jon Turney - Reviewed-by: Colin Harrison - (cherry picked from commit a4d8a64c4ba467964476c4a1486da698bd6aed9e) - -commit 771a668188793e7261ae2cbf7d7289b8a133316a -Author: Jon Turney -Date: Sat Oct 18 17:31:57 2014 +0100 - - xwin: Use WM_CLIPBOARDUPDATE clipboard API - - Windows Vista and later have a saner clipboard API where the clipboard - viewer linked list is no longer maintained by applications. Use it - where available. - - Signed-off-by: Jon Turney - Reviewed-by: Colin Harrison - (cherry picked from commit 008efebda801b9b80e2ab3f2c95aeef8c82102ee) - -commit 00199e8c822fcf6a933637410e44e08ac659f682 -Author: Jon Turney -Date: Wed Jul 9 14:26:54 2014 +0100 - - xwin: Check that window position is visible on non-rectangular virtual desktops - - Improve the check that window position is visible to work correctly for - non-rectangular virtual desktops - - Signed-off-by: Jon Turney - Reviewed-by: Colin Harrison - (cherry picked from commit de7f1fd6f8f10f07b366ae5428a8c65a224bda98) - -commit 0fb47bd27919a7f1e47db3bd3f97fd9a07ccc517 -Author: Jon Turney -Date: Thu May 8 11:40:39 2014 +0100 - - xwin: Correctly interpret WM_HINTS, WM_NORMAL_HINTS properties on x86_64 - - Signed-off-by: Jon Turney - Reviewed-by: Colin Harrison - (cherry picked from commit a9e73131b6453e0fa2da5360e84af7a2eae3b205) - -commit 1e143cff16835dd69559ca5646f313dad3db75ab -Author: Jon Turney -Date: Thu Mar 13 18:04:17 2014 +0000 - - xwin: Improve handling of no-decoration motif hint - - When motif decoration hint asks for no decoration, don't add sysmenu, - mimimize or maximimize controls. - - (This fixes a problem with e.g. fbpanel having a minimize control, but - gtk's panel_configure_event() doesn't like the state we put the window - into when we minimize it, causing it to spin) - - Signed-off-by: Jon Turney - Reviewed-by: Colin Harrison - (cherry picked from commit d7cef6fbe23381b31c163468f349feee2f1b1eba) - -commit f0c2a3527797cf2bfbfa4697c294ae087c1e4423 -Author: Jon Turney -Date: Fri Mar 28 16:57:48 2014 +0000 - - xwin: XGetWMNormalHints() returns non-zero on success - - XGetWMNormalHints() doesn't actually return a Status value. On success - it returns a non-zero value, not Success. - - Signed-off-by: Jon Turney - Reviewed-by: Colin Harrison - (cherry picked from commit f75404be3ad94c8da493688397712c65ea66cb90) - -commit e457e93e5d33cbec387e40051fbabf6cf76d6af3 -Author: Michel Dänzer -Date: Wed Feb 24 16:52:59 2016 +0900 - - present: Only requeue if target MSC is not reached after an unflip - - While present_pixmap decrements target_msc by 1 for present_queue_vblank, - it leaves the original vblank->target_msc intact. So incrementing the - latter for requeueing resulted in the requeued presentation being - executed too late. - - Also, no need to requeue if the target MSC is already reached. - - This further reduces stutter when a popup menu appears on top of a - flipping fullscreen window. - - Reviewed-by: Chris Wilson - Signed-off-by: Michel Dänzer - (cherry picked from commit b4ac7b142fa3c536e9b283cfd34b94d82c03aac6) - -commit eb5108b87017128f394ae31b5b7cd85dd8819bca -Author: Michel Dänzer -Date: Wed Feb 24 16:52:58 2016 +0900 - - present: Requeue if flip driver hook fails and target MSC not reached - - For flipping, we wait for the MSC before the target MSC and then call - the driver flip hook. If the latter fails, we have to wait for the - target MSC before falling back to a copy, or else it's executed too - early. - - Fixes glxgears running at unbounded framerate (not synchronized to the - refresh rate) in fullscreen if the driver flip hook fails. - - Reviewed-by: Chris Wilson - Signed-off-by: Michel Dänzer - (cherry picked from commit e7a35b9e16aa12970908f5d55371bb1b862f8f24) - -commit cf30b7cfd6d91da16c762332617fc165d82f17d2 -Author: Michel Dänzer -Date: Wed Feb 24 16:52:57 2016 +0900 - - present: Move msc_is_(equal_or_)after to the top of present.c - - To make them usable from any other function in the file. No functional - change. - - Reviewed-by: Chris Wilson - Signed-off-by: Michel Dänzer - (cherry picked from commit 1a9f8c4623c4e6b6955cb6d5f44d29c244dfd32a) - -commit 8869f45a965a7b12bb7fe03ba226167e1f821c1e -Author: Laércio de Sousa -Date: Mon Feb 22 16:04:12 2016 -0300 - - kdrive/evdev: update keyboard LEDs (#22302) - - Implement missing parts in kdrive evdev driver for - correct update of evdev keyboard LEDs. - - Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=22302 - - [ajax: Fixed deref-before-null-check bug] - - Reviewed-by: Adam Jackson - Signed-off-by: Laércio de Sousa - (cherry picked from commit 0461bca0cb2f7918c77ed45d2cbc756cf65021be) - -commit 05f3cf659be44caf00e801a5bcd9362a1a87aa46 -Author: Jon TURNEY -Date: Mon Feb 22 16:20:00 2016 +0000 - - Fix build on Cygwin by ensuring WIN32 check triggers only on MinGW - - The type of fd_mask was changed in Cygwin 2.4.0 headers from 'long' to - 'unsigned long'. This exposes an existing problem with winauth.c, which - includes Xwindows.h (which includes windows.h, which defines WIN32), - before including osdep.h, which causes the now conflicting definition of - fd_mask in osdep.h to be exposed: - - In file included from ../os/osdep.h:198:18: error: conflicting types for - ‘fd_mask’ typedef long int fd_mask; /usr/include/sys/select.h:46:23: - note: previous declaration of ‘fd_mask’ was here typedef unsigned long - fd_mask; - - Adjust the include guards in osdep.h to make sure we only use WIN32 - guarded code when not compiling for Cygwin (i.e. WIN32 && !__CYGWIN__) - - This isn't a very elegant, but unfortunately appears to be the best - solution, since it doesn't seem to be possible to write the test in a - positive form. - - Future work: Should also audit of all the other uses of WIN32 in - xserver, and make sure they are correct. - - Reviewed-by: Adam Jackson - Signed-off-by: Jon Turney - (cherry picked from commit 30b7d7995ef70b7473e0fb170eb8ae23b8d1f4a7) - -commit 10e46504711427ed5280fdeb974a08b888f47034 -Author: Jonas Ådahl -Date: Fri Feb 19 15:08:12 2016 +0800 - - xwayland: Prefix shm tmp file names with xwayland - - Prefix the temporary file names used for allocating pixmaps with - "xwayland-" instead of "weston-". This makes it less confusing while - looking at the file names of the currently open fds of the Xwayland - process. - - Reviewed-by: Adam Jackson - Signed-off-by: Jonas Ådahl - (cherry picked from commit 544b4149268561d3d794aa540172831fa7550a20) - -commit de7f91c079d7168c107bb8b8dbe651eebd8e9a12 -Author: Marc-Andre Lureau -Date: Fri Feb 12 22:52:07 2016 +0100 - - dri2: add virtio-gpu pci ids - - Add virtio-gpu legacy + 1.0 pci ids, allowing them to use - modesetting + glamor with dri2. - - Signed-off-by: Marc-André Lureau - Reviewed-by: Dave Airlie - (cherry picked from commit 5627708e5f447d0e360bbc9eb8d1c4e58c5046d0) - -commit 16573a4c35cb71f204b37ad1c3b3d115e84b2cd8 -Author: Daniel Stone -Date: Fri Feb 12 16:36:59 2016 +0000 - - dix: Add hybrid full-size/empty-clip mode to SetRootClip - - 216bdbc735 removed the SetRootClip call in the XWayland output-hotplug - handler when running rootless (e.g. as a part of Weston/Mutter), since - the root window has no storage, so generating exposures will result in - writes to invalid memory. - - Unfortunately, preventing the segfault also breaks sprite confinement. - SetRootClip updates winSize and borderSize for the root window, which - when combined with RRScreenSizeChanged calling ScreenRestructured, - generates a new sprite-confinment area to update it to the whole screen. - - Removing this call results in the window geometry being reported - correctly, but winSize/borderSize never changing from their values at - startup, i.e. out of sync with the root window geometry / screen - information in the connection info / XRandR. - - This patch introduces a hybrid mode, where we update winSize and - borderSize for the root window, enabling sprite confinement to work - correctly, but keep the clip emptied so exposures are never generated. - - Signed-off-by: Daniel Stone - Tested-by: Olivier Fourdan - Reviewed-by: Adam Jackson - (cherry picked from commit e957a2e5dd288f515f3e93724823542c20333f6a) - -commit 29d1c5a8e4127d5fd1a0d41f8e1474e9dfdb9638 -Author: Keith Packard -Date: Tue Feb 16 20:03:57 2016 -0800 - - randr: Send ConfigNotify when manual monitor list changes - - This lets clients know that the layout of the monitors on the screen - has changed so they can adapt appropriately. - - Signed-off-by: Keith Packard - Reviewed-by: Dave Airlie - (cherry picked from commit dbe8d03c42f01332b3dc41fe9290aed142f1436f) - -commit fc3eef6024355206ea429eb5e2d36001fa47a884 -Author: Adam Jackson -Date: Wed Feb 10 11:13:04 2016 -0500 - - dri2: Use the work queue to manage client sleeps - - In commit e43abdce964f5ed9689cf908af8c305b39a5dd36 - Author: Chris Wilson - Date: Wed Feb 3 09:54:46 2016 +0000 - - dri2: Unblock Clients on Drawable release - - we try to wake up any blocked clients at drawable destruction. But by - the time we get there, CloseDownConnection has already torn down state - that AttendClient wants to modify. - - Using ClientSleep instead of IgnoreClient puts a wakeup function on a - workqueue, and the queue will be cleared for us in CloseDownClient - before (non-neverretain) resource teardown. - - Tested-by: Chris Wilson - Reviewed-by: Chris Wilson - Signed-off-by: Adam Jackson - (cherry picked from commit eddf848c44349c7ebc7da9957bffb3630f3faaa9) - -commit 9db37e05a96d1488b7cb30b7e1ccd4c73b38d915 -Author: Chris Wilson -Date: Wed Feb 3 09:54:46 2016 +0000 - - dri2: Unblock Clients on Drawable release - - If the Window is destroyed by another client, such as the window - manager, the original client may be blocked by DRI2 awaiting a vblank - event. When this happens, DRI2DrawableGone forgets to unblock that - client and so the wait never completes. - - Note Present/xshmfence is also suspectible to this race. - - Testcase: dri2-race/manager - Signed-off-by: Chris Wilson - Cc: Ville Syrjälä - Reviewed-by: Ville Syrjälä - (cherry picked from commit e43abdce964f5ed9689cf908af8c305b39a5dd36) - -commit 7be0e08cd91ed4be18eefb04018be36dcf0f427e -Author: Adam Jackson -Date: Wed Dec 9 09:10:13 2015 -0500 - - autogen: Set a default subject prefix for patches - - Per discussion at XDC2015, we want this so we can easily distinguish - which module a patch is for. There's no way to set this in the - server-side config, so setting a default at autogen time is about the - best we can do. - - Reviewed-by: Eric Anholt - Signed-off-by: Adam Jackson - (cherry picked from commit a722d617a092f08f69086630f5cfb598d4a21cc7) - -commit c388b2d52177eb7f66a63a8454cee1990b4813d9 -Author: Jan Burgmeier -Date: Thu Feb 4 14:06:43 2016 +0100 - - Fix XineramaQueryScreens for reverse prime - - Make sure we account for slave CRTCs when building the monitor list, - since that's what rrxinerama uses to fake Xinerama geometry. - - [ajax: Slightly more informative commit message.] - - Bugzilla: https://bugs.freedesktop.org/92313 - Reviewed-by: Dave Airlie - (cherry picked from commit 7bb64d8c1de9659f11da7917772919b071e9db82) - -commit 18155405875608f3a46db465aa9753d66b099f8e -Author: Rui Matos -Date: Wed Feb 3 16:14:09 2016 +0100 - - xwayland: Clear pending cursor frame callbacks on pointer enter - - The last cursor frame we commited before the pointer left one of our - surfaces might not have been shown. In that case we'll have a cursor - surface frame callback pending which we need to clear so that we can - continue submitting new cursor frames. - - Signed-off-by: Rui Matos - Reviewed-by: Bryce Harrington - Acked-by: Pekka Paalanen - Reviewed-by: Daniel Stone - Reviewed-by: Jonas Ådahl - (cherry picked from commit 87d5534f701242d7c23aa20545a6292a0779c89c) - -commit eac170e469cb66a7e5a47d00c56ddc53c63cca85 -Author: Chris Wilson -Date: Wed Feb 3 09:54:43 2016 +0000 - - dri2: Only invalidate the immediate Window upon SetWindowPixmap - - All callers of SetWindowPixmap will themselves be traversing the Window - heirarchy updating the backing Pixmap of each child and so we can forgo - doing the identical traversal inside the DRI2SetWindowPixmap handler. - - Reported-by: Loïc Yhuel - Link: http://lists.x.org/archives/xorg-devel/2015-February/045638.html - Signed-off-by: Chris Wilson - Cc: Ville Syrjälä - Reviewed-by: Ville Syrjälä - (cherry picked from commit b7d392931a309d0fe754869efb456ccd0385f3aa) - -commit 2fc1752ac39a9325dbc5f8e700fc566ea6f8240f -Author: Eric Anholt -Date: Wed Jan 27 11:26:16 2016 -0800 - - glamor: Flip around conditionals in RepeatNone fixups. - - Signed-off-by: Eric Anholt - Reviewed-by: Dave Airlie - Reviewed-by: Kenneth Graunke - (cherry picked from commit 2c3e8768443caa66d78775ea79bb16a5faae3a3c) - -commit 4acebf257e37e075a14b3acecce27d050b18bba8 -Author: Eric Anholt -Date: Wed Jan 27 11:21:05 2016 -0800 - - glamor: Cut down a bunch of conditional handling for RepeatFix. - - For hardware that doesn't do actual jumps for conditionals (i915, - current vc4 driver), this reduces the number of texture fetches - performed (assuming the driver isn't really smart about noticing that - the same sampler is used on each side of an if just with different - coordinates). - - No performance difference on i965 with x11perf -magpixwin100 (n=40). - Improves -magpixwin100 by 12.9174% +/- 0.405272% (n=5) on vc4. - - Signed-off-by: Eric Anholt - Reviewed-by: Dave Airlie - Reviewed-by: Kenneth Graunke - (cherry picked from commit e82c8c81df80de487aa795d69e874a0811c537ea) - -commit d1c0873228a115ee0ebf46afaf335b8b97a5bbdc -Author: Eric Anholt -Date: Wed Jan 27 11:15:27 2016 -0800 - - glamor: Clarify how the repeat values being passed around work. - - Signed-off-by: Eric Anholt - Reviewed-by: Dave Airlie - Reviewed-by: Kenneth Graunke - (cherry picked from commit 2c3273861cdf874b165ce5a1953102187f71b48e) - -commit b0b160aafc151b1fdf1840134bc344e3ce2f3e85 -Author: Eric Anholt -Date: Wed Jan 27 11:10:14 2016 -0800 - - glamor: Clean up formatting of RepeatFix shader code. - - All sorts of weird indentation, and some cuddled conditional - statements deep in the if tree. - - Signed-off-by: Eric Anholt - Reviewed-by: Dave Airlie - Reviewed-by: Kenneth Graunke - (cherry picked from commit 990a8ee01324332ee9b4a4bb124ce8f73be24349) - -commit 12e4e3ac31b05b501df74c4fa37274830e30662a -Author: Eric Anholt -Date: Wed Jan 27 10:24:17 2016 -0800 - - glamor: Clarify some logic in RepeatFix handling. - - wh ratios are != 1.0 only when large, so with that we can simplify - down how we end up with RepeatFix being used. - - Signed-off-by: Eric Anholt - Reviewed-by: Dave Airlie - Reviewed-by: Kenneth Graunke - (cherry picked from commit 20cb5b2d65ce63ea7934b77f1520387550c778a8) - -commit d5c9c541c5d325453ddb9ebcdcf36bc6ef0af4aa -Author: Eric Anholt -Date: Tue Jan 26 17:29:48 2016 -0800 - - glamor: Simplify the pixmap box looping. - - We had a double loop across h and w, and passed the current x and y - out to callers who then used w to multiply/add to an index. Instead, - just single loop across w * h. - - Signed-off-by: Eric Anholt - Reviewed-by: Dave Airlie - Reviewed-by: Kenneth Graunke - (cherry picked from commit 07f0d90e4a8b05ef968b1ef47acda7c9f4580340) - -commit 68bd172432de069aa242d21b3af505867417ae45 -Author: Eric Anholt -Date: Tue Jan 26 15:56:27 2016 -0800 - - glamor: Reuse the glamor_program_alpha_* enums for Render. - - This is a step toward using glamor_program.c for Render acceleration. - - Signed-off-by: Eric Anholt - Reviewed-by: Dave Airlie - Reviewed-by: Kenneth Graunke - (cherry picked from commit 0dbce65b08f4812dcaa4b77cd37aebac334c47a2) - -commit 6a71251b3985d6dd7c1ab1fa6e13f1edaa33a5c5 -Author: Eric Anholt -Date: Tue Jan 26 15:47:01 2016 -0800 - - glamor: Drop extra SHADER_IN type for no mask present. - - We can just hand in a constant mask and the driver will optimize away - the multiplication for us. - - Signed-off-by: Eric Anholt - Reviewed-by: Dave Airlie - Reviewed-by: Kenneth Graunke - (cherry picked from commit 9b676786de32f06aedf9d4c9535c10fda247335a) - -commit 2db5bf7a1297a84e516ce87b24dd3982e7674bb2 -Author: Eric Anholt -Date: Tue Jan 26 15:19:50 2016 -0800 - - glamor: Convert XV to using glamor_program.c. - - One less custom path! By following the common glamor_program.c use - pattern, we get the ability to handle large pixmaps as the - destination. It's also one less place where glamor_utils.h coordinate - transformation happens. - - Signed-off-by: Eric Anholt - Reviewed-by: Dave Airlie - Reviewed-by: Kenneth Graunke - (cherry picked from commit 03f34f85563c81e1655626e10f75fd7e21393c92) - -commit 9be8478467fc4827ca8edc035f0a6d1cca78fbe0 -Author: Eric Anholt -Date: Tue Jan 26 14:52:08 2016 -0800 - - glamor: Simplify XV vertex setup. - - We were clipping the drawn rectangle to each clip box, then expanding - the box to a big triangle to avoid tearing, then drawing each triangle - to the destination through a scissor. If we're using a scissor for - clipping, though, then we don't need to clip the drawn primitive on - the CPU in the first place. - - Signed-off-by: Eric Anholt - Reviewed-by: Dave Airlie - Reviewed-by: Kenneth Graunke - (cherry picked from commit f368a0ba3aa58e5260d839d11d2f3aef75feaeaf) - -commit d23fe3229c17cb0dfb4210041efbdc36fc365dad -Author: Eric Anholt -Date: Tue Jan 26 14:18:48 2016 -0800 - - glamor: Set up XV sampler uniforms once at program build time. - - No sense doing it on every draw. - - Signed-off-by: Eric Anholt - Reviewed-by: Dave Airlie - Reviewed-by: Kenneth Graunke - (cherry picked from commit 294e45b60d99cf7d11c657288bbe2670b56775f3) - -commit ef993dbbed24f1fe68fd4c66f0035e6c74cde10d -Author: Eric Anholt -Date: Tue Jan 26 13:39:18 2016 -0800 - - glamor: Drop dead glamor_pict_format_is_compatible(). - - This hasn't been used since 2f80c7791bb0b11f261cb1e3e0d89163dcdd0342 - (GLAMOR_SEPARATE_TEXTURE removal). - - Signed-off-by: Eric Anholt - Reviewed-by: Dave Airlie - Reviewed-by: Kenneth Graunke - (cherry picked from commit 5d7bef2eedfd965359dd4eebb6ab806cdad5b83f) - -commit f031c5edbf36a029800d0f8574aea226a4b5b82f -Author: Eric Anholt -Date: Tue Jan 26 15:08:17 2016 -0800 - - glamor: Drop comment about dead yInverted flag. - - Wait long enough, and you don't need to think about it at all. - - Signed-off-by: Eric Anholt - Reviewed-by: Dave Airlie - Reviewed-by: Kenneth Graunke - (cherry picked from commit 4494a450405cf539743cbcfe6907bf5bdd2d80cb) - -commit f1a03379c44c467b92753748165380e33e2e28c8 -Author: Eric Anholt -Date: Tue Jan 26 13:34:00 2016 -0800 - - glamor: Rename the *y_inverted helpers to not say "inverted". - - Signed-off-by: Eric Anholt - Reviewed-by: Dave Airlie - Reviewed-by: Kenneth Graunke - (cherry picked from commit f7c24e6ac345aab91df5fc959f239a33f37113b1) - -commit 83395e6a99c0665490948c92da9bd768954f8c9e -Author: Eric Anholt -Date: Tue Jan 26 13:31:59 2016 -0800 - - glamor: Drop dead *_from_x_coord_y() functions. - - They've been dead since the yInverted removal - (e310387f443b6333edf02c8980daa303505382b4). - - Signed-off-by: Eric Anholt - Reviewed-by: Dave Airlie - Reviewed-by: Kenneth Graunke - (cherry picked from commit 1fcb6f4cbf3d6514716435a0e79c0e6d53c31a3a) - -commit 558ea399664b767c3f9c1acc18f4b2d341d6929c -Author: Eric Anholt -Date: Thu Jan 21 16:01:14 2016 -0800 - - glamor: Clarify when Render fallbacks happen due to an unsupported op. - - Signed-off-by: Eric Anholt - Reviewed-by: Dave Airlie - Reviewed-by: Kenneth Graunke - (cherry picked from commit 9ef11f13af7f552dadb4a90c248e525a257e0a2c) - -commit 7c63e80e3f9de3d1b8132a40be6f932e772e0d69 -Author: Eric Anholt -Date: Wed Jan 27 11:35:03 2016 -0800 - - glamor: Label programs before linking them. - - i965 does most of its compiling at link time, so our debug output for - its shaders didn't have the name on. - - Signed-off-by: Eric Anholt - Reviewed-by: Dave Airlie - Reviewed-by: Kenneth Graunke - (cherry picked from commit b8229cc5f5298a37a4735dd002b0e0ebfc8bc75a) - -commit 14e2b6f9d87921b39c0874e1a74dff2f9e396f78 -Author: Eric Anholt -Date: Wed Jan 27 16:11:17 2016 -0800 - - ephyr: Make sure we have GLX_ARB_create_context before calling it. - - This should fix aborts()s from epoxy on old software stacks. - - Signed-off-by: Eric Anholt - Reviewed-by: Dave Airlie - Reviewed-by: Kenneth Graunke - (cherry picked from commit 68f236ebd4b268a9e525d623986999d230feb453) - -commit cd9ae6d1a259f3229df4c110903658d1bede8554 -Author: Adam Jackson -Date: Tue Dec 8 17:41:37 2015 -0500 - - xfree86: Build parser for DRI config file subsection unconditionally - - This applies regardless of which DRI you're asking for. Worse, leaving - it out means breaking the config file syntax in a pointless way, since - non-DRI servers can safely just parse it and ignore it. - - Reviewed-by: Eric Anholt - Signed-off-by: Adam Jackson - (cherry picked from commit 953b71270cf12c59c8a836c9be403d07fb01fa22) - -commit 3da08902dd5961ea6f70431fce813f294d0f8547 -Author: Dave Airlie -Date: Wed Jan 27 16:46:06 2016 -0800 - - ephyr: catch X errors if we try to create a core context and fail. - - This stops Xephyr failing on GLXBadFBConfig. - - Signed-off-by: Dave Airlie - Reviewed-by: Dave Airlie - (cherry picked from commit d8ecbe563991cc689e95a8cb9d510e920eaceea0) - -commit 4c6ca0aae5a301140eadc97313be954bd6a5fe18 -Author: Dave Airlie -Date: Tue Jan 19 08:06:25 2016 +1000 - - xwayland: add support for use core profile for glamor. (v2) - - This adds support to Xwayland to try and use OpenGL core - profile for glamor first. - - v1.1: use version defines. - v2: let glamor work out core profile itself. - - Signed-off-by: Dave Airlie - Reviewed-by: Eric Anholt - (cherry picked from commit 6978c8ee666a9224213173e7680e2d71b1094bab) - -commit b0fa782081f933e84f068228ca35fa5c25c9a4b3 -Author: Dave Airlie -Date: Tue Jan 19 07:59:59 2016 +1000 - - glamor: add core profile support to EGL glamor. (v2) - - v1.1: use version defines. - v2: let glamor work it out itself - - Signed-off-by: Dave Airlie - Reviewed-by: Eric Anholt - (cherry picked from commit 79c3925532bc0d098c9a4da6d5117bdada56e0af) - -commit 181ea41e71934a0c575322a8be9234f2e64ef8db -Author: Keith Packard -Date: Wed Sep 10 19:05:08 2014 -0700 - - ephyr: Create 3.1 core profile context if possible (v3) - - On desktop GL, ask for a 3.1 core profile context if that's available, - otherwise create a generic context. - - v2: tell glamor the profile is a core one. - v2.1: add/use GL version defines - v3: let glamor work out core itself - - Signed-off-by: Keith Packard - Signed-off-by: Dave Airlie - Reviewed-by: Eric Anholt - (cherry picked from commit 98c3504dcfcec227b9c7798a0bd287941cec0691) - -commit d7f03d57454de989025de2a2ef644d43eead9ddf -Author: Dave Airlie -Date: Mon Jan 11 14:00:35 2016 +1000 - - glamor: add core profile support. (v2) - - Glamor works out from the profile if it is - core. - - This flag is used to disable quads for rendering. - - v1.1: split long line + make whitespace conform (Michel) - v1.2: add GL 3.1 version defines - v2: move to having glamor work out the profile. - - Signed-off-by: Dave Airlie - Reviewed-by: Eric Anholt - (cherry picked from commit 564d9f0f8c17bb3c13aa3ca36da7825454dc5de3) - -commit 0cd5b9525a8f661c6b2545c21ce1ba21577c009e -Author: Keith Packard -Date: Wed Sep 10 19:02:55 2014 -0700 - - glamor: Use GL_RED instead of GL_ALPHA if we have texture_swizzle (v3) - - GL_RED is supported by core profiles while GL_ALPHA is not; use GL_RED - for one channel objects (depth 1 to 8), and then swizzle them into the - alpha channel when used as a mask. - - [airlied: updated to master, add swizzle to composited glyphs and xv paths] - - v2: consolidate setting swizzle into the texture creation code, it - should work fine there. Handle swizzle when setting color as well. - v3: Fix drawing to a8 with Render (changes by anholt, reviewed by airlied). - - Signed-off-by: Keith Packard - Signed-off-by: Dave Airlie - Reviewed-by: Eric Anholt - (cherry picked from commit e6754dcb59ee21abb42421a28f4e467295584f67) - -commit 7bd0f79c38cac71d433b1ec7e56a6ff7c2550bcc -Author: Eric Anholt -Date: Thu Jun 18 11:14:41 2015 -0700 - - glamor: Delay making pixmaps shareable until we need to. - - If a pixmap isn't getting exported as a dmabuf, then we don't need to - make an EGLImage/GBM bo for it. This should reduce normal pixmap - allocation overhead, and also lets the driver choose non-scanout - formats which may be much higher performance. - - On Raspberry Pi, where scanout isn't usable as a texture source, this - improves x11perf -copypixwin100 from about 4300/sec to 5780/sec under - xcompmgr -a, because we no longer need to upload our x11perf window to - a tiled temporary in order to render it to the screen. - - v2: Just use pixmap->usage_hint instead of a new field. Drop the - changes that started storing gbm_bos in the pixmap priv due to - lifetime issues. - v3: Fix a missing gbm_bo_destroy() on the pixmap-from-fd success path. - - [ajax: Restore glamor_egl_create_argb8888_based_texture for ABI reasons. - I'm not aware of any driver using it directly, but.] - - Signed-off-by: Eric Anholt - Reviewed-by: Michel Dänzer - (cherry picked from commit 51984dddfcc7133ed3c1f20d03514aa98c9a7831) - -commit ec9b79c8d497522f87697e434f55086f185e65e7 -Author: Eric Anholt -Date: Thu Jun 18 11:26:46 2015 -0700 - - glamor: Simplify DRI3 pixmap-from-fd, using GBM. - - This GBM import path was introduced in 10.2, which we already require. - - Signed-off-by: Eric Anholt - Reviewed-by: Michel Dänzer - (cherry picked from commit 6be33fd044949330e0b2b4185882c9664d2f90b4) - -commit fba0d8a3c9deff557f8a9735fc907556e4e861aa -Author: Eric Anholt -Date: Wed Jan 20 12:33:25 2016 -0800 - - glamor: Drop duplicated GLAMOR_DEFAULT_PRECISIONs in render accel. - - We only need it once at the top of the shader, so just put it - there. - - Signed-off-by: Eric Anholt - Reviewed-by: Dave Airlie - (cherry picked from commit 5042b0652b9fe5fed57a233880c3429ba390d86d) - -commit 389761e592184d78969469914d1aba5d281824fd -Author: Dave Airlie -Date: Tue Jan 12 18:13:46 2016 +1000 - - glamor: Add support for CA rendering in a single pass. - - It's been on the list to add dual source blending support to avoid the - two pass componentAlpha code. Radeon has done this for a while in - EXA, so let's add support to bring glamor up to using it. - - This adds dual blend to both render and composite glyphs paths. - - Initial results show close to doubling of speed of x11perf -rgb10text. - - v2: Fix breakage of all of CA acceleration for systems without - GL_ARB_blend_func_extended. Add CA support for all the ops we - support in non-CA mode when blend_func_extended is present. Clean - up some comments and formatting. (changes by anholt) - - Signed-off-by: Dave Airlie - Signed-off-by: Eric Anholt - (cherry picked from commit e7308b6c77561df44c04f81509f8ada678705d94) - -commit 2e79da2dce15b25534ea83eb453cb9b762a2e29f -Author: Eric Anholt -Date: Thu Jan 21 12:01:02 2016 -0800 - - glamor: Drop the composite_with_copy path entirely. - - I originally inherited this from the EXA code, without determining - whether it was really needed. Regular composite should end up doing - the same thing, since it's all just shaders anyway. To the extent - that it doesn't, we should fix composite. - - Signed-off-by: Eric Anholt - Reviewed-by: Dave Airlie - (cherry picked from commit cab14a9a08ff06bc4cbef79c7be8f1d07c07ebf9) - -commit aad8e4714a2bdeada5c7ae42d2047cf6a4720d19 -Author: Keith Packard -Date: Wed Sep 10 16:17:52 2014 -0700 - - glamor: Use vertex array objects - - Core contexts require the use of vertex array objects, so switch both glamor - and ephyr/glamor over. - - Signed-off-by: Keith Packard - Reviewed-by: Eric Anholt - Signed-off-by: Dave Airlie - (cherry picked from commit 49aa5e3ea4eecea0562c05a4e52962985a56e510) - -commit 6691f523332a5993d3e90e16d8edff7f3b85c4ae -Author: Dave Airlie -Date: Tue Jan 19 10:34:14 2016 +1000 - - glamor/xv: add vbo support (v2.1) - - This converts the Xv code to using VBOs instead of - client ptrs. This is necessary to move towards using - the core profile later. - - v2: put all boxes into single vbo, use draw arrays - to offset things. (Eric) - v2.1: brown paper bag with releasing vbo. - - Reviewed-by: Eric Anholt - Signed-off-by: Dave Airlie - (cherry picked from commit d99204fb5e09ce7be36485d4226f7ad6d6eb24cc) - -commit eabe0e0b3685b5ab38c3597f238e92a3e4598441 -Author: Dave Airlie -Date: Mon Jan 11 14:00:04 2016 +1000 - - glamor: use vbos in gradient/picture code. - - This converts two client arrays users to using vbos, - this is necessary to move to using core profile later. - - Reviewed-by: Eric Anholt - Signed-off-by: Dave Airlie - (cherry picked from commit 5582ad1b9b29934498cf3fef305d3a988130cd52) - -commit 23e60f917a5af652cd83b8a3a9951c79838721b3 -Author: Adam Jackson -Date: Mon Feb 8 18:32:57 2016 -0500 - - xserver 1.18.1 - - Signed-off-by: Adam Jackson - -commit a0d49b1c660f2453d07ce23bf86b0ef717f3d2c8 -Author: Timo Aaltonen -Date: Wed Jan 27 14:18:50 2016 +0200 - - dri2: Sync i915_pci_ids.h and i965_pci_ids.h from mesa - - Adds Skylake, Kabylake and Broxton allowing them to use - modesetting + glamor with dri2. - - Signed-off-by: Timo Aaltonen - Reviewed-by: Andreas Boll - (cherry picked from commit 50ca286d79f6304b972ea74487308e7794a170fb) - -commit bc4b234d6f4b7b211f7a9750a97524e9652d0e6e -Author: Adam Jackson -Date: Wed Jan 27 11:50:13 2016 -0500 - - modesetting: Require sufficiently new libdrm - - Bugzilla: https://bugs.freedesktop.org/93883 - Signed-off-by: Adam Jackson - Reviewed-by: Alex Deucher - Reviewed-by: Julien Cristau - (cherry picked from commit bf23db42a4e5943129501223a47b48884cdeb62f) - -commit 0b95625cecc7dc2cb6aff61edbc8366e8ffd516f -Author: Dave Airlie -Date: Tue Jan 19 02:01:09 2016 +0000 - - glamor: don't do copy if we have 0 boxes to copy. - - This happens if you run twm + mplayer + xclock and drag - the clock over the mplayer. If we don't catch it, we cause - an illegal draw elements command to be passed to GL. - - Signed-off-by: Dave Airlie - Reviewed-by: Eric Anholt - (cherry picked from commit 1fd82c764d5b24107e60f2173e30e5d24a2f2667) - -commit 71be56c426bd9b66cbc5ab23923f4564e066cd75 -Author: Eric Anholt -Date: Thu Jan 21 11:30:15 2016 -0800 - - glamor: Fix copy-like Render operations between 15 and 16 depth. - - Reading and writing to 16-depth pixmaps using PICT_x1r5g5b5 ends up - failing, unless you're doing a straight copy at the same bpp where the - misinterpretation matches on both sides. - - Fixes rendercheck/blend/over and renderhceck/blend/src in piglit. - - Please cherry-pick this to active stable branches. - - Signed-off-by: Eric Anholt - Reviewed-by: Dave Airlie - (cherry picked from commit 510c8605641803f1f5b5d2de6d3bb422b148e0e7) - -commit 6a4f771c5da99d5f723d61e1a780390a5e6b161b -Author: Adam Jackson -Date: Wed Jan 20 15:43:10 2016 -0500 - - glx: Fix GLX_EXT_create_context_es2_profile support - - As of v4 of this extension, any GLES version number may be requested (to - enable GLES3 and later). To comply with this, simply remove the API - version checks and leave it to the DRI driver to validate. This happens - to also enable using GLES1 in direct contexts, so if that's the dire - situation you find yourself in, your client driver at least stands a - chance of working. - - v4 also specifies that both extension strings should be advertised for - compatibility with clients written against v1 of the extension spec, so - add the es_profile bit to the extension list and enable it whenever we - would enable es2_profile. - - Reviewed-by: Ilia Mirkin - Signed-off-by: Adam Jackson - (cherry picked from commit bc415fb1e0031ad23bda6e9c3f4664532876a0e5) - -commit ff562c9f98bbce91b61b06dfc51aa30c14180cdd -Author: Michel Dänzer -Date: Fri Jan 15 18:22:21 2016 +0900 - - present: Handle wraparound when comparing MSC values - - When a window moves from one CRTC to another, present_window_to_crtc_msc - updates window_priv->msc_offset according to the delta between the - current MSC values of the old and new CRTC: - - window_priv->msc_offset += new_msc - old_msc; - - window_priv->msc_offset is initially 0, so if new_msc < old_msc, - window_priv->msc_offset wraps around and becomes a large number. If the - window_msc parameter passed in is small (in particular if it's 0, such as - is the case when the client just wants to know the current window MSC - value), the returned CRTC MSC value may still be a large number. In that - case, the existing MSC comparisons in pixmap_present weren't working as - intended, resulting in scheduling a wait far into the future when the - target MSC had actually already passed. This would result in the client - (e.g. the Chromium browser) hanging when moving its window between CRTCs. - - In order to fix this, introduce msc_is_(equal_or_)after helper functions - which take the wraparound into account for comparing two MSC values. - - Signed-off-by: Michel Dänzer - Reviewed-by: Keith Packard - Reviewed-by: Martin Peres - Signed-off-by: Keith Packard - (cherry picked from commit 25eca80265654cfbf8768024e027426fedeb0918) - -commit 9505783c2270b6da13cc5691b94f48ff72d7b625 -Author: Michel Dänzer -Date: Tue Jan 12 15:42:47 2016 +0900 - - glamor: Disable debugging messages other than GL API errors - - According to Nicolai Hähnle, the relevant specification says "All - messages are initially enabled unless their assigned severity is - DEBUG_SEVERITY_LOW", so we need to explicitly disable the messages we - don't want to get. Failing that, we were accidentally logging e.g. - shader stats intended for shader-db. - - Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=93659 - Tested-by: Laurent Carlier - Reviewed-by: Emil Velikov - Signed-off-by: Michel Dänzer - Reviewed-by: Eric Anholt - (cherry picked from commit 1db6de7b6a6ee240eb50a13fe1fa1e135d7cb93b) - -commit 9e45b28e998a4e0aacd1224b5d4f479ee453fdb9 -Author: Dave Airlie -Date: Tue Jan 12 14:19:24 2016 +1000 - - glamor: store old fonts in double width textures. - - There is a problem with some fonts that the height necessary - to store the font is greater than the max texture size, which - causes a fallback to occur. We can avoid this by storing two - macro columns side-by-side in the texture and adjusting - the calculations to suit. - - This fixes - xfd -fn -*-*-*-*-*-*-*-*-*-*-*-*-*-* - falling back here, when it picks - -arabic-newspaper-medium-r-normal--32-246-100-100-p-137-iso10646-1 - - Reviewed-by: Keith Packard - Signed-off-by: Dave Airlie - (cherry picked from commit 8116fd8a760b5935645def1b2c3b155c05927850) - -commit f673c6cffb033286bf4f31fbb64f0863dfbe77f6 -Author: Dave Airlie -Date: Mon Jan 11 17:02:57 2016 +1000 - - glamor: fallback if font is too large for FBO size. - - running xfontsel on haswell here, with a max texture size - of 8kx8k, one font wants 9711 height. This fallsback to - sw in this case. - - A proper solution probably involves using an array texture. - - Reviewed-by: Keith Packard - Signed-off-by: Dave Airlie - (cherry picked from commit 64081d0eacf3e53a029b8e8b63096cc153e98549) - -commit f7da9e4cd8237795cea4c0cf82148bdd18ec0f92 -Author: Adam Jackson -Date: Wed Jan 6 10:03:23 2016 -0500 - - os: Failure to remove a non-existent log file is not an error - - Signed-off-by: Adam Jackson - Reviewed-by: Alan Coopersmith - (cherry picked from commit 6dcb73375e0ce389315d55587623eb84e9d13543) - -commit 4dfb05aaae9dc7a45294f60ebd3ad454a4707966 -Author: Thomas Klausner -Date: Wed Nov 11 13:32:05 2015 +0100 - - Fix build when XSERVER_PLATFORM_BUS is not defined. - - Reviewed-by: Adam Jackson - Signed-off-by: Thomas Klausner - (cherry picked from commit 862cbf4c870c9ed913206c6ef4988bdb470e1c39) - -commit 88f2aa2940b6fb9deea0a1b53d05df02912dc17c -Author: Thomas Klausner -Date: Tue Jan 5 12:51:41 2016 -0500 - - Fix uninitialized variable warnings reported by clang - - v2: Move initializing pos into the first clause of the for statement. We - have to keep this macro equivalent to a plain for statement from the - user's perspective, otherwise callers need to {} things to keep control - flow correct. [ajax] - - Signed-off-by: Thomas Klausner - Acked-by: Michel Dänzer - (cherry picked from commit 63f83d1b7f496d05b409352749cdb6674d71cf80) - -commit 320b169c225fa05d83928bad438c4b15481cea1f -Author: Alan Coopersmith -Date: Fri Jan 1 18:11:14 2016 -0800 - - Use unique logfile names when starting server with -displayfd - - Fixes https://bugs.freedesktop.org/show_bug.cgi?id=93212 - - Previously all X servers started with -displayfd would overwrite - Xorg.0.log - now a temporary name of Xorg.pid-.log is used - until after -displayfd finds an open display - then it is renamed - to the traditional Xorg..log name. - - Reviewed-by: Adam Jackson - Signed-off-by: Alan Coopersmith - (cherry picked from commit edcb6426f20c3be5dd5f50b76a686754aef2f64e) - -commit a32b85bf192bd15e9585e4c13a24407634478b05 -Author: Alan Coopersmith -Date: Fri Jan 1 18:10:08 2016 -0800 - - modesetting should not reference gbm when it's not defined - - Fixes build errors of: - present.c: In function 'ms_do_pageflip': - present.c:410:17: error: 'drmmode_bo' has no member named 'gbm' - new_front_bo.gbm = glamor_gbm_bo_from_pixmap(screen, new_front); - ^ - present.c:412:22: error: 'drmmode_bo' has no member named 'gbm' - if (!new_front_bo.gbm) { - ^ - present.c: In function 'ms_present_check_flip': - present.c:536:36: error: 'drmmode_bo' has no member named 'gbm' - if (drmmode_crtc->rotate_bo.gbm) - ^ - Introduced by commit 13c7d53d - - Reviewed-by: Adam Jackson - Signed-off-by: Alan Coopersmith - (cherry picked from commit fe8562f5316d8c74ca074ad145295c65ddff5fc2) - -commit 4457fd45efef85b567d4a0ac085d252ffe49020d -Author: Siim Põder -Date: Mon Jun 8 22:14:12 2015 +0000 - - vfb: add randr support (v2) - - The motivation for getting this is chrome remote desktop that runs under - Xvfb and wants to use RANDR to adjust screen size according to the - remote desktop client screen size. Apparently there are other use cases - as well, the bug mentions gnome-settings-daemon testing. - - [ajax: massaged commit message] - - Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=26391 - Reviewed-by: Adam Jackson - Signed-off-by: Lambros Lambrou - Signed-off-by: Mike Frysinger - Signed-off-by: Michal Srb - Signed-off-by: Siim Põder - (cherry picked from commit 3d68d1f26709ecb5ce22a9baa0d3d8162574ed6a) - -commit 5a89a6336d6b70781101e6395c276649956b9d80 -Author: Adam Jackson -Date: Tue Dec 8 15:56:17 2015 -0500 - - glxproxy: Silence shadowed-variable warnings - - Reviewed-by: Peter Hutterer - Signed-off-by: Adam Jackson - (cherry picked from commit b5f04a79df8b5aab8b558461261d14721f0b3e41) - -commit c10def69e1d92741ab79eee0b26ae80d143c93fb -Author: Adam Jackson -Date: Tue Dec 8 15:53:35 2015 -0500 - - glxproxy: Silence set-but-unused-variable warnings - - Reviewed-by: Peter Hutterer - Signed-off-by: Adam Jackson - (cherry picked from commit 18729a211a5fdd4f733e44eded754a0e6210b687) - -commit e36834cee865152dee5fbe1e8d480b7010466f75 -Author: Adam Jackson -Date: Tue Dec 8 16:04:44 2015 -0500 - - dmx: Run 'doxygen -u' to upgrade the doxygen config file - - Also change the dot font setting back to the default of Helvetica as - doxygen no longer ships FreeSans. - - Reviewed-by: Peter Hutterer - Signed-off-by: Adam Jackson - (cherry picked from commit bc996fa4e3c06f65eafe0a88ef491dbf01f31422) - -commit bb9bdb213250dbd28a61f91dba2145d20ef5f569 -Author: Adam Jackson -Date: Tue Dec 8 16:00:19 2015 -0500 - - dmx: Silence unused variable warning in dmxcompat - - Reviewed-by: Peter Hutterer - Signed-off-by: Adam Jackson - (cherry picked from commit a55e0bc56fd8f9da8f066dc344af19535dd092ca) - -commit 1f5afbba4513c0e0d2d8827f3bbbbc383fd918f0 -Author: Adam Jackson -Date: Tue Dec 8 15:37:12 2015 -0500 - - dmx: Silence lex/yacc-related config parser warnings - - Reviewed-by: Peter Hutterer - Signed-off-by: Adam Jackson - (cherry picked from commit 2730ccb803c55af74dbdd1bfd982fc23e643554d) - -commit b63a8cc4f24012267b0cb88bc358e68ab3ceb427 -Author: Laércio de Sousa -Date: Thu Dec 3 08:05:59 2015 -0200 - - systemd-logind.c: don't parse VT settings for non-seat0 X servers - - Since non-seat0 X servers no longer touch VTs, I believe these settings - are unnecessary. - - Signed-off-by: Laércio de Sousa - Reviewed-by: Hans de Goede - (cherry picked from commit 718223d27452862eedcf1bee6278eae6040d45ea) - -commit a8b746948db1871c0b28663b99fa839582693087 -Author: Bob Ham -Date: Fri Dec 4 12:30:47 2015 +0000 - - xserver: Fix configure.ac check for libsystemd/-daemon - - The configure script looks for the libsystemd-daemon pkg-config - module. If the configure script finds it, the script will add - libsystemd-daemon to a list of modules which are used to consolidate - CFLAGS and LIBS. - - The check for libsystemd-daemon was altered to fallback to libsystemd - if libsystemd-daemon was not found (libsystemd-daemon was brought into - libsystemd). Unfortunately, the configure script still adds - "libsystemd-daemon" to the list of modules to consolidate, instead of - "libsystemd". With this patch, we set a variable depending on which - pkg-config module is found and add that to the module list instead. - - Changes since v1: - - Rearranged logic so that we do a versioned check for libsystemd - first, then look for libsystemd-daemon. - - Cleaned up the check a bit, only performing the module checks if we - don't have --with-systemd-daemon=no, in a similar style to - --with-dtrace. - - Changed the variable name to LIBSYSTEMD_DAEMON as per feedback. - - Reviewed-by: Adam Jackson - Signed-off-by: Bob Ham - (cherry picked from commit 7c0ba32ddd5f1d5c65279365fa307dec3433caf3) - -commit b564cc9121bade2fee22eb14edd360036b7ba0b9 -Author: Michel Dänzer -Date: Thu Dec 3 17:04:09 2015 +0900 - - prime: Damage full destination rectangle when we start dirty tracking - - This makes sure that the destination pixmap contents will be fully - initialized. Without this, a PRIME output starts out with garbage. - - Signed-off-by: Michel Dänzer - Reviewed-by: Alex Deucher - (cherry picked from commit 530d3e5ca0a02039b04ec6a677bbb4e05b78e5f4) - -commit 00f65597c80d01e1c0759527ed1c72bc5af46c29 -Author: Adam Jackson -Date: Mon Dec 7 17:03:02 2015 -0500 - - x86emu: Squash a warning - - Apologies, should have caught this one when applying the previous x86emu - patch. - - Signed-off-by: Adam Jackson - (cherry picked from commit 2a52c06e235bd79f91851121f53f7c1808fde321) - -commit 4415b0cd6f1ddd75f2dc8b2096a89716baa38405 -Author: Julian Pidancet -Date: Sun Jul 1 18:49:25 2012 +0100 - - x86emu: Correctly handle 0x66 prefix for some instructions - - (Sorry for double posting) - - I repost this patch because I havn't got any replies from maintainers - since I posted the initial patch back in March. - - Some instructions are not emulated correctly by x86emu when they - are prefixed by the 0x66 opcode. - I've identified problems in the emulation of these intructions: ret, - enter, leave, iret and some forms of call. - - Most of the time, the problem is that these instructions should push or - pop 32-bit values to/from the stack, instead of 16bit, when they are - prefixed by the 0x66 special opcode. - - The SeaBIOS project aims to produce a complete legacy BIOS - implementation as well as a VGA option ROM, entirely written in C and - using the GCC compiler. - - In 16bit code produced by the GCC compiler, the 0x66 prefix is used - almost everywhere. This patch is necessary to allow the SeaBIOS VGA - option ROM to function with Xorg when using the vesa driver. - - SeaBIOS currently use postprocessing on the ROM assembly output to - replace the affected instruction with alternative unaffected instructions. - This is obviously not very elegant, and this fix in x86emu would be - more appropriate. - - v2: - Decrement BP instead of EBP in accordance with the Intel Manual - - Assign EIP instead of IP when poping the return address from the - stack in 32-bit operand size mode in ret_far_IMM, ret_far, and iret - - When poping EFLAGS from the stack in iret in 32-bit operand size - mode, apply some mask to preserve Read-only flags. - - v3: - Rebase - - Reviewed-by: Adam Jackson - Signed-off-by: Julian Pidancet - (cherry picked from commit 59b618227ebd024e57720aaaea17596953f5b80e) - -commit cc0cefed4f098ce6e933f2142a4fee93df5f652d -Author: Chris Wilson -Date: Sun Feb 8 09:47:42 2015 +0000 - - present: Do not replace Pixmaps on redirected Window on unflip - - When unflipping, we may find that our flip window has been redirected. - If we replace the redirected Window with the Screen Pixmap we then have - mutliple fullscreen Windows believing that their own the Screen Pixmap - - multiple fullscreen Windows that are being flipped by Clients, and so - continue to flip causing popping between e.g. the compositor and the - game. - - [ajax: Fix up present_execute() hunk to account for changes introduced - in fe07ec19e212a68076560d243a2a935c54589068] - - Signed-off-by: Chris Wilson - Reviewed-by: Michel Dänzer - (cherry picked from commit 72f0724cdc65dc9abbbf70b9feb6cce7c2b9f8a0) - -commit cfeea6382b5aaac0dcf59d88f7735b0703c9929f -Author: Chris Wilson -Date: Sun Feb 8 09:47:41 2015 +0000 - - present: When cancelling a pending synchronous flip, requeue it - - The vblank event request for a synchronous flip is scheduled for the - vblank before the target flip msc (so that the flip itself appears at - the right frame). If we cancel that flip and so wish to schedule a - copy instead, that copy needs to be postponed by a frame in order for it - be performed at the requested time. - - Signed-off-by: Chris Wilson - Reviewed-by: Michel Dänzer - (cherry picked from commit 180b09912c0d2c4a43b5a08678bcad4b818924c7) - -commit 4d48ceb8a15fcf521e8be3dba2756b69e54f20cc -Author: Chris Wilson -Date: Sun Feb 8 09:47:40 2015 +0000 - - present: Requery pending flips with the right sync_flip mode - - When verifying whether a pending flip is still valid, we need to pass - down the orignal sync_flip mode (e.g. if the driver only supports sync - flips, verifying a async flip will falsely fail). - - Signed-off-by: Chris Wilson - Reviewed-by: Michel Dänzer - (cherry picked from commit b2d55338f6b8f43ebcb49994abad123a797248cf) - -commit 54c74aa952ac7eecaeeb3f3cba6d2fe8a98cf450 -Author: Dave Airlie -Date: Mon Nov 16 09:05:27 2015 +1000 - - modesetting: create entities for pci and old probe. (v2) - - This moves the code from the platform case into - a common function, and calls that from the - other two. - - v2: Emil convinced me we don't need to lookup pEnt - here, so let's not bother. - - Reported-by: Mark Kettenis - Reviewed-by: Mark Kettenis - Signed-off-by: Dave Airlie - (cherry picked from commit 548a3d5fd69bb059bbaf26ededdc94c212712cd7) - -commit d94118fa1b75ea773857b7bbeda96ac181feb994 -Author: Dave Airlie -Date: Mon Nov 16 09:05:26 2015 +1000 - - modesetting: drop platform_dev pointer. - - This isn't used anywhere, so no point storing it until we need it. - - Reviewed-by: Mark Kettenis - Signed-off-by: Dave Airlie - (cherry picked from commit 771016f0705909c908917b4ccaeafc950ba93c05) - -commit 067c4dd5ce06c2f17d54c3b89e23efbc0822a194 -Author: Arkadiusz Miśkiewicz -Date: Mon Nov 16 11:06:57 2015 +0100 - - Xorg.wrap: activate libdrm based detection for KMS drivers - - Xorg.wrap includes code guarded with WITH_LIBDRM for detecting KMS drivers. - Unfortunately it is never activated since code missed to include file - which defines WITH_LIBDRM. - - Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=92894 - Signed-off-by: Arkadiusz Miśkiewicz - Reviewed-by: Michel Dänzer - Signed-off-by: Hans de Goede - (cherry picked from commit 19b0249a5e07b9fc008e5d8709d7e489874415de) - -commit 8f41c32bb5f3b962d4db105f96d47d8b74f5af79 -Author: Olivier Fourdan -Date: Tue Dec 1 17:16:03 2015 +0100 - - xwayland: Update screen size on output removal - - When unplugging an output, it's still listed in xrandr and the size - of the root window still includes the removed output. - - The RR output should be destroyed when its Wayland counterpart is - destroyed and the screen dimensions must be updated in both the done - and the destroy handlers. - - Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=92914 - Signed-off-by: Olivier Fourdan - Reviewed-by: Marek Chalupa - (cherry picked from commit ab9837cc6a11f46b9df780f131b69de3822c3dd9) - -commit 2b356cb50139601dcd5393646aad30552fa778a1 -Author: Jonas Ådahl -Date: Wed Oct 7 12:01:53 2015 +0800 - - xwayland: Always update the wl_pointer cursor on pointer focus - - In Wayland, a client (in this case XWayland) should set the cursor - surface when it receives pointer focus. Not doing this will leave the - curser at whatever it was previously. - - When running on XWayland, the X server will not be the entity that - controls what actual pointer cursor is displayed, and it wont be notified - about the pointer cursor changes done by the Wayland compositor. This - causes X11 clients running via XWayland to end up with incorrect pointer - cursors because the X server believes that, if the cursor was previously - set to the cursor C, if we receive Wayland pointer focus over window W - which also has the pointer cursor C, we do not need to update it. This - will cause us to end up with the wrong cursor if cursor C was not the - same one that was already set by the Wayland compositor. - - This patch works around this by, when receiving pointer focus, getting - the private mipointer struct changing the "current sprite" pointer to - an invalid cursor in order to trigger the update path next time a cursor - is displayed by dix. - - Reviewed-by: Adam Jackson - Signed-off-by: Jonas Ådahl - (cherry picked from commit 07941a50a547f2ca094e242588298695f48903ed) - -commit 74354c4b0086ea1a952b5591846803719e3e3e91 -Author: Olivier Fourdan -Date: Mon Nov 23 08:51:48 2015 +0100 - - xwayland: Do not set root clip when rootless - - Otherwise the server may try to draw onto the root window when closing - down, but when running rootless the root window has no storage thus - causing a memory corruption. - - Thanks to Adam Jackson for helping tracking this down! - - Reviewed-by: Adam Jackson - Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=93045 - Signed-off-by: Olivier Fourdan - Tested-by: Marek Chalupa - (cherry picked from commit 51a4399b94f9adfac5f7718d4cbf73f793dcca56) - -commit 0a500c3cc74e39a01be24053e152dd52469dd908 -Author: Marek Chalupa -Date: Fri Nov 27 14:27:46 2015 +0100 - - xwayland: check if creating xwl_output succeeded - - check return values of RR.*Create calls - - v2. do not bail out if we don't have any output - - Signed-off-by: Marek Chalupa - Reviewed-by: Olivier Fourdan - (cherry picked from commit 5b2ca3413203210d112a08a4e20d14382abae437) - -commit c2e6eddb1bfc5106596729bc3f0a6a381f5be9f4 -Author: Marek Chalupa -Date: Fri Nov 27 14:59:27 2015 +0100 - - xwayland: fix memory leaks on error paths in xwl_realize_window - - don't leak memory when realizing window fails - - v2. take care of all memory allocation and return values, - not just one leak - - Signed-off-by: Marek Chalupa - Reviewed-by: Olivier Fourdan - (cherry picked from commit 646ebea456b4c5251ae997eab8d9b971f97de836) - -commit 68168c764662c0ce4ac8193d293b8befd934f666 -Author: Egbert Eich -Date: Tue Nov 24 17:37:36 2015 +0100 - - kdrive/UnregisterFd: Fix off by one - - The number of FDs has been decremented already, therefore the - number contained the index of the top one that is to me moved down. - - This problem was introduced by: - commit 1110b71e360195aab040d835b54540ab558638c5 - Author: Chris Clayton - - kdrive: fix build error on gcc 4.8 for out-of-bounds array access - - The reason for the warning was likely a confused compiler. - Hoping to reduce the confusion by moving the decrement behind the end - if the copy loop. - - Signed-off-by: Egbert Eich - Reviewed-by: Peter Hutterer - (cherry picked from commit 44d0fd435a4eaf45e252b4f00409152a6d599dfc) - -commit 84fbfa8a7d40553c5129a667b532ea3a8b63bfb3 -Author: Adam Jackson -Date: Thu Nov 19 12:21:08 2015 -0500 - - xnest: Fix needless build dependency on xcb-util-keysyms - - This was added in: - - commit 43014795087a0a8774dd9687f5967329b15f06a2 - Author: Olivier Fourdan - Date: Mon Jan 5 16:44:22 2015 +0100 - - Synchronize capslock in Xnest and Xephyr - - Which is fine if you're building both, but if you don't happen to have - xcb-util-keysyms' headers installed Xnest will configure as enabled but - fail to build. - - Fortunately has a corresponding #define, so use that instead. - - Signed-off-by: Adam Jackson - Reviewed-by: Olivier Fourdan - (cherry picked from commit 4affa75a90d2455c81087b930126ad7adfd019f0) - -commit 115913d9ec8f7961e9a5789972aeb33da9cfd1e4 -Author: Peter Hutterer -Date: Mon Nov 23 07:59:24 2015 +1000 - - xfree86: fix minor memory leak - - xf86*StrOption returns a strdup - - Signed-off-by: Peter Hutterer - Reviewed-by: Hans de Goede - (cherry picked from commit 71ba82690158f46d50a455e69a83ee0d685bb274) - -commit c9bd60790c6636a7911ca479e0f9439bc118d74c -Author: Eric Anholt -Date: Sun Oct 18 19:16:20 2015 -0700 - - glamor: No need to glFlush before destroying a pixmap. - - I assume this was a workaround for an old, broken, closed driver. The - driver doesn't get to throw away rendering just because the rendering - context's shared-across-processes render target is getting freed from - the local address space. If the rendering isn't to a shared render - target, then we *do* want to throw away the rendering to it. - - Signed-off-by: Eric Anholt - Reviewed-by: Michel Dänzer - (cherry picked from commit 98a1993536add730b7ec29a9e37f62b1cd70ad31) - -commit 9379c6a3f6109fe2cca3bf2dc45dc92fcf1e302f -Author: Eric Anholt -Date: Thu Nov 5 16:35:56 2015 -0800 - - glamor: Fix segfault in fallback picture uploading. - - If the source/mask pixmap is a pixmap that doesn't have an FBO - attached, and it doesn't match the Render operation's size, then we'll - composite it to a CPU temporary (not sure why). We would take the - PictFormatShort from the source Picture, make a pixmap of that depth, - and try to look up the PictFormat description from the depth and the - PictFormatShort. However, the screen's PictFormats are only attached - to the screen's visuals' depths. So, with an x2r10g10b10 short format - (depth 30), we wouldn't find the screen's PictFormat for it - (associated with depth 32). - - Instead of trying to look up from the screen, just use the pFormat - that came from our source picture. The only time we need to look up a - PictFormat when we're doing non-shader gradients, which we put in - a8r8g8b8. - - Signed-off-by: Eric Anholt - Reviewed-by: Michel Dänzer - (cherry picked from commit 9a5972801f7789833062e5711e77483b643eef92) - -commit 6bb58ea2a9c1931f4e04075f19ed22bb50b1d709 -Author: Eric Anholt -Date: Thu Nov 5 16:03:14 2015 -0800 - - glamor: Fix assert failures when fallback picture upload alloc fails. - - If the glTexImage (or glTexSubImage) out-of-memories, error out - cleanly so that we can fall back to software. - - Signed-off-by: Eric Anholt - Reviewed-by: Michel Dänzer - (cherry picked from commit e7aa4d3c7420d45cca2b7e1e69e22cebc64d5b74) - -commit ade2ed4f8bb66127ad46df22b12d201dad318c3d -Author: Eric Anholt -Date: Thu Nov 5 15:13:55 2015 -0800 - - glamor: Fix rendering when core font texture allocation fails. - - Signed-off-by: Eric Anholt - Reviewed-by: Michel Dänzer - (cherry picked from commit ff8ef975df9cd99ec6f0b8b8047445091bf35ef0) - -commit 90fe7266ab67aa3e45a0a68c71987c70c0496504 -Author: Eric Anholt -Date: Thu Nov 5 15:05:11 2015 -0800 - - glamor: Fix crashes when the glyph atlas allocation fails. - - We already have a fallback path, so we just need to jump to it when we - hit the failure. - - Signed-off-by: Eric Anholt - Reviewed-by: Michel Dänzer - (cherry picked from commit a6b05d10da2fe476f46e6dc4ad8a603964735905) - -commit 701b4347aca1a9b81492b05cf3ae35fe0499325c -Author: Eric Anholt -Date: Thu Nov 5 14:47:42 2015 -0800 - - glamor: Handle GL_OUT_OF_MEMORY when allocating texture images. - - The spec allows general undefined behavior when GL_OOM is thrown. But - if the driver happens to throw the error at this point, it probably - means the pixmap was just too big, so we should delete that texture - and have this pixmap fall back to software. - - Signed-off-by: Eric Anholt - Reviewed-by: Michel Dänzer - (cherry picked from commit de959ec939b262cb1cb4c0b6146826e3092843f9) - -commit 73799de77f551c22308af1e7ef0b2f83ae49b0e0 -Author: Eric Anholt -Date: Mon Nov 9 15:47:05 2015 -0800 - - glamor: Avoid GL errors from mapping with size == 0. - - GL 4.5 / GLES 3.0 require throwing GL errors at map time, and Mesa - before that might throw errors accidentally if a malloc(0) call was - made to return the mapping. - - Signed-off-by: Eric Anholt - Reviewed-by: Rob Clark - (cherry picked from commit 74be466d40080545117628c376cb59b696db33bc) - -commit 7727e433459675f80cb38857a6c82ebb29393072 -Author: Michael Stapelberg -Date: Tue Nov 3 03:51:48 2015 -0800 - - Also dump passive grabs on XF86LogGrabInfo - - Signed-off-by: Michael Stapelberg - Reviewed-by: Peter Hutterer - Signed-off-by: Peter Hutterer - (cherry picked from commit a6cddb8c04ddc3c48aae3f3611ad9f336fecb09d) - commit 43fb888bd01cf9d3d277e77a52a3d0c93ccff8bd Author: Adam Jackson Date: Mon Nov 9 16:00:26 2015 -0500 --- xorg-server-1.18.2.orig/config/dbus-api +++ xorg-server-1.18.2/config/dbus-api @@ -0,0 +1,40 @@ +D-BUS Configuration API v2 +---------------------------- + +The X server will register the bus name org.x.config.displayN, and the +object /org/x/config/N, where N is the display number. + +Currently only hotplugging of input devices is supported. + +org.x.config.input: + org.x.config.input.version: + Returns one unsigned int32, which is the API version. + + org.x.config.input.add: + Takes an argument of key/value option pairs in arrays, e.g.: + [ss][ss][ss][ss] + is the signature for four options. These options will be passed + to the input driver as with any others. + Option names beginning with _ are not allowed; they are reserved + for internal use. + + Returns a number of signed int32s. Positive integers are the + device IDs of new devices; negative numbers are X error codes, + as defined in X.h. BadMatch will be returned if the options + given do not match any device. BadValue is returned for a malformed + message. (Example: 8 is new device ID 8; -8 is BadMatch.) + + Notably, BadAlloc is never returned: the server internally signals + to D-BUS that the attempt failed for lack of memory. + + org.x.config.input.remove: + Takes one uint32 argument, which is the device ID to remove, i.e.: + u + is the signature. + + Returns one signed int32 which represents an X status as defined in + X.h. See org.x.config.input.add. Error codes are negative numbers. + + org.x.config.input.listDevices: + Lists the currently active devices. No argument. + Return value is sequence of [ ] [ ] ..., i.e. [us]. --- xorg-server-1.18.2.orig/damageext/damageext.h +++ xorg-server-1.18.2/damageext/damageext.h @@ -0,0 +1,33 @@ +/* + * Copyright © 2002 Keith Packard + * + * Permission to use, copy, modify, distribute, and sell this software and its + * documentation for any purpose is hereby granted without fee, provided that + * the above copyright notice appear in all copies and that both that + * copyright notice and this permission notice appear in supporting + * documentation, and that the name of Keith Packard not be used in + * advertising or publicity pertaining to distribution of the software without + * specific, written prior permission. Keith Packard makes no + * representations about the suitability of this software for any purpose. It + * is provided "as is" without express or implied warranty. + * + * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, + * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO + * EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR + * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, + * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER + * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR + * PERFORMANCE OF THIS SOFTWARE. + */ + +#ifdef HAVE_DIX_CONFIG_H +#include +#endif + +#ifndef _DAMAGEEXT_H_ +#define _DAMAGEEXT_H_ + +void + DamageExtensionInit(void); + +#endif /* _DAMAGEEXT_H_ */ --- xorg-server-1.18.2.orig/debian/README.source +++ xorg-server-1.18.2/debian/README.source @@ -0,0 +1,66 @@ +------------------------------------------------------ +Quick Guide To Patching This Package For The Impatient +------------------------------------------------------ + +1. Make sure you have quilt installed +2. Unpack the package as usual with "dpkg-source -x" +3. Run the "patch" target in debian/rules +4. Create a new patch with "quilt new" (see quilt(1)) +5. Edit all the files you want to include in the patch with "quilt edit" + (see quilt(1)). +6. Write the patch with "quilt refresh" (see quilt(1)) +7. Run the "clean" target in debian/rules + +Alternatively, instead of using quilt directly, you can drop the patch in to +debian/patches and add the name of the patch to debian/patches/series. + +------------------------------------ +Guide To The X Strike Force Packages +------------------------------------ + +The X Strike Force team maintains X packages in git repositories on +git.debian.org in the pkg-xorg subdirectory. Most upstream packages +are actually maintained in git repositories as well, so they often +just need to be pulled into git.debian.org in a "upstream-*" branch. +Otherwise, the upstream sources are manually installed in the Debian +git repository. + +The .orig.tar.gz upstream source file could be generated using this +"upstream-*" branch in the Debian git repository but it is actually +copied from upstream tarballs directly. + +Due to X.org being highly modular, packaging all X.org applications +as their own independent packages would have created too many Debian +packages. For this reason, some X.org applications have been grouped +into larger packages: xutils, xutils-dev, x11-apps, x11-session-utils, +x11-utils, x11-xfs-utils, x11-xkb-utils, x11-xserver-utils. +Most packages, including the X.org server itself and all libraries +and drivers are, however maintained independently. + +The Debian packaging is added by creating the "debian-*" git branch +which contains the aforementioned "upstream-*" branch plus the debian/ +repository files. +When a patch has to be applied to the Debian package, two solutions +are involved: +* If the patch is available in one of the upstream branches, it + may be git'cherry-picked into the Debian repository. In this + case, it appears directly in the .diff.gz. +* Otherwise, the patch is added to debian/patches/ which is managed + with quilt as documented in /usr/share/doc/quilt/README.source. + +---------------------------------------------- +Updating xorg-server to a new upstream release +---------------------------------------------- + +* The abibumpcheck target helps us notice any ABI bump: + - A major ABI bump means drivers have to be rebuilt. + - A minor ABI bump means the version in serverminver has to be + bumped. + Reference documentation about dependencies is available at: + http://pkg-xorg.alioth.debian.org/reference/dependencies.html +* We have to keep track of the SDK_REQUIRED_MODULES variable in + configure.ac. It is used to determine xorg-server.pc's dependencies + so xserver-xorg-dev's dependencies have to be adjusted when this + variable changes. This variable is set to a list of modules, but is + updated a few times. It's probably a good idea to use: + git grep SDK_REQUIRED_MODULES= -- configure.ac --- xorg-server-1.18.2.orig/debian/changelog +++ xorg-server-1.18.2/debian/changelog @@ -0,0 +1,3380 @@ +xorg-server (2:1.18.2-3) unstable; urgency=medium + + * regression fixes part2: + - replace revert-eb5108b870.diff with patch from upstream + - make-sure-hw-cursor-is-hidden-when-it-should.diff: Don't show an + extra cursor in some cases + * os-treat-ssh-as-a-non-local-client.diff: Allow remote clients to work + with DRI3. + + -- Timo Aaltonen Tue, 29 Mar 2016 10:38:47 +0300 + +xorg-server (2:1.18.2-2) unstable; urgency=medium + + * regression fixes/workarounds: + vidmode-reduce-verbosity-of-getmodeline.diff (Closes: #818634) + glamor-swizzle-red-to-0-for-alpha-textures.diff + revert-eb5108b870.diff (Closes: #818172) + + -- Timo Aaltonen Tue, 22 Mar 2016 09:47:25 +0200 + +xorg-server (2:1.18.2-1) unstable; urgency=medium + + * New upstream release. (Closes: #814982) + + -- Timo Aaltonen Sat, 12 Mar 2016 08:49:55 +0200 + +xorg-server (2:1.18.1-1) unstable; urgency=medium + + * New upstream release. + * add_support_new_libsystemd.patch, + glamor-disable-debugging-msgs.diff, + update-intel-pciids.diff: + - dropped, upstream + + -- Timo Aaltonen Tue, 09 Feb 2016 10:27:18 +0200 + +xorg-server (2:1.18.0-3) unstable; urgency=medium + + * update-intel-pciids.diff: Sync dri2 mapping ids for intel. + * glamor-disable-debugging-msgs.diff: Make glamor less noisy with + recent mesa. + + -- Timo Aaltonen Wed, 27 Jan 2016 16:41:59 +0200 + +xorg-server (2:1.18.0-2) unstable; urgency=medium + + [ Laurent Bigonville ] + * Enable systemd socket activation support (Closes: #803254) + + [ Emilio Pozuelo Monfort ] + * Let xserver-xorg-dev depend on libxfont-dev, as dixfont.h needs + fontutil.h. + + -- Timo Aaltonen Tue, 26 Jan 2016 16:25:33 +0200 + +xorg-server (2:1.18.0-1) experimental; urgency=medium + + * New upstream release. + - drop xext-fix-udeb-build.diff, merged upstream + * Extend libgbm-dev build-dep to kfreebsd-any as well as linux-any. + + -- Julien Cristau Tue, 10 Nov 2015 22:40:43 +0100 + +xorg-server (2:1.17.99.902-1) experimental; urgency=medium + + * Team upload. + * New upstream release candidate. + * Bump x11proto-core and x11proto-randr dependencies per configure.ac. + * Stop passing deleted options to configure. + * Bump serverminver (video ABI 20.0, input ABI 22.1). + + -- Julien Cristau Thu, 29 Oct 2015 09:58:55 +0000 + +xorg-server (2:1.17.3-2) unstable; urgency=medium + + * Finalize xserver-xorg-core.NEWS. Thanks, Michael Biebl! + + -- Julien Cristau Tue, 27 Oct 2015 22:55:25 +0000 + +xorg-server (2:1.17.3-1) unstable; urgency=medium + + [ Julien Cristau ] + * New upstream release + - mi: fix typo in warning about overflowing queue (closes: #726041) + * Refresh 02_kbsd-input-devd.diff and 03_static-nettle.diff. + * Replace xorg-wrapper-envp.diff with a cherry-pick from master. + * New patch xext-fix-udeb-build.diff to fix build regression in 1.17.3. + * Add NEWS file for xserver-xorg-core with info about the -legacy split + (closes: #801487). + * Recommend libpam-systemd (closes: #802544, #802618, #802327, #802566, + probably others) + + [ Andreas Boll ] + * Use the correct repository for the Vcs-Git field (Closes: #801340). + Thanks, Vagrant Cascadian. + * Document new location for non-root Xorg log in the NEWS file. + + [ Samuel Thibault ] + * Fix xorg-wrapper on hurd (cherry-picked from master). + + -- Julien Cristau Tue, 27 Oct 2015 13:55:55 +0000 + +xorg-server (2:1.17.2-3) unstable; urgency=medium + + * Team upload. + [ Laurent Bigonville ] + * Move Xorg.wrap.1 man page from the xserver-xorg-core to + xserver-xorg-legacy package (Closes: #797661) + * Add a Breaks against systemd (<< 226-4~), before that version logind was + restarted on upgrade which makes the X server crash (See #798097) + * Bump Standards-Version to 3.9.6 (no further changes) + + [ Andreas Boll ] + * Update Vcs-* fields. + * Add upstream url. + + [ Julien Cristau ] + * Only reset environment in the Xorg wrapper if we didn't drop privileges. + + -- Laurent Bigonville Tue, 06 Oct 2015 09:06:22 +0200 + +xorg-server (2:1.17.2-2) experimental; urgency=medium + + [ Laurent Bigonville ] + * Enable logind support for the main build on Linux. + * Build and ship the setuid root wrapper from upstream, replacing + xserver-xorg's. + + [ Julien Cristau ] + * Take over x11-common's handling of the X wrapper; ship the wrapper in a + new xserver-xorg-legacy package. + * Patch the wrapper to reset Xorg's environment. I don't believe it needs + any variable there, and if that turns out to be wrong we can add a + whitelist or hardcode some values. + + -- Julien Cristau Wed, 19 Aug 2015 11:14:05 +0200 + +xorg-server (2:1.17.2-1.1) unstable; urgency=medium + + * Non-Maintainer Upload. + + [ Sven Joachim ] + * Install the whole usr/share/man/man4 directory into xserver-xorg-core, + fixes FTBFS on hurd where modesetting.4 does not exist (Closes: #794644). + + -- Samuel Thibault Tue, 11 Aug 2015 10:45:35 +0200 + +xorg-server (2:1.17.2-1) unstable; urgency=medium + + [ Sven Joachim ] + * New upstream release. + + symbols: Fix sdksyms.sh to cope with gcc5 (Closes: #778187) + + os/access: fix regression in server interpreted auth (Closes: #784687) + + dix: Fix image byte order on big endian hardware (Closes: #785474) + + int10: Fix error check for pci_device_map_legacy (Closes: #787144) + + modesetting: Include dix-config.h from dumb_bo.c (Closes: #789823) + + unauthorised local client access in XWayland [CVE-2015-3164] + (Closes: #788410) + * Install the modesetting.4 manpage into xserver-xorg-core (Closes: #789646) + * Build xserver-xorg-core-udeb on all architectures again (Closes: #775205) + * Update debian/upstream/signing-key.asc. + + -- Julien Cristau Wed, 01 Jul 2015 18:07:40 +0200 + +xorg-server (2:1.17.1-2) unstable; urgency=medium + + * Disable libdrm support on hurd and in the kfreebsd udeb build, so we don't + try building the modesetting driver without libdrm. We should probably + revisit this later and ship modesetting_drv.so in d-i, but this should do + for now. + + -- Julien Cristau Mon, 04 May 2015 22:04:01 +0200 + +xorg-server (2:1.17.1-1) experimental; urgency=medium + + [ Maarten Lankhorst ] + * New upstream release 1.17.1. + * Enable the modesetting driver from xorg-server. + * Drop upstreamed patches: + - 09_Xserver-man-iglx.diff + * Disable 08_xfree86_fix_ia64_inx_outx.diff, no longer applies. + - Is this patch still needed because it seems to be handled now? + * Bump video abi to 19. + + [ Julien Cristau ] + * Bump debhelper compat level to 9. + * Update debian/copyright from upstream COPYING. + + -- Julien Cristau Sun, 03 May 2015 18:00:32 +0200 + +xorg-server (2:1.16.4-1) unstable; urgency=high + + * New upstream release + + dix: Allow zero-height PutImage requests (closes: #774308) + + os: Fix timer race conditions + + randr: attempt to fix primary on slave output + + config/udev: Respect seat assignments when assigned devices + + dix: make RegionInit legal C++ + + dri2: SourceOffloads may be for DRI3 only + + xkb: Don't swap XkbSetGeometry data in the input buffer + + xkb: Check strings length against request size (CVE-2015-0255) + + -- Julien Cristau Wed, 11 Feb 2015 01:26:07 +0100 + +xorg-server (2:1.16.2.901-1) unstable; urgency=medium + + * New upstream release + + fb: Fix Bresenham algorithms for commonly used small segments + + denial of service due to unchecked malloc in client authentication + [CVE-2014-8091] + + integer overflows calculating memory needs for requests [CVE-2014-8092, + CVE-2014-8093, CVE-2014-8094] + + out of bounds access due to not validating length or offset values in + requests [CVE-2014-8095, CVE-2014-8096, CVE-2014-8097, CVE-2014-8098, + CVE-2014-8099, CVE-2014-8100, CVE-2014-8101, CVE-2014-8102, + CVE-2014-8103] + See http://www.x.org/wiki/Development/Security/Advisory-2014-12-09/ + * Drop 06_Revert-fb-reorder-Bresenham-error-correction-to-avoi.diff, + obsoleted by the upstream fix (closes: #752156) + * 09_Xserver-man-iglx.diff: adjust Xserver man page, we disable indirect glx + contexts by default. + + -- Julien Cristau Tue, 09 Dec 2014 22:04:20 +0100 + +xorg-server (2:1.16.1.901-1) unstable; urgency=medium + + * New upstream release. + + Xext/shm: Detach SHM segment after Pixmap is released + + Fix present_notify to return right away when querying current or past msc + + Fix present_pixmap when using present_notify_msc + + xkb: ignore floating slave devices when updating from master + + fb: Fix invalid bpp for 24bit depth window + + -- Julien Cristau Mon, 03 Nov 2014 21:36:14 +0100 + +xorg-server (2:1.16.1-1) unstable; urgency=medium + + * Add my key to debian/upstream/signing-key.asc. + * New upstream release. + * Update help text since -iglx is now the default (cherry-pick from master) + + -- Julien Cristau Mon, 22 Sep 2014 22:12:20 +0200 + +xorg-server (2:1.16.0.901-1) unstable; urgency=medium + + * New upstream release + + glx/present: Only send GLX_BufferSwapComplete for PresentCompleteKindPixmap (closes: #761393) + * glx: Disable indirect GLX contexts by default (cherry-pick from master) + + -- Julien Cristau Tue, 16 Sep 2014 15:44:55 +0200 + +xorg-server (2:1.16.0-2) unstable; urgency=medium + + * xserver-xorg-dev: /usr/share/xserver-xorg/configure_flags.mk + Provide the flags how the xserver was configured (closes: #757246). Based + on Ubuntu patch by Matthias Klose. Thanks, Yaroslav Halchenko! + + -- Julien Cristau Sun, 31 Aug 2014 11:58:36 -0700 + +xorg-server (2:1.16.0-1) unstable; urgency=medium + + * New upstream release + + Revert "dix: fix up coordinate scaling when external monitors are + present" (closes: #754822) + + -- Julien Cristau Fri, 18 Jul 2014 00:17:11 +0200 + +xorg-server (2:1.15.99.904-1) unstable; urgency=medium + + * New upstream release candidate. + * Make xserver-common Multi-Arch: foreign (closes: #693922) + * Add debian/upstream/signing-key.asc, and add pgpsigurlmangle option to + debian/watch, to allow uscan to verify tarball signatures. + * Upload to unstable. + + -- Julien Cristau Tue, 08 Jul 2014 15:22:20 +0200 + +xorg-server (2:1.15.99.903-3) experimental; urgency=medium + + * Set shared memory dir to /dev/shm (closes: #747894). + * Disable dri3 on kfreebsd again to fix FTBFS. + + -- Julien Cristau Tue, 10 Jun 2014 21:50:06 +0200 + +xorg-server (2:1.15.99.903-2) experimental; urgency=medium + + * Enable xwayland for the main build on linux (closes: #747950). + + -- Julien Cristau Thu, 05 Jun 2014 21:58:45 +0200 + +xorg-server (2:1.15.99.903-1) experimental; urgency=medium + + * New upstream release candidate + - reverted quirk for "Evoluent VerticalMouse 3" (closes: #739537) + - Xi: block SIGIOs while copying device classes around (closes: #744303) + - fix FTBFS on arm + - add support for mips64 (closes: #725801) + * Enable dri3 on kfreebsd, now xtrans 1.3.3 supports fd passing. + * Enable glamor. + * Don't run tests in parallel. + * Bump video ABI and serverminver. + * Explicitly disable xwayland. + + -- Julien Cristau Thu, 05 Jun 2014 20:14:56 +0200 + +xorg-server (2:1.15.99.902-1) experimental; urgency=medium + + * New upstream snapshot. + + fix Xephyr -screen (closes: #742028) + * Refresh patches. + * Bump video ABI to 17, input ABI to 21. + * Bump xtrans requirement to 1.3.3. + * Bump xproto and fontsproto requirements. + + -- Julien Cristau Tue, 15 Apr 2014 08:35:26 +0200 + +xorg-server (2:1.15.0.901-1) unstable; urgency=medium + + [ Robert Millan ] + * Add devd input backend for kFreeBSD, and use it instead of hal (closes: + #736765, #710196, #683833) + + [ Julien Cristau ] + * New upstream release + + -- Julien Cristau Mon, 31 Mar 2014 12:19:57 +0200 + +xorg-server (2:1.15.0-2) unstable; urgency=medium + + [ Julien Cristau ] + * Bump debhelper compat level to 7. + * Upload to unstable. + + [ Yaroslav Halchenko ] + * Adding xorg-server-source binary package to provide a tarball with + original (patched, autoreconfed) sources of the xserver (Closes: + #730552) + + -- Julien Cristau Thu, 06 Feb 2014 16:14:15 +0100 + +xorg-server (2:1.15.0-1) experimental; urgency=low + + * New upstream release. + + -- Maarten Lankhorst Mon, 06 Jan 2014 11:00:39 +0100 + +xorg-server (2:1.14.99.904-2) experimental; urgency=medium + + * Pass VERBOSE=1 to make check to make debugging test failures possible. + * Disable dri3 on kfreebsd. xtrans doesn't enable fd passing there yet. + + -- Julien Cristau Sat, 14 Dec 2013 18:16:17 +0100 + +xorg-server (2:1.14.99.904-1) experimental; urgency=low + + [ Julien Cristau ] + * New upstream release candidate. + * Update (build-)dependencies: + - bump x11proto-xext-dev, x11proto-gl-dev, xtrans-dev, libgl1-mesa-dev + - add x11proto-present-dev, x11proto-dri3-dev, libxshmfence-dev + * Enable dri3 (on !hurd) and present extensions. + * Point to http://www.debian.org/support instead of the uploader's email + address in the Xorg log. + + [ Maarten Lankhorst ] + * Disable xorg-server's linux acpi and apm support. Can only cause bugs. + + -- Julien Cristau Thu, 12 Dec 2013 12:11:14 +0100 + +xorg-server (2:1.14.99.3-1) experimental; urgency=low + + * New upstream snapshot. + * Drop patches applied upstream: + - 02_improve-posix-saved-ids-check.diff + - 04_hashtabletest-s390x.diff + - 10_Include-missing-selection-h.diff + - os-move-arpa-inet.h-for-any-win32-system.patch + - xfree86-hurd-include-hurd.h.patch + * Update build-deps: + - bump libx11-dev to 2:1.6 for _XEatDataWords + - require xcb bits for Xephyr + - xserver-xorg-dev depends on x11proto-xf86bigfont-dev + * Bump ABI versions (should have been done upstream, but hasn't yet). + * Stop building Xfbdev. + * Reduce noise from dh_install --list-missing by deleting some files from the + udeb build after make install. + * Run abibumpcheck on build instead of clean so it's done on a patched tree. + * Remove Drew and Cyril from Uploaders. + + -- Julien Cristau Mon, 21 Oct 2013 23:46:34 +0200 + +xorg-server (2:1.14.5-1) unstable; urgency=low + + * New upstream release. + + -- Maarten Lankhorst Fri, 13 Dec 2013 11:10:46 +0100 + +xorg-server (2:1.14.4-1) unstable; urgency=low + + * New upstream release. + * Drop upstreamed patches. + - 02_improve-posix-saved-ids-check.diff + - 04_hashtabletest-s390x.diff + - 10_Include-missing-selection-h.diff + + -- Maarten Lankhorst Wed, 04 Dec 2013 13:09:36 +0100 + +xorg-server (2:1.14.3-5) unstable; urgency=low + + * Cherry-pick a upstream commit to fix mesa-10 driver loading. + + -- Maarten Lankhorst Mon, 25 Nov 2013 14:52:54 +0100 + +xorg-server (2:1.14.3-4) unstable; urgency=high + + [ Timo Aaltonen ] + * rules: Drop defoma support from the font path. (Closes: #689233, + LP: #986061) + + [ Julien Cristau ] + * Avoid use-after-free in dix/dixfonts.c: doImageText(). Addresses + CVE-2013-4396. + + -- Julien Cristau Sat, 05 Oct 2013 15:57:55 +0200 + +xorg-server (2:1.14.3-3) unstable; urgency=low + + * Upload to unstable. + + -- Julien Cristau Sun, 22 Sep 2013 16:32:19 +0200 + +xorg-server (2:1.14.3-2) experimental; urgency=low + + * Delete test-driver on clean. + * Add a couple patches to fix FTBFS on hurd (closes: #720736). Thanks, Pino + Toscano! + + -- Julien Cristau Fri, 20 Sep 2013 00:21:41 +0200 + +xorg-server (2:1.14.3-1) experimental; urgency=low + + [ Julien Cristau ] + * Remove the Replaces: xdmx from xdmx-tools, that was before lenny. That + change was done in the 1.10.x timeframe and then lost when moving to + 1.11.x. + + [ Michele Cane ] + * New upstream release. + + -- Julien Cristau Sun, 15 Sep 2013 23:57:26 +0200 + +xorg-server (2:1.14.2.901-2) experimental; urgency=low + + * Use libbsd-overlay to get missing declarations on kfreebsd and fix FTBFS. + Require dpkg-dev 1.16.1. + * Also improve POSIX_SAVED_IDS check to work on kbsd. + * Link against libnettle.a, to unbreak the udeb (there's no libnettle udeb). + * Fix a test failure on 64bit big-endian (s390x, ppc64, sparc64). + + -- Julien Cristau Sat, 03 Aug 2013 18:17:30 +0200 + +xorg-server (2:1.14.2.901-1) experimental; urgency=low + + * New upstream release + + [ Maarten Lankhorst ] + * Bump minimum required abi, randr, dri2 and gl protos. + * Remove upstreamed patches. + - 02_Add-libnettle-as-option-for-sha1.diff + - 04_int10-fix-pci_device_read_rom-usage.diff + - 07_Revert-kinput-allocate-enough-space-for-null-charact.diff + * Bump x11proto-input-dev and libpixman-1-dev minimum versions. + + [ Timo Aaltonen ] + * Refresh 02_Add-libnettle-as-option-for-sha1.diff. + * Remove 03_fix-panning.diff, upstream + * Refresh 04_int10-fix-pci_device_read_rom-usage.diff. + * Drop 09_EXA-Track...diff, upstream. + * control: Mark xvfb as M-A: foreign. + * control: Bump inputproto build-dep to 2.3. + + [ Robert Hooker ] + * Update to a newer git snapshot, 7fe5e6dfa5c1e71 + * Bump input ABI version in serverminver + * Bump libxi-dev build requirement to 2:1.6.99.1 + + [ Julien Cristau ] + * Merge sid branch up to 2:1.12.4-6.1. + * Drop old --disable-builddocs, --disable-xcalibrate configure options from + d/rules. + * Make build-deps match xserver-xorg-dev dependencies and configure checks. + + -- Julien Cristau Sat, 27 Jul 2013 13:18:28 +0200 + +xorg-server (2:1.12.4-6.2) unstable; urgency=low + + * Non-maintainer upload. + * Cherry-pick Julien Cristau’s commits from debian-experimental: + Use libbsd-overlay to get missing declarations on kfreebsd and fix FTBFS. + 02_improve-posix-saved-ids-check.diff + + -- Michael Stapelberg Thu, 22 Aug 2013 18:34:21 +0200 + +xorg-server (2:1.12.4-6.1) unstable; urgency=low + + * Non-maintainer upload. + * 10_Include-missing-selection-h.diff: Fix FTBFS with GCC 4.8. Include + selection.h in dix/window.c for the missing DeleteWindowFromAnySelections + function prototype. Patch by Gerardo Malazdrewicz (closes: #701372) + + -- Michael Biebl Thu, 25 Jul 2013 19:45:29 +0200 + +xorg-server (2:1.12.4-6) unstable; urgency=low + + * Touch: Fix duplicate TouchBegin selection with virtual devices + (closes: #696272) + * Xi: Don't check for TOUCH_END, it's never set + * Xi: Update the device after delivering the emulated pointer event + (closes: #702662) + * xf86: fix flush input to work with Linux evdev devices. Addresses + CVE-2013-1940. + + -- Julien Cristau Wed, 17 Apr 2013 12:12:30 +0200 + +xorg-server (2:1.12.4-5) unstable; urgency=low + + * dmx: don't include dmx-config.h from xdmxconfig (closes: #495816) + * xfree86: bail on misformed acpi strings (closes: #696110) + * dix: don't allow overriding a grab with a different type of grab + * dix: Set focus field on XI2 crossing events (closes: #699907) + * Link against -lbsd on kfreebsd. This gives us access to getpeereid(), and + makes MIT-SHM work with non-world-accessible segments (closes: #701469). + + -- Julien Cristau Sat, 23 Feb 2013 15:37:44 +0100 + +xorg-server (2:1.12.4-4) unstable; urgency=low + + * Fix memory leak in libnettle sha1 patch. Thanks, Yaakov Selkowitz! + * Cherry-pick from upstream: + - dix: set the device transformation matrix. Avoids cursor jumps in + virtualbox (closes: #694598) + + -- Julien Cristau Thu, 29 Nov 2012 19:27:31 +0100 + +xorg-server (2:1.12.4-3) unstable; urgency=low + + * Replace EXA patch from previous upload with the one actually applied + upstream (closes: #666468). + + -- Julien Cristau Mon, 05 Nov 2012 10:44:58 +0100 + +xorg-server (2:1.12.4-2) unstable; urgency=low + + * Fix Xephyr command line option parsing (closes: #689246). Thanks, Andrzej + Pietrasiewicz! + * Restore {in,out}{b,w,l} on ia64 (closes: #685750). Thanks, Stephan + Schreiber! + * EXA: Fall back earlier and more thoroughly from exaGlyphs (closes: + #666468). Patch by Michel Dänzer stolen from upstream bugzilla. + + -- Julien Cristau Wed, 24 Oct 2012 16:46:48 +0200 + +xorg-server (2:1.12.4-1) unstable; urgency=low + + * New upstream stable release. + * int10: fix pci_device_read_rom usage (closes: #686153). Thanks, Stephan + Schreiber! + * Revert 'Unload submodules' (closes: #686152). Seems to introduce a + regression, let's try that again later. Thanks, Stephan Schreiber! + * Revert "fb: reorder Bresenham error correction to avoid overshoot". Fixes + regression introduced in 1.12.3.902 (fdo#54168, closes: #688908) + * Add conflicts against obsolete evtouch input driver (hopefully closes: + #687268) + + -- Julien Cristau Sun, 30 Sep 2012 12:47:00 +0200 + +xorg-server (2:1.12.3.902-1) unstable; urgency=low + + * New upstream release candidate + + glx: Free DRI2 drawable reference to destroyed GLX drawable + (closes: #681265, #674668) + + dix: make sure the mask is set for emulated scroll events + (closes: #684051) + * 03_fix-panning.diff: disable cursor confinement when panning is enabled + (closes: #643693) + * Video ABI bumped to 12.1, serverminver to 2:1.12.3.901. + + -- Julien Cristau Tue, 21 Aug 2012 21:35:25 +0200 + +xorg-server (2:1.12.3-1) unstable; urgency=low + + * New upstream release. + * Install /var/lib/xkb/README.compiled in xserver-common. + + -- Julien Cristau Wed, 18 Jul 2012 08:36:57 +0200 + +xorg-server (2:1.12.1.902-1) unstable; urgency=medium + + [ Julien Cristau ] + * xvfb-run: kill Xvfb when the script dies. + * xvfb-run: instead of waiting 3 seconds and hoping that's enough for Xvfb + to come up (and waiting 2.9 seconds too many in the general case), tell it + to send us SIGUSR1 when it's ready to accept connections. This reduces + "xvfb-run -- xterm -e true" from ~3.2s to ~0.4s on a quick test. + * xvfb-run: fix xauth handling; setting XAUTHORITY when starting an X server + isn't actually useful, we need to use the -auth command-line parameter + instead. Somehow this seems to have been broken all these years and + nobody noticed... + + [ Cyril Brulebois ] + * New upstream release candidate for the 1.12 stable branch: + - Bring the usual lot of stability fixes. + - Fix segfault on server shutdown (Closes: #671812). + - Refactor logging, fixing a format string vulnerability which could lead + to a denial of service (“only”, thanks to the fortified sources). This + is CVE-2012-2118 (Closes: #673148). + * Bump severity to “medium” for those two important fixes. + + -- Cyril Brulebois Sun, 20 May 2012 10:52:52 +0200 + +xorg-server (2:1.12.1-2) unstable; urgency=low + + * Merge from server-1.12-branch up to 22a1953c4a to get: + - many XI 2.2 fixes. + - “os: make timers signal-safe”; fixing infinite loops with the + synaptics tap handling code. + + -- Cyril Brulebois Mon, 07 May 2012 01:46:16 +0200 + +xorg-server (2:1.12.1-1) unstable; urgency=low + + * New upstream release. + * Upload to unstable. + + -- Cyril Brulebois Tue, 01 May 2012 01:56:32 +0200 + +xorg-server (2:1.12.0.902-1) experimental; urgency=low + + * New upstream release candidate (1.12.1 RC2). + * Refresh patches, yay for automated re-indenting… + + -- Cyril Brulebois Wed, 11 Apr 2012 19:31:09 +0000 + +xorg-server (2:1.12.0-1) experimental; urgency=low + + * New upstream release. + * Bump x11proto-input-dev in Build-Depends and Depends. + + -- Cyril Brulebois Mon, 05 Mar 2012 11:18:41 +0100 + +xorg-server (2:1.11.99.902-1) experimental; urgency=low + + * New upstream release candidate (1.12 RC2): + - Fix FTBFS on ia64 and mips*. + * Bump x11proto-input-dev build-dep. + + -- Cyril Brulebois Thu, 02 Feb 2012 03:15:00 +0100 + +xorg-server (2:1.11.99.901-1) experimental; urgency=low + + * New upstream release candidate (1.12 RC1). + * Bump input ABI and serverminver again. + * Bump x11proto-input-dev build-dep/dep. + + -- Cyril Brulebois Fri, 30 Dec 2011 00:01:35 +0100 + +xorg-server (2:1.11.99.2-1) experimental; urgency=low + + * New upstream snapshot. + * Bump input ABI and serverminver again. + + -- Cyril Brulebois Tue, 20 Dec 2011 11:39:51 +0100 + +xorg-server (2:1.11.99.1-1) experimental; urgency=low + + * New upstream release snapshot (on the way to 1.12). + * Bump libpciaccess-dev, x11proto-input-dev build-deps. + * Update xserver-xorg-dev's dependencies: + - Add libpixman-1-dev. + - Bump x11proto-input-dev. + * Update serverminver with new server and ABI versions. + * Drop patches (merged upstream): + - 07-xfree86-fix-build-with-xv-disabled.diff + - 15-nouveau.diff + + -- Cyril Brulebois Thu, 15 Dec 2011 18:49:10 +0100 + +xorg-server (2:1.11.2.901-1) unstable; urgency=low + + * New upstream release candidate (1.11.3 RC1): + - As usual: Fixes for various crashes and correctness issues. + - In particular: Fix for crash when starting a game (in wine) twice + (Closes: #637448). + - Also: Fix crashes with server regeneration (Closes: #649420). + * Add some lintian overrides: + - xserver-xorg-core: breaks-without-version against virtual packages + is perfectly OK. + * Don't forget to ship xorg.conf.d(5) in xserver-xorg-core. + + -- Cyril Brulebois Tue, 29 Nov 2011 17:04:09 +0100 + +xorg-server (2:1.11.1.902-1) unstable; urgency=low + + * New upstream release candidate (1.11.2 RC2): + - Fixes for various crashes and correctness issues. + + -- Cyril Brulebois Wed, 02 Nov 2011 11:10:03 +0100 + +xorg-server (2:1.11.1.901-2) unstable; urgency=high + + * Merge from upstream to get CVEs fixed: + - Fix CVE-2011-4028: File disclosure vulnerability. + - Fix CVE-2011-4029: File permission change vulnerability. + * Set urgency to “high” accordingly. + + -- Cyril Brulebois Thu, 20 Oct 2011 15:04:53 +0200 + +xorg-server (2:1.11.1.901-1) unstable; urgency=low + + * New upstream release candidate (1.11.2 RC1) + + Disable check of double-aligned in test/input.c on Renesas SH + (closes: #636673) + * Use dpkg-buildflags to enable hardening with recent dpkg. + * Enable PIE with DEB_BUILD_MAINT_OPTIONS, but add -Bsymbolic to LDFLAGS to + reduce performance loss from PIE. + * Pass --disable-silent-rules to configure. + * Drop dh_testroot from clean target. + * Add dummy build-{arch,indep} targets depending on build. + + -- Julien Cristau Sat, 15 Oct 2011 19:05:41 +0200 + +xorg-server (2:1.11.1-1) unstable; urgency=high + + [ Cyril Brulebois ] + * Bump glproto dependency for xserver-xorg-dev (Closes: #639651). + * Set urgency to “high” since there were no issues other than the libwfb + one (see below) in the last 4 weeks. + + [ Julien Cristau ] + * New upstream bugfix release + - belatedly bump extension ABI major + - add missing fbFoo → wfbFoo renames for libwfb.so, fixing issues with the + nvidia driver (closes: #641344) + + -- Cyril Brulebois Sat, 24 Sep 2011 11:23:17 +0200 + +xorg-server (2:1.11.0-1) unstable; urgency=low + + [ Julien Cristau ] + * Make xvfb, xnest, xserver-xephyr and xserver-xfbdev provide the xserver + virtual package again. + + [ Cyril Brulebois ] + * New upstream release: + - Fix assertion failure when calling dixSetPrivate (Closes: #632549). + Thanks, Mohammed Sameer! + - Fix memcpy abuse in the fb layer (Closes: #626682). + + -- Cyril Brulebois Sun, 28 Aug 2011 12:53:06 +0200 + +xorg-server (2:1.10.99.901+git20110731-1) experimental; urgency=low + + [ Cyril Brulebois ] + * New upstream release candidate. + * Bump serverminver, as well as input and video ABI. + * Adapt 15-nouveau.diff to cope with the glxdricommon-ification of + GLX probing. Nouveau users might still see an error (EE) mentioning + the fallback to software rendering. + * Bump pixman build-dep/dep to 0.21.8. + * Bump xutils-dev build-dep for new macros. + * Drop libglib2.0-dev build-dep, no longer needed for unit tests. + * Bump x11proto-fixes-dev build-dep for pointer barriers support. + + [ Julien Cristau ] + * Update to git HEAD. + + DIX: Set backgroundState correctly for root window (Closes: #632134) + * Bump xproto, dri2proto and glproto build-dependencies. + * Merge packaging changes from the 1.10.x branch: + + Bump libgl1-mesa-dri versioned Recommends to 7.10.2-4, to lower the + odds of having a server built against multiarched mesa, installed + along a pre-multiarch mesa. The Breaks in mesa packages take care of + the other way round already. + + And since the server's binNMU managed to migrate to testing way too + early, add a Breaks against pre-multiarch libgl1-mesa-dri and + libgl1-mesa-dri-experimental. + + Bump Standards-Version to 3.9.2 (no changes). + + Add Breaks on drivers abandoned between lenny and squeeze. This helps + apt decide to remove them instead of removing all of X. Thanks, David + Kalnischkies! + * Drop obsolete 20-workaround-36986.diff. + * Fix patch stamp dependency. + + -- Julien Cristau Sun, 31 Jul 2011 22:15:07 +0200 + +xorg-server (2:1.10.2-1) unstable; urgency=low + + * New upstream release. + * Add 20-workaround-36986.diff to avoid test failures on *i386. + * On GNU/kFreeBSD, enable HAL support for the main build, but disable it + for the udeb build, thanks to Robert Millan (Closes: #596586). + + -- Cyril Brulebois Mon, 30 May 2011 11:37:37 +0200 + +xorg-server (2:1.10.1.901-1) experimental; urgency=low + + * New upstream release (1.10.2 rc1): + - Comes with some Xi fixes. + - Comes with many GLX fixes. + + -- Cyril Brulebois Sat, 07 May 2011 13:27:28 +0200 + +xorg-server (2:1.10.1-2) unstable; urgency=low + + * Build xserver-xorg-core-udeb on hurd-i386. Thanks, Samuel Thibault! + * Upload to unstable. + + -- Julien Cristau Thu, 28 Apr 2011 13:28:58 +0200 + +xorg-server (2:1.10.1-1) experimental; urgency=low + + * New upstream release. + + -- Cyril Brulebois Tue, 19 Apr 2011 03:08:08 +0200 + +xorg-server (2:1.10.0.902-1) experimental; urgency=low + + * New upstream release (1.10.1 rc2). + + -- Cyril Brulebois Sat, 09 Apr 2011 04:18:28 +0200 + +xorg-server (2:1.10.0.901-1) experimental; urgency=low + + * New upstream release (1.10.1 rc1). + * Relax build-dep and dep on x11proto-randr-dev since the XRandR 1.4 + bits were finally reverted upstream. + * Remove patch: 16-construct-paths-in-doxygen.conf.diff (merged + upstream). + * Pass --enable-xcsecurity to the main build to restore the XC-SECURITY + extension, thanks to Stefan Fritsch's report (Closes: #599657). + + -- Cyril Brulebois Wed, 30 Mar 2011 02:22:56 +0200 + +xorg-server (2:1.9.99.903-1) experimental; urgency=low + + * New upstream release candidate (1.10 rc3). + * Remove patch: 17-fix-ftbfs-on-sparc.diff (merged upstream). + * Remove patch: 20-update-gpu-pitch.diff (merged upstream). + * Refresh patch: 07-xfree86-fix-build-with-xv-disabled.diff + * Replace patch fixing out-of-tree-build: + - 16-oot-build.diff (dirty local hack). + + 16-construct-paths-in-doxygen.conf.diff (from upstream, + without the gitignore hunk to get patching working). + * Bump video ABI version, and serverminver accordingly. + + -- Cyril Brulebois Fri, 25 Feb 2011 15:22:39 +0100 + +xorg-server (2:1.9.99.902-3) experimental; urgency=low + + * Merge from master up to 93a7399370. + * New patch: 17-fix-ftbfs-on-sparc.diff; let's try it for real before + asking for its being merged upstream. + * Refresh all patches. + + -- Cyril Brulebois Wed, 23 Feb 2011 13:36:13 +0100 + +xorg-server (2:1.9.99.902-2) experimental; urgency=low + + * Bump dependency on x11proto-randr-dev, needed since xorg-server.pc + pulls a newer randrproto version. + * Merge from debian-unstable (picking packaging updates from 2:1.9.4-3). + * Mention some basic checks to perform when updating to a new upstream + release, in README.source: ABI bumps and SDK_REQUIRED_MODULES updates. + * Accordingly: + - Bump the x11proto-xext-dev dependency. + - Don't bump the x11proto-kb-dev dependency (even etch had a + sufficient version). + + -- Cyril Brulebois Sun, 20 Feb 2011 07:02:20 +0100 + +xorg-server (2:1.9.99.902-1) experimental; urgency=low + + [ Christopher James Halse Rogers ] + * New upstream release (1.10 rc1) + * Drop 16-xaa-fbcomposite-fix-negative-size.diff, the mod macro that this + patch fixes is no longer used. + * debian/control: + - Bump x11proto-randr-dev and x11proto-xext-dev build-deps to 1.3.99 and + 7.1.99 for new XRandR and XSync extension protocols. + + [ Julien Cristau ] + * Bump serverminver and ABI versions. + + [ Cyril Brulebois ] + * New upstream release (1.10 rc2). + * bug script: Report libGL-related diversions. + * Bump serverminver again, since ABI_XINPUT_VERSION was bumped from 12.0 + to 12.2. + * Update debian/copyright from upstream COPYING. + * Add patch to work around out-of-tree issues: 16-oot-build.diff + + -- Cyril Brulebois Sat, 19 Feb 2011 15:29:54 +0100 + +xorg-server (2:1.9.4-3) unstable; urgency=low + + * Maintainer script clean-up: + - xserver-xorg-core.preinst.in: Remove, 1.5 is long gone. + - xserver-xorg-core.postinst.in: Remove, 1.5 is long gone, and 1.7.4 + was between lenny and squeeze. + - xserver-xorg-core.postrm.in: Rename as xserver-xorg-core.postrm, + handling upgrades from 1.5 is no longer needed, only keep the logs + removal and the #DEBHELPER# placeholder. + * Move remaining xsfbs bits to debian/rules: + - Create/clean stampdir/. + - Use quilt.make, $(QUILT_STAMPFN), unpatch. + - Define SOURCE_NAME and SOURCE_VERSION. + * Remove debian/xsfbs accordingly. + * Remove reference to xsfbs in README.source accordingly. + * Add patch: 20-update-gpu-pitch.diff (from upstream bug 33929), fixing + issues with the radeon driver (Closes: #613957). + + -- Cyril Brulebois Sun, 20 Feb 2011 05:35:50 +0100 + +xorg-server (2:1.9.4-2) unstable; urgency=low + + * Put an end to the dependency hell! Now that we have proper + dependencies between drivers and the server, remove xserver-xorg from + xserver-xorg-core's Depends (Closes: #362313). In a nutshell, one may + want to choose between installing: + - xserver-xorg-core: the server itself, with no strings attached. + - xserver-xorg: pulls the server and drivers, contains the X wrapper + and some documentation. + - xorg: pulls xserver-xorg as well as various X11 clients and fonts. + * bug script: Report KMS configuration files and their contents. + * bug script: Keep only one lspci call (with proper filtering), which + makes PCI IDs come back. + * bug script: Report libGL-related diversions. + * Stop providing xorg-input-abi-11.0 and xorg-video-abi-8.0 now that + drivers have reached unstable. + * Merge server-1.9-branch up to 0a4b0de9af. + + -- Cyril Brulebois Wed, 16 Feb 2011 23:17:07 +0100 + +xorg-server (2:1.9.4-1) unstable; urgency=low + + * The “squeeze is released, target sid!” upload. + * New upstream release. + * Unfuzzy all patches. + * Get rid of long obsolete NEWS file. + * Replace “--remaining-packages” with “-Nfoo -Nbar” in the “dh_strip -s” + call, to avoid non-stripped binaries if the build is resumed. + * Use “dh_prep” instead of deprecated “dh_clean -k”. + * Bump debhelper build-dep accordingly. + * Introduce dh_xsf_substvars, to be used in driver packages to set + appropriate substitution variables for Depends and Provides, before + calling dh_gencontrol. Ship it in xserver-xorg-dev. + * Also ship a debhelper sequence: xsf.pm, to insert dh_xsf_substvars + before dh_gencontrol. Usage: “dh $@ --with xsf” when using dh. + * Get rid of inputabiver and videoabiver files, they've been deprecated + for a while, and drivers should all have switched by now. + * rules: Only read the first line of debian/serverminver to set the + serverminver variable, used to prepare xinputdep and videodrvdep + files. + * rules: Keep only the major ABI version from pkg-config's output to + build xorg-{input,video}-abi-$ABI. To handle minor ABI versions, we + have the serverminver mechanism. + * To avoid having to binNMU all drivers to update their Depends from + xorg-*-abi-$MAJOR-$MINOR to xorg-*-abi-$MAJOR, add xorg-video-abi-8.0 + and xorg-input-abi-11.0 to the server's Provides temporarily (until + the next ABI bump). + * Add ${videoabi}, ${inputabi} to the udeb's Provides. There's no reason + for udebs to have loose dependencies. + * Accordingly, copy server's substvars as udeb's substvars once the + videoabi/inputabi variables are computed. + * Add an abibumpcheck target which checks for xinput and videodrv ABI + updates, based on the versions stored in debian/serverminver; make + clean depend on it to make sure such an update is noticed at the very + beginning of the build. + * Add current versions to debian/serverminver accordingly. + * Remove “xserver” from Provides, it's deprecated. + * Use architecture wildcards for build-deps. + * Make xserver-xfbdev linux-any; add armhf and powerpcspe to the udeb + (Closes: #585697, #605764). + * Cherry-pick, thanks to Samuel Thibault (Closes: #590715): + - xserver: enable TLS even if AIGLX is not enabled + * Update Uploaders list. Thanks, David & Steve & Brice! + * Bump Standards-Version to 3.9.1 (no changes needed). + + -- Cyril Brulebois Sat, 05 Feb 2011 10:40:55 +0100 + +xorg-server (2:1.9.3.902-1) experimental; urgency=low + + * New upstream release (1.9.4 rc2). + * Improve bug script: + - Stop reporting about roster and checksum for config file and server + symlink, they are no longer used. + - Replace printf with echo everywhere, it's slightly more readable and + all lines are newline-terminated anyway. + - Also use a “pecho” (pretty echo) function to underline some strings, + making the output slightly more readable. + - Fix listing xorg.conf.d's contents. Previously, that was only done + if xorg.conf existed. + - Check for local libraries by running ldd on the server. + - Check for obsolete libraries in the same way (/usr/X11R6/lib might + still exist in some cases, and be referenced in /etc/ld.so.conf, so + using ldd is sufficient to find out, see #546836 for an example). + + -- Cyril Brulebois Mon, 31 Jan 2011 14:00:41 +0100 + +xorg-server (2:1.9.3.901-1) experimental; urgency=low + + * New upstream release (1.9.4 rc1). + + -- Cyril Brulebois Sun, 09 Jan 2011 03:10:13 +0100 + +xorg-server (2:1.9.2.902-1) experimental; urgency=low + + * New upstream release (1.9.3 rc2). + * Drop 06_dont_trap_access_to_timer_and_keyboard.diff, merged upstream. + + -- Cyril Brulebois Sun, 05 Dec 2010 02:16:14 +0100 + +xorg-server (2:1.9.2-1) experimental; urgency=low + + * New upstream release. + + -- Cyril Brulebois Wed, 10 Nov 2010 00:10:19 +0100 + +xorg-server (2:1.9.0.902-1) experimental; urgency=low + + * New upstream release (1.9.1 rc2). + * Drop 20-Revert-for-bug-30267.diff, merged upstream. + + -- Cyril Brulebois Sat, 16 Oct 2010 15:24:48 +0200 + +xorg-server (2:1.9.0.901-1) experimental; urgency=low + + [ Christopher James Halse Rogers ] + * New upstream release (1.9.0): + - Fixes crash in DamageUnregister on session close (LP: #343694) + - Fixes crash with extremely large windows exposed by xpdf (Closes: #320627) + * Drop 17-fix-DRI2-segfault-when-clientGone.diff: fixed upstream in more + generality. + + [ Cyril Brulebois ] + * New upstream release (1.9.1 rc1). + * Add patch: 20-Revert-for-bug-30267.diff, to fix FTBFS due to test + failures, see https://bugs.freedesktop.org/show_bug.cgi?id=30267 for + reference. + * Bump xutils-dev build-dep for new macros. + * Remove --disable-multibuffer from configure flags, that extension is + gone for real now. + + -- Cyril Brulebois Tue, 12 Oct 2010 22:13:20 +0200 + +xorg-server (2:1.8.99.905-1) experimental; urgency=low + + * Drop recommends on xbase-clients. + * Add xauth to xserver-common recommends. + * Bump Standards-Version to 3.9.0. + * Don't install serverminver, drivers shouldn't use this anymore. + * New upstream release candidate. + + -- Julien Cristau Sat, 17 Jul 2010 11:13:32 +0100 + +xorg-server (2:1.8.99.904-1) experimental; urgency=low + + [ Julien Cristau ] + * Install the upstream changelog in xserver-common, instead of duplicating + its 1MB in all other packages. + * Stop repacking the tarball: the non-modifiable README.DRI was removed + upstream. + * Bump build-deps on x11proto-core-dev, x11proto-dri2-dev, libxfont-dev. + * Bump xserver-xorg-dev dependency on x11proto-core-dev and + x11proto-dri2-dev, add dependency on x11proto-xinerama-dev. + * Bump serverminver, videoabiver, inputabiver. + + [ Christopher James Halse Rogers ] + * New upstream RC + - A number of DRI2 fixes. + - Fix for hanging OpenGL clients with multiple heads. + * 17-fix-DRI2-segfault-when-clientGone.diff: + - Pick up fix from https://bugs.freedesktop.org/show_bug.cgi?id=27497 to + fix server crash in DRI2SwapEvent handling (LP: #595182). + + -- Julien Cristau Fri, 09 Jul 2010 12:45:09 +0100 + +xorg-server (2:1.8.1.901-1) experimental; urgency=low + + [ Julien Cristau ] + * New upstream release + * Merge changes from 2:1.7.7-2. + + [ Christopher James Halse Rogers ] + * 16-xaa-fbcomposite-fix-negative-size.diff: + - mi hunk merged upstream. Update to keep just the fbpict.c hunk. + + -- Julien Cristau Mon, 07 Jun 2010 23:22:48 +0200 + +xorg-server (2:1.8.1-1) experimental; urgency=low + + * New upstream release + - 02_Add-libgcrypt-and-libnettle-as-options-for-sha1.diff: partly merged + upstream, rest renamed to 02_Add-libnettle-as-option-for-sha1.diff and + ported to new version + - 05_only_call_gamma_set_if_nonnull.diff: merged upstream + - 07-xfree86-fix-build-with-xv-disabled.diff: rediffed + - 08-config-xorg-conf-d.diff: merged upstream + - 09-inputclass-sans-abi9.diff: likewise + - 10-config-libudev-backend.diff: likewise + - 11-xfree86-fix-video-fallback.diff: likewise + - 12-xfree86-dont-complain-about-missing-coredevices.diff: likewise + - 13-unbreak-input-abi.diff: obsolete + - 14-tone-down-nidr-errors.diff: merged upstream + - 15-nouveau.diff: rediffed + - 17-xfree86-saner-conf-search-paths.diff: merged upstream + - 18-Add-10-evdev.conf.diff: likewise + * Bump xutils-dev build-dep for new macros. + * Add build-dep on xfonts-utils for fontutil.pc. + * Bump build-deps on mesa, glproto and dri2proto. + * Drop obsolete configure options --disable-xsdl and + --disable-null-root-cursor. + * --enable-werror has been replaced by --enable-strict-compilation, adjust + rules. + * xdmx-tools.install: xdmx was renamed to dmxinfo. + * Bump debian/serverminver and ABI versions. + + -- Julien Cristau Wed, 12 May 2010 18:01:39 +0200 + +xorg-server (2:1.7.7-2) unstable; urgency=low + + * autoconfig: load the nouveau driver for nvidia hw. Stolen from F13. + * Try to catch non-event devices when running udevadm info in the bug + script. + * Pull from upstream server-1.7-nominations branch + - dix: make DeviceEvent coordinates signed for Xinerama (closes: #581763) + - xfree86: dga needs to use the master keyboard state (closes: #576393) + - Fix null pointer dereference in xf86_reload_cursors (closes: #507916) + + -- Julien Cristau Thu, 03 Jun 2010 17:00:18 +0200 + +xorg-server (2:1.7.7-1) unstable; urgency=low + + [ Timo Aaltonen ] + * Update patch 17; Add missing __datadir__ to cpprules.in. + + [ Cyril Brulebois ] + * Add listing files under /etc/X11/xorg.conf.d in bug script. + * Fix typo in 10-mouse.conf: s/Mouse/Pointer/ (Closes: #579130). + + [ Julien Cristau ] + * Drop the GLX 1.4 patches to fix server crashes with DRI2 (closes: + #567677). + * Change driver ABI Conflicts to Breaks. Drop old Conflicts/Replaces on + pre-modular xserver packages. + * Unset PRERELEASE to avoid the prerelease warning in the log. + * New upstream release: + - fixes Xvfb crash with XI2 (closes: #575905) + - EXA: Check sys_ptr isn't NULL before passing it to the UploadToScreen + hook (closes: #576656) + * 19-exa-handle-pixmap-create-destroy-in-lower-layers.diff is now upstream, + remove it. + * Drop mention of input_id from debian/copyright since we stopped shipping + it a while back. + + -- Julien Cristau Tue, 04 May 2010 15:17:59 +0200 + +xorg-server (2:1.7.6.901-3) unstable; urgency=low + + [ Julien Cristau ] + * On !linux, install mouse and kbd catchall snippets in the xorg.conf.d + directory. Fixes FTBFS on those archs. + + [ Cyril Brulebois ] + * Cherry-pick “exa: handle pixmap create/destroy in lower layers” which + fixes server crashes when pixmaps are created in the course of + software fallbacks (Closes: #576816). Many thanks to Arthur Marsh for + the tests! + + -- Cyril Brulebois Mon, 19 Apr 2010 15:26:15 +0200 + +xorg-server (2:1.7.6.901-2) unstable; urgency=low + + * Fix dependency generation: Replace PKG_CONFIG_DIR with PKG_CONFIG_PATH + (/usr/share/xserver-xorg/{videodrv,xinput}dep may lack a version + otherwise). + + -- Cyril Brulebois Sat, 17 Apr 2010 18:38:17 +0200 + +xorg-server (2:1.7.6.901-1) unstable; urgency=low + + * New upstream release candidate. + - Fix crash when all glyphs of a given depth are freed, but not all + glyphsets (closes: #568533) + + [ Cyril Brulebois ] + * Steal patch 112_xaa-fbcomposite-fix-negative-size.patch from ubuntu, + and rename it 16-xaa-fbcomposite-fix-negative-size.diff as it's now + applied in Debian as well. It fixes arithmetic bugs in mod(); thanks to + Bryce Harrington. + * Merge 'xsfbs/debian-unstable' to fix target dependencies, which fixes + useless rebuilds. + * Add support for “noudeb” in DEB_BUILD_OPTIONS to disable building the + udeb flavour (even on architectures where udebs are supposed to be + built) to speed up debug builds. When this is used, the udeb is still + built, but rather empty… + * Modify bug script to include kernel version (from /proc/version) since + the uname in Xorg.*.log might not give enough details (like the Debian + revision). + + [ Julien Cristau ] + * Remove from debian/rules an obsolete reference to + /usr/share/debhelper/dh_make/debianm/rules. + * Make xserver-xorg-core provide ABI-versioned virtual packages for drivers + to depend on. This is a first step in making our ABI handling saner (see + #573371). + * xvfb-run: don't rely on /tmp/X$i-lock to bump $SERVERNUM in auto-servernum + mode (closes: #577195). Thanks, Jozef Kutej! + * Bump serverminver for new handling of input config. + * Add Breaks on input drivers installing files in /usr/lib/X11/xorg.conf.d + since we're changing the path. + * Stop looking for x11_driver property in udev, since we're migrating the + drivers over to xorg.conf.d anyway. + * Install 10-evdev.conf in /usr/share/X11/xorg.conf.d (from upstream, patch + 18-Add-10-evdev.conf.diff). + + [ Timo Aaltonen ] + * Add 17-xfree86-saner-conf-search-paths.diff. Allows using another + xorg.conf.d directory for local changes. + + -- Cyril Brulebois Sat, 17 Apr 2010 16:55:39 +0200 + +xorg-server (2:1.7.6-2) unstable; urgency=low + + [ Timo Aaltonen ] + * Add 08-config-xorg-conf-d.diff, 09-inputclass-sans-abi9.diff, + 10-config-libudev-backend.diff. Backport xorg.conf.d, inputclass + and libudev support from xserver 1.8. Replaces the patches we had + before. This allows us to migrate from a temporary udev based + input device configuration straight to the long term solution + introduced in 1.8. + * Add 11-xfree86-fix-video-fallback.diff from SUSE. Allows the video + fallback method to work when there's an xorg.conf around. + * Add 12-xfree86-dont-complain-about-missing-coredevices.diff. + No reason to complain about these, unless AEI is off. + * Add 13-unbreak-input-abi.diff. Keep the old NewInputDeviceRequest(), + rename the new as NIDR18() and call it from NIDR(). This way we + don't break the input ABI. + * Add 14-tone-down-nidr-errors.diff. Use X_INFO instead of X_ERROR. + + [ Julien Cristau ] + * 15-keep-udev-x11-driver.diff: keep looking for the x11_driver udev + property as a transitional measure. This should allow the new server to + work while drivers aren't transitioned to xorg.conf.d yet. + + -- Timo Aaltonen Tue, 30 Mar 2010 21:32:52 +0300 + +xorg-server (2:1.7.6-1) unstable; urgency=low + + [ Brice Goglin ] + * Add 06_dont_trap_access_to_timer_and_keyboard.diff, + thanks Samuel Thibault. + + [ Timo Aaltonen ] + * New upstream release, closes: #574354. + + [ Julien Cristau ] + * Don't build xserver-xorg-core-udeb on sparc. The linker fails because + relocations have to be truncated when building statically against + libnettle. + + -- Cyril Brulebois Tue, 23 Mar 2010 16:59:08 +0100 + +xorg-server (2:1.7.5.902-1) unstable; urgency=low + + [ Julien Cristau ] + * config/udev: fix adding unnamed devices. + * Build two flavours, one for the main package and one for the udeb. + * Add patch to fix Xorg build with XV disabled. + + [ Timo Aaltonen ] + * Add 16-config-dont-filter-input-subsys.diff so for instance serial + wacom devices are initialized by the udev backend (LP: #522318, + closes: #568236). + + [ Brice Goglin ] + * New upstream release. + + Allow for missing or disabled compat_output, closes: #572268, #554450. + + Reenable RECORD extension, closes: #570680. + + dix: try to ring the bell even if the current device doesn't have one, + closes: #564200. + * Refresh patches. + * Fix typo in xvfb-run.1, thanks Joey Hess, closes: #527490. + * Add 06_dont_trap_access_to_timer_and_keyboard.diff, + thanks Samuel Thibault. + + [ Cyril Brulebois ] + * Add udeb needed for the graphical installer: xserver-xorg-core-udeb. + * Version/Bump some B-D to make sure xserver-xorg-core-udeb gets its + dependencies on the (recently-added) udebs rather than on the + libraries: + - libpciaccess-dev + - libudev-dev + - libxau-dev + - libxfont-dev + * Replace 02_Add-libgcrypt-as-an-option-for-sha1.diff with + 02_Add-libgcrypt-and-libnettle-as-options-for-sha1.diff so that it's + also possible to link against libnettle. Link (unconditionally) + statically against libnettle.a to avoid an extra udeb for a few bytes. + * Add nettle-dev to Build-Depends; and pass --with-sha1=libnettle for + the udeb build (and --with-sha1=libgcrypt for the main build). + * Add myself to Uploaders. + * Tweak builderstring to use the name of the person responsible for the + upload instead of an host-specific one (Closes: #574017). + + -- Cyril Brulebois Mon, 15 Mar 2010 22:19:01 +0100 + +xorg-server (2:1.7.5-1) unstable; urgency=low + + [ Julien Cristau ] + * Remove myself from Uploaders + + [ Brice Goglin ] + * New upstream release. + + Restore lastDeviceEventTime update in dixSaveScreens, + closes: #563816. + + Don't double-swap the RandR PropertyNotify event, + closes: #569036. + + Xi: reset the sli pointers after copying device classes, + closes: #566147. + * Bump Standards-Version to 3.8.4. + + -- Brice Goglin Tue, 16 Feb 2010 08:00:27 +0100 + +xorg-server (2:1.7.4-2) unstable; urgency=low + + [ Julien Cristau ] + * Rename the build directory to not include DEB_BUILD_GNU_TYPE for no + good reason. Thanks, Colin Watson! + + [ Brice Goglin ] + * Add 05_only_call_gamma_set_if_nonnull.diff to unbreak the nv driver, + closes: #564203. + + -- Brice Goglin Wed, 20 Jan 2010 23:51:26 +0100 + +xorg-server (2:1.7.4-1) unstable; urgency=low + + [ Timo Aaltonen ] + * New upstream release. + + [ Julien Cristau ] + * Don't call config_init() until after InitInput() has initialized the event + queue, so that devices don't get enabled too early (closes: #564256, + #564324). + + -- Julien Cristau Tue, 12 Jan 2010 10:49:22 +0000 + +xorg-server (2:1.7.3.902-1) unstable; urgency=low + + [ Timo Aaltonen ] + * Run udevadm trigger on postinst, and depend on udev [linux-any]. + + [ Julien Cristau ] + * Add xserver-common dependency on x11-xkb-utils for xkbcomp. + * Remove our copy of input_id, add Depends on new enough udev instead. + * New upstream release. + * Make xserver-common recommend xfonts-base, some clients don't work without + those. + * Upload to unstable. + + -- Julien Cristau Wed, 06 Jan 2010 17:44:59 +0000 + +xorg-server (2:1.7.3.901-1) experimental; urgency=low + + [ Julien Cristau ] + * Enable GLX 1.4 on DRI2 and swrast (from upstream, via F12). + * xserver-xorg-dev: add Depends on x11proto-kb-dev and libxkbfile-dev for + xkbsrv.h (closes: #559676). Thanks, Ron! + * Update input_id to the version in udev 149. + * Update xserver-xorg-core bug script to run udevadm info instead of lshal. + + [ Brice Goglin ] + * New upstream release. + + Refresh patches. + + -- Brice Goglin Sat, 12 Dec 2009 17:46:45 +0100 + +xorg-server (2:1.7.2-2) experimental; urgency=low + + [ Julien Cristau ] + * debian/rules: upstream build system got fixed, no need to remove + configure-generated files. + * Steal input_id helper from udev, install it in /lib/xorg. Thanks, Martin + Pitt! + + [ Brice Goglin ] + * Cherry pick upstream commit to fix the ABI. + + -- Brice Goglin Mon, 30 Nov 2009 20:10:27 +0100 + +xorg-server (2:1.7.2-1) experimental; urgency=low + + * New upstream release + + Xorg sets umask to 022 (closes: #555308) + * Delete 09_debian_xserver_rtff.diff. Was disabled since 1.3.99, and is not + necessary since the fall back to builtin fonts was added. + * Change the server's dependency on xserver-common to >= ${source:Version}, + to allow installation of different versions of the various servers. + * Add build-dep on libglib2.0-dev, xkb-data and x11-xkb-utils for unit + tests, and run the tests unless nocheck is in DEB_BUILD_OPTIONS. + * Cherry-pick upstream commit to turn ModeDebug on during server startup, + replacing our Turn-on-ModeDebug-by-default.patch. + * Number our patches to make it easier to keep track of things. Requested + by the Ubuntu folks. + * xvfb-run: retry a few times if Xvfb can't be started when using + --auto-servernum, to make concurrent invocations work (closes: #521075). + Thanks, Kees Cook! + * Use libudev instead of libhal for input hotplug on linux. + * Add udev rule to get keymap from /etc/default/keyboard. + + -- Julien Cristau Sat, 28 Nov 2009 16:48:43 +0100 + +xorg-server (2:1.7.0-1) experimental; urgency=low + + * Add missing Conflicts on xserver-xorg-video-5 and xserver-xorg-input-4. + * Add xkb-data to xserver-common's Depends. XKB is mandatory in 1.7. + * Make all servers depend on xserver-common (= ${source:Version}). + * New upstream release + + fixes Xvfb crashes (closes: #529927) + + fixes DGA init crash (closes: #548716) + + -- Julien Cristau Sun, 04 Oct 2009 15:57:01 +0200 + +xorg-server (2:1.6.99.903-1) experimental; urgency=low + + * New upstream snapshot. + + doesn't fill log file with errors when acpid isn't running + (closes: #487904, #500583) + + adds autoconfig for geode variants (closes: #544988) + + fixes idle time computation (closes: #542064) + + Xnest uses the host's mouse acceleration and speed (closes: #325181) + + Xephyr now has a manpage (closes: #427121) + + Xdmx works again (closes: #541254) + * Update build deps + * Update patch stack: + - 20_hurd-i386.diff applied upstream + - fedora-bad-fbdev-thats-mine.patch applied upstream + - fedora-pci-primary.diff superseded upstream + - fedora-vboxvideo.diff applied upstream + - kfreebsd-ftbfs.diff applied upstream + - Add-libgcrypt-as-an-option-for-sha1.diff refreshed + - Turn-on-ModeDebug-by-default.patch refreshed + * Cleanup some libtool cruft in debian/rules clean. + * Bump serverminver, videoabiver and inputabiver. + * Bump debhelper compat level to 5: + - handle dh_strip behaviour change + - fix xserver-xorg-core.install + * Bump Standards-Version to 3.8.3. + + -- Julien Cristau Tue, 29 Sep 2009 17:51:05 +0200 + +xorg-server (2:1.6.4-1) unstable; urgency=low + + * New upstream release. + * Update 20_hurd-i386.diff, thanks Samuel Thibault, closes: #548606. + * Drop render-return-the-supported-version.patch, applied upstream. + + -- Brice Goglin Mon, 28 Sep 2009 07:23:07 +0200 + +xorg-server (2:1.6.3.901-1) unstable; urgency=low + + [ Julien Cristau ] + * Add patch stolen from Fedora to add the vboxvideo driver to the + autodetection routine (closes: #540884). + * Add built-ins to the default font path so that non-Xorg servers can use + them (closes: #542707). Thanks, Josselin Mouette! + * Add avr32 to the libselinux-dev/libaudit-dev build-deps (closes: #543540). + Thanks, Bradley Smith! + * Add patch to return the actually supported version in RenderQueryVersion + rather than whatever renderproto version the server built against. + * New upstream release. + + idle counter computation fixes (closes: #542064) + * Cherry-pick three more patches nominated on + http://www.x.org/wiki/Server16Branch: + - Don't reset the lastDeviceEventTime when doing DPMS actions + - dri2: Don't crash if pPriv is NULL + - EXA: Only take special code path for 1x1 fill for pixmaps + + [ David Nusinow ] + * Update xsfbs to 5693792171d885769e58dcccc053c08b11acd12a + + -- Julien Cristau Mon, 14 Sep 2009 15:33:46 +0200 + +xorg-server (2:1.6.3-1) unstable; urgency=low + + * New upstream release. + + -- Brice Goglin Sat, 01 Aug 2009 08:55:40 +0200 + +xorg-server (2:1.6.2.901-1) unstable; urgency=low + + * New upstream release candidate. + * Bump mesa Build-Depends to >= 7.5 to fix DRI2 madness again, + closes: #538637. + + -- Brice Goglin Mon, 27 Jul 2009 00:17:42 +0200 + +xorg-server (2:1.6.2-1) unstable; urgency=low + + [ Brice Goglin ] + * New upstream release. + + Fixes dri2 madness introduced in previous upload + (closes: #534522, #536019, #534766, #534771, #534890). + + Fixes xkb bogus length in write keyboard desc, closes: #529625. + + Fixes SWCursor being multiply rendered, closes: #526260. + + Drop Change-default-for-ExaOptimizeMigration-to-false.diff, + applied upstream. + + Pull upstream server-1.6-branch up to commit 606f6dba. + * Bump serverminver to 2:1.6.2 for the dri2 upstream changes in the + previous upload. + + [ Julien Cristau ] + * Bump xserver-xorg-dev's dependency on dri2proto to >= 2.1 for the same + reason. + * Don't set PCI_TXT_IDS_DIR, we don't use that anymore. + * xserver-xorg-core.bug.script: add a newline between X log and lshal + output. + + -- Brice Goglin Mon, 13 Jul 2009 23:35:13 +0200 + +xorg-server (2:1.6.1.901-3) unstable; urgency=low + + [ Julien Cristau ] + * xvfb-run: don't pass the magic cookie to xauth on the command line + (CVE-2009-1573; closes: #526678). Thanks, Loïc Minier! + * xvfb-run: use mktemp to create the temporary directory. + * Change default for ExaOptimizeMigration to false. This option still + causes visual corruption in some cases. Thanks, Michel Dänzer! + * Only include hal info for keyboards, mice, touchpads and tablets in the + bug script. + * In the bug script, grep dmesg for agp in addition to drm. + * Add patch stolen from Fedora to disable the fbdev driver when it's loaded + together with a PCI or SBUS driver, instead of calling FatalError (closes: + #508476). + * Add patch stolen from Fedora to try and detect the primary PCI device by + mapping the legacy VGA bios and comparing the vendor and device ids. + Previously if there was more than one VGA device and the config didn't + specify BusIDs, the server would just fail to start, so this hack should + improve things. + * Update configure options: + + use --enable-xvfb instead of --enable-vfb + + drop --disable-builtin-fonts, --enable-xtrap, --disable-kdrive-vesa, + --disable-lbx, --disable-xprint, --disable-xorgconfig, --disable-xorgcfg + which don't exist anymore + + use --disable-config-hal and --disable-dri on hurd-i386 + + reorder options to match configure.ac, and use explicit + --enable/--disable instead of using the defaults / autodetection + * Don't recommend xfonts-base. libXfont provides builtin versions of the + fixed and cursor fonts, which are the only required ones. Keep xfonts-* + packages in Suggests for xserver-xorg-core. + * Bump Standards-Version to 3.8.2 now that we have README.source. + * Drop Build-Conflicts on xlibs-static-dev; it's only in oldstable at this + point. + * Pull from upstream server-1.6-branch as of June 23rd (commit dbac41b). + * Bump build-dep on dri2proto to 2.1 for new protocol. + * Bump build-dep on libselinux1-dev to 2.0.80 for avc_netlink_acquire_fd. + + [ David Nusinow ] + * Add README.source + + -- Julien Cristau Tue, 23 Jun 2009 19:52:10 +0200 + +xorg-server (2:1.6.1.901-2) unstable; urgency=low + + * Merge from upstream server-1.6-branch (commit a9f85dce). + * Fix FTBFS on kfreebsd (closes: #525475). Thanks, Petr Salinger! + + -- Julien Cristau Thu, 14 May 2009 17:37:40 +0200 + +xorg-server (2:1.6.1.901-1) experimental; urgency=low + + * New upstream development release + + fixes crash in CheckMotion with xinerama (closes: #524853) + + Refresh 20_hurd-i386.diff + + [ Brice Goglin ] + * Add 20_hurd-i386.diff to fix FTBFS on hurd-i386, + thanks Samuel Thibault! (closes: #523970) + + [ David Nusinow ] + * Have the reportbug script append lshal and drm info. + The drm info comes from grepping dmesg output. + + [ Julien Cristau ] + * Properly initialize libgcrypt in the libgcrypt patch (closes: #524822). + Thanks, Sven Joachim! + + -- David Nusinow Mon, 11 May 2009 21:50:37 -0400 + +xorg-server (2:1.6.1-1) unstable; urgency=low + + [ Julien Cristau ] + * Disable dri2 on hurd-i386. Thanks, Samuel Thibault! + + [ Brice Goglin ] + * New upstream release. + + -- Brice Goglin Wed, 15 Apr 2009 13:30:51 +0200 + +xorg-server (2:1.6.0-1) unstable; urgency=low + + [ David Nusinow ] + * Add 0001-xorg.conf-5-refer-to-mousedrv-4-.-Debian-394058.patch to + refer to correct (semi-obsolete) mouse driver manpage. + closes: #394058 + + [ Julien Cristau ] + * New upstream release. + * 0001-mi-force-the-paired-kbd-device-before-CopyKeyClass.patch: remove, + included upstream. + * Turn on ModeDebug by default. + * Use libgcrypt for SHA1 instead of OpenSSL's libcrypto. + * Build the xselinux extension on Linux architectures. + * Remove build-dependencies on x11proto-evie-dev, x11proto-trap-dev, + x11proto-xf86misc-dev; the corresponding extensions are removed. + * Remove build-dependencies on x11proto-print-dev, libfreetype6-dev and + xfonts-utils since we don't build Xprt anymore. + * Fix lintian warnings about xserver-xorg-core.NEWS formatting. + * Move -dbg package to new section debug, add ${misc:Depends} where missing. + * Remove unused 06_use_proc_instead_of_sysfs_for_pci_domains.diff, obsoleted + by pci-rework. + * Merge changelog entries 2:1.4.2-9 to 2:1.4.2-11. + * Upload to unstable. + + -- Julien Cristau Thu, 09 Apr 2009 00:36:40 +0100 + +xorg-server (2:1.5.99.902-1) experimental; urgency=low + + * New upstream release candidate. + * xserver-xorg-core.install: there are no more font modules. + * 0001-mi-force-the-paired-kbd-device-before-CopyKeyClass.patch: new patch, + fixes a crash with some multimedia keyboards (closes: #513384). + + -- Julien Cristau Sat, 31 Jan 2009 19:32:31 +0100 + +xorg-server (2:1.5.99.901-2) experimental; urgency=low + + [ Julien Cristau ] + * Bump libdrm-dev build-dep to help out sbuild. + + [ Timo Aaltonen ] + * debian/rules: Disable builtin fonts (LP: #308649, closes: #512706) + + -- Julien Cristau Fri, 23 Jan 2009 21:16:14 +0100 + +xorg-server (2:1.5.99.901-1) experimental; urgency=low + + * New upstream release candidate. + + adds autodetection of sbus devices (closes: #483942). + Thanks, Bernhard R. Link! + + RandR version 1.3 adds panning (closes: #509699). + + fixes a crash with XAA and fb24_32ReformatTile (closes: #443480). + + correctly sets RAW mode on the console when xorg.conf is absent + (closes: #505746). + + [ Timo Aaltonen ] + * debian/control: + - Add x11proto-dri2-dev to build-depends. + - Bump the x11proto-randr-dev build-dep version to 1.2.99.3. + - Bump the libpixman-1-dev build-dep version to 0.13.2. + - Bump the xtrans-dev build-dep version to 1.2.2. + - Bump the x11proto-xext-dev build-dep version to 7.0.3. + - Bump the x11proto-input-dev build-dep version to 1.5. + - Bump the libgl1-mesa-dev and mesa-common-dev build-dep to + 7.2+git20081209.a0d5c3cf. + - Bump the x11proto-core build-dep to 7.0.13. + - Add a build-dep on libxinerama-dev. + - Conflict xserver-xorg-video-4, xserver-xorg-input-2.1. + * debian/rules: + - Enable dri2 again. + * debian/patches: + 02_Disable-DRI-in-Xephyr.patch + 03_glx-init-infinite-loop.diff + - Dropped, implemented upstream. + 13_debian_add_xkbpath_env_variable.diff + - Disabled for now, needs to be reimplemented or dropped. + * debian/{input,video}abiver: Bump the input (4) and videoabiver (5). + * debian/serverminver: Bump to 2:1.5.99.901. + + [ Julien Cristau ] + * Ditch the GLX Public License and the CID Font Code Public License from + debian/copyright. The CID code has been removed a while ago, and all code + under the GLXPL has been relicensed to the SGI Free Software License B 2.0. + This finally closes: #211765. + + [ Yves-Alexis Perez ] + * debian/control: update deps for xserver-xorg-dev: + - libpixman-1-dev (>= 0.13.2-1) + - x11proto-core-dev (>= 7.0.14) + - x11proto-input-dev (>= 1.5.0) + - x11proto-xext-dev (>= 7.0.4) + - x11proto-randr-dev (>= 1.2.99.3) + - add x11proto-dri2-dev + + -- Julien Cristau Wed, 21 Jan 2009 20:59:34 +0100 + +xorg-server (2:1.5.3-1) experimental; urgency=low + + [ Loic Minier ] + * Shut up rmdir error when trying to remove dirs; this might confuse + debconf. + + [ Julien Cristau ] + * New upstream release. + * Fix infinite loop on server reset when swrast_dri.so is missing. Only + push swrast on the glx provider stack on first generation, so we don't + turn the stack into a circular list (closes: #500287). + * Enable the record extension (closes: #504303). + * Merge changes from 2:1.4.2-8. + + -- Julien Cristau Tue, 11 Nov 2008 23:17:14 +0100 + +xorg-server (2:1.5.2-1) experimental; urgency=low + + * New upstream bugfix release. + * debian/rules: define PCI_TXT_IDS_DIR to unbreak the pci id matching using + plain text files provided by drivers. + * Don't pass --with-serverconfig-path to configure, we only used to override + it for Xprint. + * Re-introduce the xserver-common package, containing + /usr/lib/xorg/protocol.txt and the Xserver(1) manpage for now. + * debian/rules: Use filter instead of findstring for noopt in + DEB_BUILD_OPTIONS. + * Remove obsolete conffile /etc/X11/xserver/SecurityPolicy on upgrades. + * Merge changes from 2:1.4.2-7. + + -- Julien Cristau Sat, 11 Oct 2008 20:20:28 +0200 + +xorg-server (2:1.5.1-1) experimental; urgency=low + + * New upstream bugfix release. + * 02_Disable-DRI-in-Xephyr.patch: don't use DRI in Xephyr, as it doesn't + work correctly. + * Merge changelog from 2:1.4.2-6 (all changes are upstream now). + + -- Julien Cristau Wed, 24 Sep 2008 17:49:18 +0200 + +xorg-server (2:1.5.0-1) experimental; urgency=low + + * New upstream release. + * Kill patch 50_Make-RandRQueryVersion-return-1.1-for-swapped-client.patch, + 1.2 requests are properly swapped now. + * Bump videoabiver to 4 to match ABI_VIDEODRV_VERSION. Yes, that means + rebuilding video drivers; sorry about that. + + -- Julien Cristau Thu, 04 Sep 2008 02:05:47 +0200 + +xorg-server (2:1.4.99.906-2) experimental; urgency=low + + * Pull from server-1.5-branch as of Aug 27th + + input devices from xorg.conf aren't ignored if there is no ServerLayout + option (closes: #492140) + * Bump build-dep on inputproto to >= 1.4.4 for DeviceControlChanged. + * Merge in changes from 2:1.4.2-3 to 2:1.4.2-5. + + -- Julien Cristau Thu, 28 Aug 2008 00:33:02 +0200 + +xorg-server (2:1.4.99.906-1) experimental; urgency=low + + * debian/rules: drop useless handling of nostrip in DEB_BUILD_OPTIONS (this + is taken care of by dh_strip); make the rules files and xsfbs.mk + parallel-safe, and enable parallel=n using example code from Debian + Policy. + * debian/rules: put the source package name and version in builderstring + instead of osvendor, add builder email as well; don't explicitly set + osname, configure sets it to $(uname -srm) by default. + * New upstream release candidate. + - fixes 64-bit Xephyr (closes: #491569) + - work around the DIX losing physical monitor dimensions for randr 1.1 + drivers, in particular nvidia (closes: #488987) + - make sure RANDR reports refresh as 0 if pixel clock is 0 (closes: + #490258) + - doesn't try to load dri2 when it's not built (closes: #491651) + * Switch to running autoreconf at build time, and build-depend on automake, + libtool and xutils-dev. + * Reformat the SGI Free Software License B, to shut up over 1000 lintian + warnings. + + -- Julien Cristau Sun, 27 Jul 2008 18:30:45 +0200 + +xorg-server (2:1.4.99.905-1) experimental; urgency=low + + [ Julien Cristau ] + * New upstream release candidate + - fixes FTBFS on alpha (closes: #472205); won't work, though, because + of #485528 + - fixes FTBFS on GNU/kFreeBSD (closes: #482550) + * 001_ubuntu_add_extra_modelines_from_xorg.patch: remove, replace with + 001_fedora_extramodes.patch stolen from fedora 9 cvs, rev 1.8. + * xvfb: recommend xauth instead of xbase-clients. + * xserver-xfbdev: recommend xfonts-base. + * debian/rules: drop our special handling for stripping modules, which I + think dates back to the days of the custom module loader. + * debian/rules: drop some remaining xprintisms. + * bump serverminver to 2:1.4.99.905. + * Stop build-depending on mesa-swx11-source (mesa 7.1 will build the + software driver itself), and don't pass --with-mesa-source to configure. + * Build with --enable-glx-tls, we build mesa with TLS support (otherwise + swrast_dri.so might fail to load due to unresolved symbols). + * Make the servers recommend libgl1-mesa-dri (>= 7.1~rc1). Without this + package, the GLX extension fails to initialise (and takes the server down) + due to missing swrast_dri.so. + + [ Timo Aaltonen ] + * Re-enable dri & glx. + * Add a build-dep on mesa-common-dev (>= 7.1~rc1) and bump the desired + version of libgl1-mesa-dev respectively. + * Bump the libdrm-dev build-dep version to 2.3.1. + + -- Julien Cristau Sun, 13 Jul 2008 23:33:05 +0200 + +xorg-server (2:1.4.99.902-1) experimental; urgency=low + + * Add postrm script for xserver-xorg-core, to remove + /var/log/Xorg.*.log{,.old} on purge (closes: #343384). + * Use dh_* -s instead of -a in binary-arch, to fix FTBFS on s390 (which + doesn't build xserver-xfbdev). + * New upstream release candidate. + + refresh 13_debian_add_xkbpath_env_variable.diff + + doesn't crash when there is no pci device (closes: #472823) + + includes a quirk for LPL monitors with broken EDID (closes: #473260) + + XKB is now enabled in Xnest (closes: #164379) + * Stop building Xprt, and drop related patches; it will be provided as a + separate package. + + -- Julien Cristau Fri, 23 May 2008 00:58:45 +0200 + +xorg-server (2:1.4.99.901-2) experimental; urgency=low + + * xserver-xorg-dev needs to depend on libpciaccess-dev. + * Pull from upstream server-1.5-branch as of March 21st (commit 98249dfa). + + fixes build on ia64 (closes: #471663) + * Add missing conflicts on xserver-xorg-input-2. + + -- Julien Cristau Fri, 21 Mar 2008 22:40:36 +0100 + +xorg-server (2:1.4.99.901-1) experimental; urgency=low + + [ Julien Cristau ] + * New upstream release candidate + * Update patches: + + 001_ubuntu_add_extra_modelines_from_xorg.patch: remove useless + whitespace changes + + 02_libvgahw_gcc4_volatile_fix.diff: delete, the gcc bug this was working + around is fixed for a long time + + 03_auto_load_driver.diff, 04_auto_load_driver_no_conf.diff, + 05_kill_type1.diff, 07_autoconfig_screen_with_device_section.diff, + 08_better_dpms_logging.diff, 10_dont_look_in_home_for_config.diff, + 11_dont_crash_on_bad_dri_mode.diff, 14_default_screen_section.diff, + 21_glx_align_fixes.patch, 40_default_dpi_96.patch, + 41_vbe_filter_less.diff, + 42_dont_break_grab_and_focus_for_window_when_redirecting.diff, + 43_allow_override_BIOS_EDID_preferred_mode.diff, + 44_preferredmode_infinite_loop.diff, + 45_only_XF86_APM_CAPABILITY_CHANGED_for_video_change_acpi_events.diff, + 46_reduce_wakeups_from_smart_scheduler.patch, + 47_fbdevhw_magic_numbers.diff, 51_xkb-and-loathing.diff, + 93_xprint_fonts_fix: remove, applied upstream + + 06_use_proc_instead_of_sysfs_for_pci_domains.diff: disable for now, + shouldn't be needed with pciaccess + + 13_debian_add_xkbpath_env_variable.diff: refresh + + 94_xprint_XSERVER_LIBS: disable, should be fixed upstream + * Disable glx, dri and dri2 for now. + * Re-enable dmx, build the xdmx and xdmx-tools packages. + * Add build-deps on libpciaccess-dev and libssl-dev for Xorg, bump build-dep + on libpixman-1-dev to >= 0.9.5. + * Add build-dep on libxv-dev for Xephyr. + * Drop XS- prefix from Vcs-* debian/control fields. + * Bump videoabiver to 2.9, inputabiver to 2.1, serverminver to 2:1.4.99.901. + * Drop obsolete --with-rgb-path configure option. + * /etc/X11/xserver/SecurityPolicy is gone, don't install it. + * Don't build-dep on "foo (>= bar-1)", to fix lintian warnings. + + [ Drew Parsons ] + * Remove 94_xprint_XSERVER_LIBS (not needed in xserver 1.5). + + [ Brice Goglin ] + * Build the Xfbdev server for real now, in new package xserver-xfbdev, + closes: #439764. + + -- Julien Cristau Fri, 14 Mar 2008 13:46:48 +0100 + +xorg-server (2:1.4.2-11) unstable; urgency=low + + * Bump x11proto-input-dev build-dep to >= 1.5.0 to fix keyboard layout + breakage with new libxi built against the same. Closes: #515976 + + -- David Nusinow Thu, 19 Feb 2009 21:52:24 -0500 + +xorg-server (2:1.4.2-10) unstable; urgency=medium + + * Cherry-pick from upstream: GLcore: make googleearth not crash the server + on sw-rendering (closes: #495483). + + -- Julien Cristau Fri, 09 Jan 2009 02:26:06 +0100 + +xorg-server (2:1.4.2-9) unstable; urgency=low + + * Cherry-pick patches from upstream to make xf86ScaleAxis() work correctly. + * Steal patch from Fedora: more sanity checks to stop vmmouse from + segfaulting the server (closes: #503459). + + -- Julien Cristau Thu, 13 Nov 2008 23:32:47 +0100 + +xorg-server (2:1.4.2-8) unstable; urgency=low + + * Add patch from Petr Salinger to fix PCI domain support on kfreebsd + (closes: #499501). + * xfree86: xf86SetDepthBpp needs to respect the driver's depth24flags. + Instead of forcing a 32bpp framebuffer, we pick a value that the driver + actually supports (closes: #504819, #486925); cherry-picked from upstream + git. + + -- Julien Cristau Tue, 11 Nov 2008 20:46:52 +0100 + +xorg-server (2:1.4.2-7) unstable; urgency=low + + * Update debian/copyright to the SGI Free Software License B, version 2.0. + It now mirrors the free X11 license used by X.Org. + http://www.sgi.com/company_info/newsroom/press_releases/2008/september/opengl.html + * Not closing bug#211765 for now, because GL/glx/glxext.c and + hw/dmx/glxProxy/glxext.c are covered by the GLX Public License, which is + still not free. SGI has since released their code under FreeB, but that + doesn't necessarily apply to contributions from other people. Hopefully + this can be cleared up soon, though. + * xvfb-run: append to $ERRORFILE instead of truncating it, so the error + output from Xvfb is not deleted when we run 'xauth remove'. + + -- Julien Cristau Tue, 30 Sep 2008 00:39:58 +0200 + +xorg-server (2:1.4.2-6) unstable; urgency=low + + * Xevie: always set rep.length to 0 (closes: #497337). Thanks, Thorvald + Natvig! + * Xevie: swap replies if necessary, to not confuse clients with a different + endianness. + * Cherry-picked from upstream git: + XF86VidMode: Correct a NULL pointer dereference (closes: #498289) + + -- Julien Cristau Mon, 15 Sep 2008 01:21:13 +0200 + +xorg-server (2:1.4.2-5) unstable; urgency=low + + * Don't pretend we support randr 1.2 when queried by swapped clients. The + dispatch code for RandR 1.2 requests would return BadImplementation anyway + (closes: #495833). + * Cherry-picked from upstream: + + exa: fix assert logic thinko. + + -- Julien Cristau Tue, 26 Aug 2008 19:27:34 +0200 + +xorg-server (2:1.4.2-4) unstable; urgency=low + + * Re-enable patch 47_fbdevhw_magic_numbers.diff, fixes xen framebuffer + (closes: #493901). Thanks, Olivier Tétard! If someone knows why I + disabled it a year ago, I'd love to know. + + -- Julien Cristau Fri, 15 Aug 2008 19:15:54 +0200 + +xorg-server (2:1.4.2-3) unstable; urgency=low + + * Add Romanian debconf translation (closes: #489069). Thanks, Eddy + Petrișor! + * Update Dutch debconf translation (closes: #491663). Thanks, Thijs + Kinkhorst! + * Pull from server-1.4-branch: + - Xi: ChangeDeviceControl presence events should set the appropriate + devchange + - Fix potential crasher in xf86CrtcRotate() + * Cherry-picked from 1.5: + - Work around the DIX losing mmWidth/mmHeight for RandR 1.1 DDXen + (closes: #491526). + + -- Julien Cristau Sat, 02 Aug 2008 23:22:32 +0200 + +xorg-server (2:1.4.2-2) unstable; urgency=low + + [ Julien Cristau ] + * GLX: zero the buffer used in __glXDisp_GetVisualConfigs (backport from + upstream). + + [ Brice Goglin ] + * Cherry-pick various patches from upstream: + - Fix incorrect test regarding keyboard map. + - xfree86: append, not prepend, new input devices to xf86InputDevs. + + -- Julien Cristau Fri, 18 Jul 2008 10:53:26 +0200 + +xorg-server (2:1.4.2-1) unstable; urgency=low + + [ Julien Cristau ] + * New upstream release. + * Security fixes from the previous upload are included upstream. + * Cherry-pick patches from upstream git to make the LeftOf and Above options + in xorg.conf actually work (closes: #466526). + * 48_xaa_nooffscreenpixmaps.diff: disable XAA offscreen pixmaps by default; + they can be enabled with Option "XaaOffscreenPixmaps" (closes: #478277, + #433331). + * Cherry-pick various patches from upstream for Xorg's modes code: + - add quirks for monitors with broken EDID (closes: #473260) + - fix max clock computation + - inherit the preferred mode from the global configuration (so if you have + Modes "800x600" in the Display subsection the server will honor it + instead of ignoring it) + * Backport patch from upstream git to fix emulation of int1A PCI BIOS + services (closes: #404885). Thanks, Robert de Bath! + + [ Brice Goglin ] + * Update patches to not require -p0, closes: #485185. + + -- Julien Cristau Thu, 26 Jun 2008 01:57:18 +0200 + +xorg-server (2:1.4.1~git20080517-2) unstable; urgency=high + + * High urgency upload for security fixes. + * New patch from upstream to fix multiple security issues reported by + iDefense: + CVE-2008-2360 - RENDER Extension heap buffer overflow + CVE-2008-2361 - RENDER Extension crash + CVE-2008-2362 - RENDER Extension memory corruption + CVE-2008-1379 - MIT-SHM arbitrary memory read + CVE-2008-1377 - RECORD and Security extensions memory corruption + + -- Julien Cristau Mon, 09 Jun 2008 14:59:04 +0200 + +xorg-server (2:1.4.1~git20080517-1) unstable; urgency=low + + [ Julien Cristau ] + * Pass -DPRE_RELEASE=0 in CPPFLAGS, so we don't print the pre-release + warning in the Xorg log. + * Pull from upstream server-1.4-branch + + drop patch 40_default_dpi_96.patch applied upstream + + refresh patches 03_auto_load_driver.diff and + 04_auto_load_driver_no_conf.diff + * Don't build-depend on packages with a -1 debian revision. + * Drop the XS- prefix from Vcs-* control fields. + * Add x11-common to the Depends field of xnest, xvfb and xserver-xephyr (its + init script sets up the /tmp/.X11-unix directory). + * Re-enable the dmx DDX, and build the xdmx and xdmx-tools packages (the + build is now fixed upstream); closes: #449254. + + [ Drew Parsons ] + * Patch 95_xprint_disable_dbus disables dbus in Xprint by providing + dummy config functions. Taken from upstream commit + 2a3d1421e0cc18822ae8f478fcc272e16a9e9340, with removal of + CONFIG_LIB from configure.ac shifted to 94_xprint_XSERVER_LIBS. + Closes: #472180. + * Enable the xprint DDX, and build the xprint and xprint-common packages. + + -- Julien Cristau Sun, 18 May 2008 13:36:11 +0200 + +xorg-server (2:1.4.1~git20080507-1) unstable; urgency=low + + * Pull from upstream server-1.4-branch, highlights: + - the server should now scale input events correctly + - xkb keymap failures now give an explanation instead of just a 'failed to + load' message + * Drop patch 51_xkb-and-loathing.diff, applied upstream + * Refresh patches 13_debian_add_xkbpath_env_variable.diff, + 21_glx_align_fixes.patch, 46_reduce_wakeups_from_smart_scheduler.patch and + 94_xprint_XSERVER_LIBS. + * chmod +x configure in debian/rules clean so we can build a git snapshot + where configure is not in the tarball. + * Cherry-pick fix from upstream's master branch to re-arm the DPMS timer + when re-enabling DPMS (closes: #397197). + + -- Julien Cristau Thu, 08 May 2008 15:34:38 +0200 + +xorg-server (2:1.4.1~git20080131-4) unstable; urgency=low + + * fix AlwaysCore handling: enabling AlwaysCore in xorg.conf 1) is the + default, and 2) shouldn't prevent the device from sending core events + (closes: #461760). + + -- Julien Cristau Tue, 29 Apr 2008 20:14:22 +0200 + +xorg-server (2:1.4.1~git20080131-3) unstable; urgency=low + + * XKB: Fix processInputProc wrapping (cherry-picked from upstream). + Thanks to Thomas Jaeger. This should fix the bug with some keys getting + stuck (closes: #473165). + * xkb: when copying the keymap, make sure the structs default to 0/NULL + (cherry-picked from upstream). Fixes a crash and closes: #461783. + * __glXDRIbindTexImage: Fail if no texture bound to pixmap's texture target + (cherry-picked from upstream). + * EXA: Fix off-by-one in polyline drawing (cherry-picked from upstream). + * EXA: Skip empty glyphs (cherry-picked from upstream). + * Fix overly-restrictive integer overflow check in EXA pixmap creation + (cherry-picked from upstream). Fixes BadAlloc errors returned by + XCreatePixmap for pixmaps of width 8192 or greater (closes: #471782). + + Following patches by Bart Trojanowski, stolen from the ubuntu package: + * 15_X86EMU-added-blacklist-for-I-O-port-in-0-0xFF-range.patch + - Restrict access to I/O ports in range 0-0xFF from x86emu. + * 16_X86EMU-pass-the-correct-bus-dev-fn-tag-to-pci-emula.patch + - Fix improper emulation of PCI access General Software BIOS. + * Add 17_x86emu_handle_cpuid.patch to fix X86EMU CPUID handling. + (closes: #451089). + + -- Julien Cristau Wed, 02 Apr 2008 00:20:15 +0200 + +xorg-server (2:1.4.1~git20080131-2) unstable; urgency=low + + [ Brice Goglin ] + * Add 46_reduce_wakeups_from_smart_scheduler.patch to reduce + power consumption, closes: #462700. + + [ Drew Parsons ] + * Restore Xprint, cherry-picking commits + f7f79724fdea0cc6fda0e90e56431df937d49335 and + d67e210f3458b62d7d4a6032aabfda0004d661c1 from master (xserver 1.5). + Include patch 94_xprint_XSERVER_LIBS to give new meaning of + XSERVER_LIBS as expected in configure.ac from master (see commit + a02db0d500cac20d0f0f107d27c064a175018421). Delete + 94_xprint_XSERVER_LIBS when we upgrade to xserver 1.5. + + [ Julien Cristau ] + * Re-enable patch 51_xkb-and-loathing.diff: ignore SIGALRM around calls to + Popen()/Pclose() to fix a hang when opening menus in OpenOffice.org + (once again closes: #433131) + * Refresh all patches to make patch-audit happy. + * Pull from upstream server-1.4-branch as of March 14th. + * 42_dont_break_grab_and_focus_for_window_when_redirecting.diff removed, + applied upstream. + * Don't build xprint just yet, because it needs NEW processing. + + [ David Nusinow ] + * Add 11_dont_crash_on_bad_dri_mode. See bugzilla #13860 + + -- Julien Cristau Fri, 14 Mar 2008 15:18:16 +0100 + +xorg-server (2:1.4.1~git20080131-1) unstable; urgency=low + + [ Brice Goglin ] + * Add 45_only_XF86_APM_CAPABILITY_CHANGED_for_video_change_acpi_events.diff + to prevent XF86_APM_CAPABILITY_CHANGED from being issued for all ACPI + events, thanks Sjoerd Simons, closes: #461463. + + [ David Nusinow ] + * Update Japanese translation from Hideki Yamane. closes: #462761 + * New upstream pull + + Fixes crashes due to absent LED's being referenced + + -- David Nusinow Thu, 31 Jan 2008 21:43:12 -0500 + +xorg-server (2:1.4.1~git20080118-1) unstable; urgency=low + + [ Brice Goglin ] + * Add 42_dont_break_grab_and_focus_for_window_when_redirecting.diff + to prevent password authentication bypass, closes: #449108. + + [ Julien Cristau ] + * New upstream snapshot + + includes the security fixes from the previous version + + fixes regression introduced by the fix for CVE-2007-6429 in the MIT-SHM + extension (closes: #461410) + + -- Brice Goglin Fri, 18 Jan 2008 22:20:32 +0100 + +xorg-server (2:1.4.1~git20080105-2) unstable; urgency=low + + [ David Nusinow ] + * Improve dpms logging patch to correctly label message type + + [ Brice Goglin ] + * Grab upstream commit db9ae863536fff80b5463d99e71dc47ae587980d + to set DEFAULT_DPI to 96 instead of 75. + + [ Julien Cristau ] + * Fix multiple security issues + + CVE-2007-6427: XInput Extension Memory Corruption + + CVE-2007-6428: TOG-CUP Extension Memory Corruption + + CVE-2007-6429: EVI Extension Integer Overflow, + MIT-SHM Extension Integer Overflow + + CVE-2007-5760: XFree86-Misc Extension Invalid Array Index + + CVE-2007-5958: file existence disclosure + + CVE-2008-0006: PCF font parser buffer overflow + * Bump Standards-Version to 3.7.3 (no changes). + + -- Julien Cristau Thu, 17 Jan 2008 15:10:03 +0100 + +xorg-server (2:1.4.1~git20080105-1) unstable; urgency=low + + * Don't reference non-existent bug-reporting.txt file in xvfb-run.1 + * New upstream git pull, again from the server-1.4-branch + + Drop 08_xkb_infinite_loop.diff, it's upstream now + * Improve logging when DPMS is enabled implicitly + + Adds 08_better_dpms_logging.diff + + -- David Nusinow Sun, 06 Jan 2008 16:56:38 -0500 + +xorg-server (2:1.4.1~git20071212-2) unstable; urgency=low + + * Add patch 08_xkb_infinite_loop.diff from upstream bug#13511: papers over + an infinite loop in event processing (closes: #451989). + + -- Julien Cristau Sat, 22 Dec 2007 00:02:01 +0100 + +xorg-server (2:1.4.1~git20071212-1) unstable; urgency=low + + [ Julien Cristau ] + * debian/rules: Use lsb_release -i -s to get the vendor name, instead of + hardcoding "Debian". + * debian/control: build-dep on lsb-release. + * Cherry-pick commit f30abe30 from master: edid quirk for MAX 0x77e monitor. + * Add patch 44_preferredmode_infinite_loop.diff from upstream git: fixes an + infinite loop when PreferredMode is used in xorg.conf. + + [ David Nusinow ] + * New upstream version. This is based on the server-1.4-branch, and includes + all the changes in the 1.4.0.90 (pre-)release as well as additional fixes. + This is primarily a bugfix release + + Remove 12_bgPixel_fix_64bit_issue.diff. Applied upstream + + -- David Nusinow Wed, 12 Dec 2007 20:19:11 -0500 + +xorg-server (2:1.4.1~git20071119-1) unstable; urgency=low + + * Ship a .orig.tar.gz that's been autoreconf'ed. Closes: #451891 + * Re-enable validation of the screen section of xorg.conf + Modify 14_default_screen_section.diff. This also fixes a problem where the + server can't find the device section when it is specified in the screen + section. Closes: #451950 + + -- David Nusinow Mon, 19 Nov 2007 20:38:04 -0500 + +xorg-server (2:1.4.1~git20071117-1) unstable; urgency=low + + [ Julien Cristau ] + * Add conflict on xserver-xorg-input-wacom (<< 0.7.8) to xserver-xorg-core. + That driver is built against the old ABI, but doesn't provide + xserver-xorg-input. + + [ David Nusinow ] + * Add 14_default_screen_section.diff. This allows you to not have a screen + section in your xorg.conf. A basic default one with a simple identifier + will be created for you in this case using all default values + + [ Christian Perrier ] + * Debconf translations: + * Galician. Closes: #444764 + * German. Closes: #444917 + * Brazilian Portuguese. Closes: #445266 + * Russian. Closes: #443859 + * Portuguese. Closes: #445051 + * Slovak. Closes: #446418, #448220 + + [ Brice Goglin ] + * Bump x11proto-core-dev build-dependency to >= 7.0.9, + thanks Max Kellermann, closes: #446869. + + [ David Nusinow ] + * New upstream stable snapshot + + fixes a bunch of input-related bugs, notably keyboard leds + (closes: #440743 and its pile of duplicates) + * Remove patches merged in this snapshot + + 08_exa_fix_exaFillRegionTiled_fallback.diff + + 11_exa_no_negative_tile_offsets.diff + + 42_fix_RemoveGeneralSocket_crash_from_dbus.diff + + 44_XKB_mapping_changes_for_all_core-sending_devices.diff + + 45_GetKeyboardEvents_reject_out-of-range_keycodes.diff + * Make xephyr recommend xfonts-base. Closes: #451542 + + -- David Nusinow Sat, 17 Nov 2007 18:54:02 -0500 + +xorg-server (2:1.4-3) unstable; urgency=low + + [ David Nusinow ] + * Minor cleanups of 03_autoload_drivers.diff. Thanks to Julien for + spotting all these ugly bits + + Newline after #else when picking the driver (this is the failsafe + choice) + + Change by hacked "ids" file name suffix check to use strncmp and check + for ".ids" + + Use strncpy instead of strncat unnecessarily + * Add support for a partially configured device section + Implemented in 03_autoload_driver.diff. Now if you have a device section + but lack a driver, it'll use the settings. This will allow you to just + have a device section and enable EXA but not have to specify the driver or + anything else. + * Add 07_autoconfig_screen_with_device_section.diff + This patch allows the Screen section to not specify a device section. If + this happens, the server will automatically use the first device section + listed in the xorg.conf instead + + [ Brice Goglin ] + * Allow building the Xfbdev server in new package xserver-xfbdev, but leave + it disabled for now (see #439764). + * Add upstream commit 27ad5d74c20f01516a1bff73be283f8982fcf0fe as patch + 44_XKB_mapping_changes_for_all_core-sending_devices.diff to fix broken + xmodmap invocation in .xsession, closes: #443044. + * Add upstream commit 0e800ca4651a947ccef239e6fe7bf64aab92257c as patch + 45_GetKeyboardEvents_reject_out-of-range_keycodes.diff to fix crash + in GetKeyboardValuatorEvents, closes: #443697. + + [ Christian Perrier ] + * Debconf templates and debian/control reviewed by the debian-l10n- + english team as part of the Smith review project. Closes: #442210 + * Debconf translation updates: + - Swedish. Closes: #443047 + - Czech. Closes: #443100 + - French + - Vietnamese. Closes: #443174 + - Italian. Closes: #422414 + * New debconf translations + - Hungarian. Closes: #442956 + - Thai. Closes: #442962 + - Tamil. Closes: #443027 + - Basque. Closes: #443156 + - Hebrew. Closes: #443204 + - Bulgarian. Closes: #443226 + - Finnish. Closes: #443611 + + [ Julien Cristau ] + * Add patch backported from upstream commit + 13949f997289068354e83bc83e50d97b8232efb1 to remove the type1 module: patch + 05_kill_type1.diff replaces 48_disable_type1.diff, and is now enabled in + debian/patches/series. + * Don't build kdrive-based servers we're not shipping. + * Use ${binary:Version} instead of ${Source-Version}. + * Add 08_exa_fix_exaFillRegionTiled_fallback.diff by Michel Dänzer to punt + on fallback case not handled correctly in exaFillRegionTiled (backported + from master's c7d6d1f5); closes: #444203. + * Add 11_exa_no_negative_tile_offsets.diff by Michel Dänzer to make sure + tile offsets passed to drivers are never negative (backported from + master's 006f6525). + * Add 12_bgPixel_fix_64bit_issue.diff by Hong Liu: bgPixel (unsigned long) + is 64-bit on x86_64, so -1 != 0xffffffff (master's 9adea807). + + -- Julien Cristau Sat, 29 Sep 2007 16:14:35 +0200 + +xorg-server (2:1.4-2) unstable; urgency=low + + [ Brice Goglin ] + * Add 42_fix_RemoveGeneralSocket_crash_from_dbus.diff to fix a crash + when leaving, closes: #440547. + * Add 43_allow_override_BIOS_EDID_preferred_mode.diff to allow overriding + BIOD/EDID preferred mode with Option PreferredMode in the config file. + + [ David Nusinow ] + * Upload to unstable + + -- David Nusinow Sun, 16 Sep 2007 14:24:18 -0400 + +xorg-server (2:1.4-1) experimental; urgency=low + + * New upstream release (X.Org 7.3) + + RandR doesn't mark Xinerama as active when no crtcs are enabled + (closes: #431746) + * Add proper depends to xserver-xorg-dev: + x11proto-core-dev, x11proto-input-dev (>= 1.4), x11proto-xext-dev, + x11proto-video-dev, x11proto-randr-dev (>= 1.2), x11proto-render-dev (>= + 2:0.9.3), x11proto-fonts-dev + * Bump serverminver to 2:1.4, videoabiver to 2, inputabiver to 2. + + -- Julien Cristau Mon, 10 Sep 2007 14:35:38 +0200 + +xorg-server (2:1.3.99.2-1) experimental; urgency=low + + [ David Nusinow ] + * Refactor auto_load_driver patch to allow the same method to be used when + there is no xorg.conf present + * Add 04_auto_load_driver_no_config.diff to use my auto_load_driver method + when there's no xorg.conf present + + [ Brice Goglin ] + * Simplify output redirections in the reportbug script, + thanks Justin Pryzby, closes: #358390. + * Add missing URL in long descriptions, update links to the upstream + module, fix some capitalization, thanks Christian Perrier. + + [ Julien Cristau ] + * New upstream release candidate. + + bump build dep on renderproto to >= 0.9.3, and on pixman to >= 0.9.4-2. + + bump video abi version and serverminver. + * Drop the Conflict on fglrx-driver, which is taken care of by the abi + version. + + -- Julien Cristau Tue, 04 Sep 2007 17:32:19 +0200 + +xorg-server (2:1.3.99.0-2) experimental; urgency=low + + * Improve 03_auto_load_driver.diff + + Move memory cleanup and directory closing to after the end label to + prevent leaks. Thanks Julien. + + Allow a driver to claim everything from a specific vendor. It does so by + only specifying a vendor ID and leaving the latter four digits empty. + + -- David Nusinow Sun, 19 Aug 2007 16:06:54 -0400 + +xorg-server (2:1.3.99.0-1) experimental; urgency=low + + [ Julien Cristau, David Nusinow ] + * New upstream release candidate. + + X is now more tolerant of devices without a CtrlProc (closes: #269860). + + cvt(1) and gtf(1) typos fixed (closes: #432065). + + Make sure DRIScreenPrivIndex is -1 when no DRI screen private is + allocated. (closes: #413697). + + __glXDRIscreenProbe: Use drmOpen/CloseOnce (closes: #419614). + + segfault in swrast_Triangle fixed in mesa (closes: #407502). + + the Xvfb manpage doesn't refer to /usr/tmp anymore (closes: #270257). + + typos in Xserver(1) fixed (closes: #306688). + + * Remove patches that were pushed upstream + + 03_xnest_manpage_overhaul.diff + + 04_read_rom_in_chunks.diff + + 05_module_defaults.diff + + 07_stolen_from_HEAD_xorgconf_manpage.diff + + 08_s390_servermd.diff + + 12_security_policy_in_etc.diff + + 16_s390_fix.diff + + 18_execinfo_configured.patch + + 23_kfreebsd_support.diff + + 24_hurd_ioperm_fix.diff + + 32_disable_sparc_pci_bridge.diff + + 39_alpha_build_flags.patch + + 40_consolidate_portPriv_pDraw_assignments.diff + + 42_only_run_special_key_behaviours_on_non-XKB.diff + + 44_fedora-xephyr-keysym-madness.diff (different fix applied upstream) + + 45_CVE-2007-2437.diff + + 46_export-ramdac-symbols.diff + + 49_map_keyboard_driver_to_kbd.diff + + 50_alpha_no_include_asm_pci.h.diff + + 94_use_default_font_path.diff + + 125_glx_remove-stray__GLinterface.diff, + 126_glxproxy_remove-stray__GLinterface.diff and + 127_mesa-6.5.3-compat.diff (obsolete) + + * Update other patches: + + 09_debian_xserver_rtff.diff disabled (doesn't apply, and isn't even + used AFAICS; + + 11_define_XFree86Server.diff dropped, to be fixed in drivers instead; + + 13_debian_add_xkbpath_env_variable.diff refreshed; + + 21_glx_align_fixes.patch updated; + + 43_xephyr_crash_at_exit.diff dropped (doesn't apply); + + 47_fbdevhw_magic_numbers.diff disabled for now; + + 48_disable_type1.diff disabled for now; + + 51_xkb-and-loathing.diff disabled for now. + + [ Julien Cristau ] + * Add build-dep on x11proto-input-dev (>= 1.4.2), libpixman-1-dev + (>= 0.9.0), libdbus-1-dev, libhal-dev (except on hurd-i386 for the last + two). + * Bump build-dep on mesa-swx11-source to >> 7.0.1~rc2-1. + * Bump serverminver to this version, videoabiver to 1.9, inputabiver to + 0.9 (so this doesn't clash with a release and drivers have to be + rebuilt). + * Bump build-dep on compositeproto to >= 0.4. + * Install the upstream changelog. + * Disable the xprint and dmx DDX for now, they fail to build. + * xserver-xorg-dev needs a dependency on libpixman-1-dev. + * Add explanations about our tarball and upstream URL to debian/copyright. + + [ Drew Parsons ] + * Update Xprint build to include pixman. + + [ David Nusinow ] + * Add 03_auto_load_driver.diff. This patch allows the server to select a + driver and automatically create a Devices section when none is specified + in your xorg.conf. It chooses the driver based on a set of PCI ID's that + the driver itself provides in /usr/share/xserver-xorg/pci. If no driver + claims the PCI ID of your primary video card, then it will choose a + fallback based on your system. + + -- Julien Cristau Sat, 18 Aug 2007 18:28:49 +0200 + +xorg-server (2:1.3.0.0.dfsg-13) UNRELEASED; urgency=low + + [ Debconf templates translations ] + * Italian added. Closes: #422414 + * Slovak added. Closes: #438578 + + -- Christian Perrier Sun, 26 Aug 2007 12:09:52 +0200 + +xorg-server (2:1.3.0.0.dfsg-12) unstable; urgency=low + + [ Brice Goglin ] + * Add 51_xkb-and-loathing.diff to fix a hang in OpenOffice.org + when opening menus, closes: #433131. + * Install the exa(4) and fbdevhw(4) manpages. + + [ Julien Cristau ] + * Update the xorg.conf(5) manpage to get documentation for RandR 1.2 + options: + + 07_stolen_from_HEAD_xorgconf_manpage.diff: new patch; + + 07_xorgconf_manpage_overhaul.diff dropped; + + 34_xorg.conf_man_typos.patch dropped; + + 05_module_defaults.diff, 94_use_default_font_path.diff: dropped hunks + applying to hw/xfree86/doc/man/xorg.conf.man.pre. + * Add patch 11_define_XFree86Server.diff: XFree86Server needs to be defined + in xorg-server.h and exported to drivers. + * Add patches 125_glx_remove-stray__GLinterface.diff + 126_glxproxy_remove-stray__GLinterface.diff and 127_mesa-6.5.3-compat.diff + to build with mesa >= 6.5.3, and bump build-dependency on + mesa-swx11-source. + * Include the Debian package version in OSVENDOR to make it appear in the + X log. + + -- Julien Cristau Thu, 09 Aug 2007 16:32:14 +0200 + +xorg-server (2:1.3.0.0.dfsg-11) unstable; urgency=low + + * Yet another alpha build fix: also remove the asm/pci.h include from + os-support/linux/lnx_axp.c. Include "lnx.h" and instead. + + -- Julien Cristau Sat, 14 Jul 2007 20:09:35 +0200 + +xorg-server (2:1.3.0.0.dfsg-10) unstable; urgency=medium + + * hw/xfree86/common/compiler.h and declare incompatible + prototypes for outb and friends, so change the patch from -9 to not + #include and rely on declarations in lnx.h itself for the + IOBASE_* macros. + + -- Julien Cristau Sat, 14 Jul 2007 18:06:14 +0200 + +xorg-server (2:1.3.0.0.dfsg-9) unstable; urgency=medium + + * Include instead of in + hw/xfree86/os-support/linux/lnx.h, as the latter isn't exported to + userspace anymore; fixes FTBFS on alpha. Thanks, Steve Langasek! + + -- Julien Cristau Sat, 14 Jul 2007 12:17:10 +0200 + +xorg-server (2:1.3.0.0.dfsg-8) unstable; urgency=medium + + * Medium-urgency upload to get the fix for #428794 in testing faster, + hopefully. + + [ Brice Goglin ] + * Add 47_fbdevhw_magic_numbers.diff: patch by Adam Jackson to keep the + fbdev2xfree_timing() function from changing the pixel clock value if the + fbdev driver claims that it is 0. + + [ Julien Cristau ] + * Don't build the type1 font module. + * Add patch by Alan Coopersmith to map (case-insensitively) the old + "keyboard" input driver to "kbd" (addresses: #428794). I'm not + reassigning the bug to xserver-xorg-core for now so as not to break + testing by letting xserver-xorg-input-keyboard transition before the fixed + xorg-server. + + -- Julien Cristau Sat, 14 Jul 2007 01:48:20 +0200 + +xorg-server (2:1.3.0.0.dfsg-7) unstable; urgency=low + + [ Brice Goglin ] + * Add 40_consolidate_portPriv_pDraw_assignments.diff to avoid a crash + in xf86XVReputVideo (closes: #424899, #431655). + * Add 41_vbe_filter_less.diff to not reject VESA modes early since + xf86ValidateModes should handle them just fine (closes: #424684). + * Add 42_only_run_special_key_behaviours_on_non-XKB.diff to fix special + keys in Xephyr (closes: #415025). + * Add 43_xephyr_crash_at_exit.diff to avoid crashing Xephyr when first + client disconnect (closes: #420421). + + -- Julien Cristau Wed, 04 Jul 2007 23:42:40 +0200 + +xorg-server (2:1.3.0.0.dfsg-6) unstable; urgency=low + + * Change fglrx conflict to << 8.37.6 (closes: #424975). + + -- Julien Cristau Fri, 01 Jun 2007 14:58:39 +0200 + +xorg-server (2:1.3.0.0.dfsg-5) unstable; urgency=low + + [ Brice Goglin ] + * Add 24_hurd_ioperm_fix.diff to fix xf86Enable/DisableIO on Hurd with + recent GNU Mach. Thanks Samuel Thibault! + * Add 06_use_proc_instead_of_sysfs_for_pci_domains.diff since sysfs-based + PCI management code is broken at least on sparc and powerpc. + Closes: #422077, #422095. Thanks to Jim Watson for testing! + * Install the Xephyr README, closes: #395888. + * Update 07_xorgconf_manpage_overhaul.diff to drop the reference to the + xorg.conf example which we do not install since Xserver 1.3 does automatic + configuration, the manpage is very well documented, and we generate a + config file during installation. Closes: #222932. + * Fix warning in /etc/init.d/xprint when /usr/lib/X11/fonts does not exist. + Closes: #422352. Thanks Cristian Ionescu-Idbohrn! + * Pull upstream commit 9c80eda826448822328bb678a7d284cc43fffb17 to disable + RandR's fake xinerama geometry when there's more than one protocol screen + (closes: #420679). + + [ Julien Cristau ] + * Add patch to make sure that the ramdac symbols are present in the server + and drivers can use them (closes: #423129). + * xserver-xorg-core Conflicts with fglrx-driver, which broke with 1.3. + We'll need to make this versioned (or drop it) when fglrx is fixed. + + -- Julien Cristau Wed, 16 May 2007 15:17:55 +0200 + +xorg-server (2:1.3.0.0.dfsg-4) unstable; urgency=low + + * Cherry-pick patch from upstream git to fix security issue in the Xrender + extension: malicious clients can cause a division by zero in the server + (closes: #422936). Reference: CVE-2007-2437. Thanks, Micah Anderson! + + -- Julien Cristau Wed, 09 May 2007 02:11:08 +0200 + +xorg-server (2:1.3.0.0.dfsg-3) unstable; urgency=low + + * Include 94_use_default_font_path.diff. This patch is like Eugene's patch + to always look in the default font path from the past, but now we provide + an option to disable looking in the default font path at runtime. This + will allow people to specify additional font paths in their xorg.conf + without losing their current paths. This will also help avoid people + having ye olde "fixed font" problem. + * Fix compilation warnings for 05_module_defaults.diff. Previously the patch + used a generic pointer for the options record, but now we use the actual + XF86OptionsPtr type. + + -- David Nusinow Thu, 26 Apr 2007 22:39:52 -0400 + +xorg-server (2:1.3.0.0.dfsg-2) unstable; urgency=low + + * Add Brice Goglin's fix for 05_module_defaults.diff, so that it also works + when there is no module section at all. Thanks to Michel Dänzer for + helping also. + + -- David Nusinow Sat, 21 Apr 2007 09:34:12 -0400 + +xorg-server (2:1.3.0.0.dfsg-1) unstable; urgency=low + + * Upload to unstable. + * Add XS-Vcs-* to debian/control. + * Remove non-free file hw/xfree86/doc/README.DRI from the upstream tarball. + * Bump serverminver to 2:1.3.0.0. + + -- Julien Cristau Fri, 20 Apr 2007 07:54:14 +0200 + +xorg-server (2:1.3.0.0-1) experimental; urgency=low + + * New upstream release + + -- David Nusinow Thu, 19 Apr 2007 22:27:05 -0400 + +xorg-server (2:1.2.99.905-3) experimental; urgency=low + + [ Julien Cristau ] + * xvfb now Recommends: xfonts-base (closes: #314598). + + [ David Nusinow ] + * Add 05_module_defaults.diff. This provides default modules loading + capabilities for the server that may be overrided easily. Previously the + server would load a set of default modules, but only if none were + specified in the xorg.conf, or if you didn't have a xorg.conf at all. This + patch provides a default set and you can add only the "Load" instructions + to xorg.conf that you want without losing the defaults. Similarly, if you + don't want to load a module that's loaded by default, you can add + "Disable modulename" to your xorg.conf (see man xorg.conf in this release + for details). See upstream bug #10541 for more. + + -- David Nusinow Sun, 15 Apr 2007 11:17:45 -0400 + +xorg-server (2:1.2.99.905-2) experimental; urgency=low + + * Install the cvt and gtf utilities and their manpages (closes: #414792). + * Build the xserver-xorg-core-dbg package, which contains debugging symbols + for Xorg and /usr/lib/xorg/modules/**/*.so + + -- Julien Cristau Mon, 09 Apr 2007 20:38:22 +0200 + +xorg-server (2:1.2.99.905-1) experimental; urgency=low + + * New upstream release candidate. + + includes fix for CVE-2007-1003: XC-MISC Extension ProcXCMiscGetXIDList() + Memory Corruption. + + -- Julien Cristau Fri, 06 Apr 2007 12:05:40 +0200 + +xorg-server (2:1.2.99.903-1) experimental; urgency=low + + [ Drew Parsons ] + * Add exclude entries to dh_install in debian/rules. + + [ Julien Cristau ] + * Prepare packaging to ship debugging symbols for xserver-xorg-core in + xserver-xorg-core-dbg, but leave it commented out so we can get rc3 in the + archive first. + * New upstream release candidate. + + bump serverminver to 2:1.2.99.903. + + -- Julien Cristau Tue, 27 Mar 2007 07:33:29 +0200 + +xorg-server (2:1.2.99.902-1) experimental; urgency=low + + [ Drew Parsons ] + * Bring xprint back into the xorg fold. + - include existing patches: + - 91_ttf2pt1 allows Xprint to use ttf2pt1 for Type1 font handling + (but extract and apply manually the patch to + hw/xprint/ps/Makefile.am so it may be applied by autoconf) + - 91_ttf2pt1_updates brings ttf2pt1 into the modern X11R7.1 world + - 92_xprint-security-holes-fix.patch places PS/PDF file output + into the user's home directory (~/Xprintjobs), more secure than + a shared /tmp/Xprintjobs + - 93_spooltodir_check_file_exists ensures output filenames are + less than 256 characters in length + - 93_xprint_fonts_fix released references to font names after use. + - enable freetype support for Xprint. + - add descriptions to debian/control and Build-Dependency on + x11proto-print-dev + * Run autoreconf to update changes to hw/xprint/ps/Makefile.am. + + [ Brice Goglin ] + * Apply patch from adrian@smop.co.uk to our xvfb-run wrapper + to check whether Xvfb started ok and fix its cleanup + (closes: #351042). + + [ Julien Cristau ] + * New upstream release candidate. + * Bump serverminver to 2:1.2.99.902. + * Drop patch 42_build_int10_submodules.diff, and use x86emu on all + architectures instead (closes: #410879). + * Refresh patches: + + 12_security_policy_in_etc.diff + + 21_glx_align_fixes.patch + + 23_kfreebsd_support.diff + * Delete a few files generated by configure on clean, since they seem to + have been included in the tarball. + + -- Julien Cristau Thu, 15 Mar 2007 04:28:00 +0100 + +xorg-server (2:1.2.99.901-1) experimental; urgency=low + + * New upstream release candidate. + + Remove patches 24 (hurd support), 35 (randr byteswap) and 43 (set damage + version), applied upstream. + + Bump build-dep on x11proto-randr-dev to >= 1.2, and on + x11proto-damage-dev to >= 1.1. + + -- Julien Cristau Wed, 7 Mar 2007 19:58:53 +0100 + +xorg-server (2:1.2.0-6) experimental; urgency=low + + * Set videoabiver to 1.0, same as in xorg-server 1.1. + + -- Julien Cristau Fri, 2 Mar 2007 16:38:12 +0100 + +xorg-server (2:1.2.0-5) experimental; urgency=low + + * Add input ABI versioning metadata. Rename serverabiver file to + videoabiver, and add inputabiver. Bump serverminver to 2:1.2.0-5 to deal + with this change. + + -- David Nusinow Thu, 1 Mar 2007 22:09:45 -0500 + +xorg-server (2:1.2.0-4) experimental; urgency=low + + [ Julien Cristau ] + * Don't strip modules when DEB_BUILD_OPTIONS contains nostrip. Thanks, + Cyril Brulebois! + + [ David Nusinow ] + * Move serverabiver file to serverminver. Use serverabiver to store the + actual video ABI version number (1.1 right now). This will allow drivers + to automatically generate their Provides: xserver-xorg-video-* line when + built against a particular server version. The rename of the files + is to better denote what they actually are. + * Bump the serverminver to 2:1.2.0-4 because of this change + + -- David Nusinow Wed, 21 Feb 2007 21:53:51 -0500 + +xorg-server (2:1.2.0-3) experimental; urgency=low + + [ Julien Cristau ] + * Pass --with-os-name and --with-os-vendor to configure. + * Bump serverabiver to 2:1.2.0-1. + * Add patch from upstream git to set the supported damage version from the + server, instead of from the damage headers. xserver 1.2.0 supports damage + 1.0, not 1.1. + + -- Julien Cristau Sat, 17 Feb 2007 12:03:03 +0100 + +xorg-server (2:1.2.0-2) experimental; urgency=low + + * Delete useless debian/substvars. + * Change my email address in debian/control. + * Fix patch 42_build_int10_submodules.diff. The definition of + xf86InitInt10() was moved to int10/helper_exec.c between 1.1.1 and 1.2.0, + so we move it to int10/helper_mem.c, which we build in the main int10 + module, not the vm86 and x86emu submodules. Thanks to Cédric Augonnet and + Brice Goglin for the report and testing. + + -- Julien Cristau Sat, 10 Feb 2007 20:57:57 +0100 + +xorg-server (2:1.2.0-1) experimental; urgency=low + + * New upstream release. + + 40_xorg-xserver-1.1.0-dbe-render.diff dropped. + + 38_GetDrawableAttributes.patch dropped. + + 37_build-mesa-mipmap.patch dropped. + + 33_Xserver_man_typos.patch dropped. + + 24_hurd_support.diff massively reduced. + + 13_debian_add_xkbpath_env_variable.diff refreshed. + + 07_xorgconf_manpage_overhaul.diff updated. + + 42_build_int10_submodules.diff updated. + * Bump build-dep on mesa-swx11-source to >= 6.5.2. + * Version build-dependencies on x11proto-composite-dev and x11proto-kb-dev + to match configure.ac. + * Add build-dep on libxfixes-dev (needed for Xdmx). + + -- Julien Cristau Fri, 9 Feb 2007 20:54:27 +0100 + +xorg-server (2:1.1.99.903-1) experimental; urgency=low + + * New upstream release candidate. + * Forward-port patches: + * 07_xorgconf_manpage_overhaul.diff: refresh + * 12_security_policy_in_etc.diff: refresh + * 21_glx_align_fixes.patch: refresh + * 23_kfreebsd_support.diff: refresh + * 24_hurd_support.diff: refresh + * 34_xorg.conf_man_typos.patch: refresh + * 36_fix_ffs.patch: remove, applied upstream + * Bump build-dependency on libdrm-dev to (>= 2.3.0) because that is the X + server's minimum requirement. + + -- Thierry Reding Sat, 2 Dec 2006 12:44:59 +0100 + +xorg-server (2:1.1.99.902-1) experimental; urgency=low + + * Update to latest upstream release candidate. + * Forward-port patches: + * 02_libvgahw_gcc4_volatile_fix.diff: update + * 04_read_rom_in_chunks.diff: update + * 05_arm_cache_flush.diff: remove, applied upstream + * 06_arm_is_not_x86_and_has_no_vga.diff: remove, applied upstream + * 07_xorgconf_manpage_overhaul.diff: update + * 08_s390_servermd.diff: update + * 09_debian_xserver_rtff.diff: update + * 12_security_policy_in_etc.diff: update + * 13_debian_add_xkbpath_env_variable.diff: update + * 15_symlink_mesa.diff: remove, fixed upstream + * 16_s390_fix.diff: update + * 17_ignoreabi.diff: remove, applied upstream + * 18_execinfo_only_for_backtrace.patch: remove, applied upstream + * 18_execinfo_configured.patch: remove, applied upstream + * 19_configurable_misc_utils.patch: remove, applied upstream + * 20_mesa_6.5.1.diff: remove, applied upstream + * 21_glx_align_fixes.patch: update + * 22_xkb_cycle_3layouts.diff: remove, applied upstream + * 23_kfreebsd_support.diff: update, partially applied upstream + * 24_hurd_support.diff: update, partially applied upstream + * 25_tfp_damage.diff: remove, applied upstream + * 26_aiglx_happy_vt_switch.diff: remove, applied upstream + * 27_aiglx_locking.diff: remove, applied upstream + * 28_mesa_copy_sub_buffer.diff: remove, applied upstream + * 29_mesa_reseed_makefile.diff: remove, fixed upstream + * 30_fix_vmode_switch.diff: remove, fixed upstream + * 31_blocksigio.diff: remove, fixed upstream + * 32_disable_sparc_pci_bridge.diff: update + * 34_xorg.conf_man_typos.patch: update + * 35_randr_byteswap.patch: update + * 36_fix_ffs.patch: update + * 37_Fix-__glXDRIbindTexImage-for-32-bpp-on-big-endian-platforms.diff: + remove, applied upstream + * Upstream no longer ships a changelog, so don't try to install it. + * Add 37_build-mesa-mipmap.patch that adds the missing mipmap.c to libmain's + sources. + * Add 38_GetDrawableAttributes.patch which readds support for the + GetDrawableAttributes extension that's needed for compiz to work properly. + + -- Thierry Reding Fri, 1 Dec 2006 20:32:34 +0100 + +xorg-server (2:1.1.1-21) unstable; urgency=emergency + + * Security update. + * Fix integer overflow in the ProcXCMiscGetXIDList() function in the XC-MISC + extension. Reference: CVE-2007-1003. + + -- Julien Cristau Wed, 04 Apr 2007 00:34:51 +0200 + +xorg-server (2:1.1.1-20) unstable; urgency=low + + * xephyr: Add patch from upstream git to fix memory leak in + ephyrScreenFini(). Thanks, Guillem Jover! + + -- Julien Cristau Tue, 6 Mar 2007 22:20:14 +0100 + +xorg-server (2:1.1.1-19) unstable; urgency=high + + [ Drew Parsons ] + * Removed spurious space in default font line + (/usr/X11R6/lib/X11/fonts/Type1 not "/usr/X11R6/lib/ X11/fonts/Type1") + + [ David Nusinow ] + * Conflict with and replace xserver-common, because that package used to + provide the SecurityPolicy file. This is an RC bugfix because it breaks + upgrades, so it gets a high urgency. Thanks Christian Tsotras and Lionel + Elie Mamane for reporting and it. Closes: #402658 + + -- David Nusinow Wed, 28 Feb 2007 21:48:19 -0500 + +xorg-server (2:1.1.1-18) unstable; urgency=medium + + * Add patch from Fedora to make xephyr work on 64bit architectures + (closes: #405928). + + -- Julien Cristau Fri, 16 Feb 2007 22:20:08 +0100 + +xorg-server (2:1.1.1-17) unstable; urgency=medium + + * Make the int10 module usable on i386 with a 64bit kernel (closes: #409730). + + New patch 42_build_int10_submodules.diff, which allows us to build vm86 + and x86emu as two separate submodules, and make the int10 module itself + fall back to loading x86emu if vm86 calls fail. + + Add workaround for https://bugs.freedesktop.org/show_bug.cgi?id=7299 to + the above patch: move definition of Int10Current from int10/xf86int10.c + to int10/helper_mem.c. + + Drop the part of 39_alpha_build_flags.patch applying to + hw/xfree86/os-support/linux/Makefile.in, and run autoreconf with all + patches applied. + + -- Julien Cristau Wed, 7 Feb 2007 20:37:19 +0100 + +xorg-server (2:1.1.1-16) unstable; urgency=medium + + * New patch 41_xfree86_linux_acpi_fix_tokenizing.diff from upstream git to + fix a crash on acpi events (closes: #409443). + + -- Julien Cristau Sat, 3 Feb 2007 22:56:04 +0100 + +xorg-server (2:1.1.1-15) unstable; urgency=high + + * High-urgency upload for security bugfix. + * New patch 40_xorg-xserver-1.1.0-dbe-render.diff to fix multiple integer + overflows in the dbe and render extensions. + CVE IDs: CVE-2006-6101 CVE-2006-6102 CVE-2006-6103 + * Add myself to Uploaders, and remove Fabio and Branden, with their + permission. They're of course welcome back when they have more time! + + -- Julien Cristau Tue, 9 Jan 2007 15:45:46 +0100 + +xorg-server (2:1.1.1-14) unstable; urgency=high + + * The "let's drop 20 years of build logic and replace it with autoconf in a + single release, trust me, what could go wrong? " release + * High-urgency upload for RC bugfix + * New patch 39_alpha_build_flags.patch: no really, when they said + lnx_ev56.c should be built with -mcpu=ev56, they really meant it. + Closes: #392500. + + -- Steve Langasek Sun, 7 Jan 2007 15:19:08 -0800 + +xorg-server (2:1.1.1-13) unstable; urgency=medium + + [ Julien Cristau ] + * xserver-xorg-core recommends xfonts-base and suggests xfonts-100dpi | + xfonts-75dpi and xfonts-scalable. Also add explanation about fonts to the + long description, stolen from the old xserver-common package (closes: + #400654). + + [ David Nusinow ] + * This is important for upgrades to etch, and has no notable risk, so bump + priority to medium. + + -- David Nusinow Fri, 29 Dec 2006 19:57:51 -0500 + +xorg-server (2:1.1.1-12) unstable; urgency=low + + [ Julien Cristau ] + * Delete hw/xfree86/common/xf86Build.h in debian/rules clean, since it's + wrongly included in the upstream tarball. + + [ David Nusinow ] + * Pull fix for the ignore_abi.diff patch. This one's a major brown bag on my + part. Thanks Michel Dänzer. + * Add 38_wait_for_something_force_timer_reset.diff which forces the server + to reset timers when they've overrun in some cases rather than wait + forever. Patch by Daniel Stone. Thanks Michel Dänzer for pointing the + changes out. Closes: #374026 + + -- David Nusinow Tue, 12 Dec 2006 21:13:20 -0500 + +xorg-server (2:1.1.1-11) unstable; urgency=low + + [ Drew Parsons ] + * Patches 33_Xserver_man_typos.patch and 34_xorg.conf_man_typos.patch + fix minor typos in Xserver and xorg.conf man pages. + Closes: #364556, #308899. + * Add patch 35_randr_byteswap.patch from upstream. Fixes a client/server + byteswapping problem. Closes: #291100. + + [ Julien Cristau ] + * Don't build-depend on libdrm-dev on hurd-i386 (closes: #358015). Thanks, + Samuel Thibault. + * Update hurd support patch (closes: #356300). Thanks, Samuel Thibault. + * Add reportbug script stolen from the monolith, to add the user's config + and log file in every bug report. + * Delete hw/xfree86/common/xf86Build.h from our source tree, so that the + build date is correctly calculated at build time, and not hardcoded to + 07 July 2006. Thanks to Jurij Smakov for noticing. + * Add patch 36_fix_ffs.patch by Jurij Smakov to fix infinite loop in ffs() + if called with an argument of 0 (closes: #395564). + * Add patch 37_Fix-__glXDRIbindTexImage-for-32-bpp-on-big-endian-platforms + from upstream git to fix color issue on big endian platforms + (closes: #392453). Thanks to Michel Dänzer for the patch! + * Fix typo in xvfb-run (closes: #337703). + * Install xdmxconfig and its manpage in xdmx-tools (closes: #393991). + * Add Replaces: xdmx (<= 2:1.1.1-10) to xdmx-tools because of the xmdxconfig + manpage move. + + -- David Nusinow Fri, 24 Nov 2006 15:44:52 -0500 + +xorg-server (2:1.1.1-10) unstable; urgency=low + + [ Denis Barbier ] + * Fix video mode switching. Closes: #391052 + * Fix FTBFS on kfreebsd-i386 and kfreebsd-amd64. Thanks Petr Salinger. + Closes: #363517 + + [ David Nusinow ] + * Add depends on xserver-xorg so that /etc/X11/X gets installed. Thanks + Frans Pop. Closes: #392295 + * Add 31_blocksigio.diff. This patch by Alan Hourihane, and it prevents a + race condition when a driver tries to set the cursor state when the server + is in the middle of switching resolution. Thanks to Frans Pop for + reporting the bug, Michel Dänzer for reading through the backtrace and + diagnosing the problem, and Alan for the final patch. Closes: #390646. + + [ Jurij Smakov ] + * Add 32_disable_sparc_pci_bridge.diff. Disable PCI bridge handling on + sparc, which is broken and causes filesystem corruption (by poking + the PCI bus in the wrong places) on some machines. Closes: #392312. + + [ Drew Parsons ] + * Use __appmansuffix__ not __mansuffix__ in + 03_xnest_manpage_overhaul.diff. Closes: #390599. + * Install upstream ChangeLog. Closes: #365274. + + -- David Nusinow Mon, 16 Oct 2006 21:59:51 -0400 + +xorg-server (2:1.1.1-9) unstable; urgency=low + + [ Jurij Smakov ] + * Add 21_glx_align_fixes.patch to reintroduce the setting of __GLX_ALIGN64 + variable, lost during the modular transition. This setting is essential + for architectures with strong alignment requirements. Patch affects + alpha, sparc, amd64, ia64 and s390, mimicking the behaviour of the + monolithic build. Closes: #388125. + + [ Denis Barbier ] + * Add 22_xkb_cycle_3layouts.diff to fix layout switching when 3 layouts + are present. Thanks Ivan Pascal for the patch. Closes: #345803 + + [ David Nusinow ] + * Add kFreeBSD support patch (23). Thanks to Robert Millan, Petr Salinger, + Daniel Stone, and Michael Banck for input and patch writing. + Closes: #363517 + * Add hurd support patch (24). Thanks Samuel Thibault, Daniel Stone, and + Michael Banck. Closes: #356300 + * Disable the explicit enabling of dri in the configure. The configure + script autodetects whether or not to use this anyway, and enabling it + explicitly breaks the build on hurd. Thanks Samuel Thibault and Michael + Banck. Closes: #358015 + * Add several patches written by Kristian Høgsberg for allowing compiz to + work with AIGLX. These patches were vetted by Theirry Reding with valuable + advice from Michel Dänzer, and feedback from Kristian himself. + - 25_tfp_damage.diff + - 26_aiglx_happy_vt_switch.diff + - 27_aiglx_locking.diff + - 28_mesa_copy_sub_buffer.diff + - 29_mesa_reseed_makefile.diff + - update of 20_mesa_6.5.1.diff + * Remove bizarre wholesale inclusion of another patch in the 23_kbsd patch + + [ Eugene Konev ] + * Use --with-default-font-path instead of --with-fontdir. + * Set RGBPath through --with-rgb-path. + * Drop 11_debian_always_use_default_font_path.diff. + * Drop 14_debian_always_look_in_our_module_path.diff. + * Ship SecurityPolicy in xserver-xorg-core. + + -- David Nusinow Thu, 28 Sep 2006 23:59:35 -0400 + +xorg-server (2:1.1.1-8) unstable; urgency=low + + * Update mesa symlink patch to the latest from HEAD + * Add 20_mesa_6.5.1.diff to allow the server to build with mesa 6.5.1 + * Bump build-dep versions on x11proto-gl to 1.4.8, and mesa to 6.5.1 + + -- David Nusinow Mon, 25 Sep 2006 22:21:37 -0400 + +xorg-server (2:1.1.1-7) unstable; urgency=low + + * Fix s390 build issue. Thanks Bastian Blank for the report and Eugene Konev + for the patch. Closes: #388628. + * Disable build of various utilities that we don't ship anyway. Patch thanks + to Eugene Konev. + + -- David Nusinow Thu, 21 Sep 2006 23:07:16 -0400 + +xorg-server (2:1.1.1-6) unstable; urgency=low + + * Upload 7.1 to unstable. + + [ Drew Parsons ] + * Added SGI FreeB licence to debian/copyright. Closes: #368563. + * Apply upstream patches 18_execinfo_only_for_backtrace.patch, to use + execinfo.h for and only for backtrace. Applied git patch + 5a3488ccac8e5dabd9fc98bc41ef178ead1b2faf directly into configure scripts, + activated with autoreconf. Closes: #363218. + * Only requires build-depends version of x11proto-gl-dev on 1.4.6. + + [ Steve Langasek ] + * Add versioned build-depends on x11proto-fixes-dev (>= 4.0), to + ensure the package is built against the right protocol version. + Closes: #383778. + + -- David Nusinow Mon, 18 Sep 2006 18:30:07 -0400 + +xorg-server (2:1.1.1-5) experimental; urgency=low + + * Fix error in 16_s390_fix.diff caused by my idiot copying. Thanks Yannick + Roehlly and Daniel Stone. + + -- David Nusinow Sun, 27 Aug 2006 23:25:21 +0000 + +xorg-server (2:1.1.1-4) experimental; urgency=low + + [ Drew Parsons ] + * Tighten dependencies between X11R7.1 server and video drivers. + xserver-xorg-core no longer Depends: xserver-xorg-video-all + | xserver-xorg-video but instead Conflicts: xserver-xorg-video. + (closes: #383873) + The dependency on xserver-xorg-video-all | xserver-xorg-video-1.0 is + managed by the xserver-xorg binary package (not included here in + order to avoid circular dependencies). (closes: #362313) + * Likewise remove Depends: xserver-xorg-input-all | xserver-xorg-input + (again, handled by xserver-xorg) to avoid circular dependency with drivers. + + [ David Nusinow ] + * Epoch bump + * Add 17_ignoreabi.diff to allow users to simply set a value in xorg.conf + rather than pass -ignoreABI to the server every time it starts + + -- David Nusinow Wed, 23 Aug 2006 22:03:06 +0000 + +xorg-server (1:1.1.1-3) unstable; urgency=low + + * Add 16_s390_fix.diff to fix FTBFS on s390. Thanks Bastian Blank. + (closes: #362641) + * Bump build-depends version of libgl1-mesa-dev to 6.5.x package we have in + experimental currently + * Bump build-depends version of x11proto-gl-dev to 1.4.7 or greater + + -- David Nusinow Tue, 22 Aug 2006 00:57:31 +0000 + +xorg-server (1:1.1.1-2) experimental; urgency=low + + [ Drew Parsons ] + * Updated mesa-swx11-source build-depends to (>> 6.5.0), required + for xserver 1.1.1. (closes: #383334) + + [ David Nusinow ] + * Enable and ship xephyr + * Hack off the 'x' manpage suffix + * Install Xnest manpage + * Bump policy version to 3.7.2.0. No changes necessary. + + -- David Nusinow Wed, 16 Aug 2006 21:14:44 +0000 + +xorg-server (1:1.1.1-1) experimental; urgency=low + + [ David Nusinow ] + * New upstream release + * Move patch target call so that we don't try and build twice + * Remove obsolete 15_security_allocate_local.diff and + 16_SECURITY_setuid.diff + * Add 15_symlink_mesa.diff + + -- David Nusinow Sun, 6 Aug 2006 16:12:25 +0000 + +xorg-server (2:1.0.2-10) unstable; urgency=low + + * Upload to unstable to fixed messed up last upload which was supposed to go + to experimental. Brown bag o' joy. + + -- David Nusinow Tue, 22 Aug 2006 19:31:08 +0000 + +xorg-server (1:1.0.2-9) UNRELEASED; urgency=high + + [ Denis Barbier ] + * Fix 13_debian_add_xkbpath_env_variable.diff, XKBPATH environment + variable was not always taken into account. + + [ David Nusinow ] + * Remove two Ubuntu packaging holdovers. Have xvfb recommend xbase-clients + rather than xauth, and have xserver-xorg-core recommend xkb-data rather + than xkeyboard-config. Thanks Sterling MacNay. + * Security update. Fix for setuid privledge escalation vulernabilities. + See http://lists.freedesktop.org/archives/xorg/2006-June/016146.html for + the full advisory. + + [ Jurij Smakov ] + * Stop including the non-existent asm/kbio.h header file in + hw/xfree86/os-support/linux/lnx_{io,kbd}.c to avoid the build failure + on sparc. + + -- David Nusinow Sat, 1 Jul 2006 17:20:45 -0400 + +xorg-server (1:1.0.2-8) unstable; urgency=low + + * Move xserverrc back to xbase-clients. Thanks Benjamin Mesing. + * Add 15_security_allocate_local.diff. This fixes Bug fd.o bug #6642. + Fix buffer overflow in Render. (CVE 2006-1526). Patch by Eric Anholt. + + -- David Nusinow Tue, 2 May 2006 21:47:17 -0400 + +xorg-server (1:1.0.2-7) unstable; urgency=low + + * Ship xserverrc again in /etc/X11/xinit. Thanks Bastian Kleineidam and + Vasilis Vasaitis. (closes: #357713) + + -- David Nusinow Wed, 26 Apr 2006 00:01:16 -0400 + +xorg-server (1:1.0.2-6) unstable; urgency=low + + [ David Nusinow ] + * Use -DNO_INLINE on s390. Thanks Bastian Blank and Julien Cristau. + (closes: #362641) + * Re-add xvfb-run and manpage to xvfb package. Thanks Josselin Mouette and + Jamie Wilkinson. (closes: #363494) + * Add 014_debian_always_look_in_our_module_path.diff. This will cause the + server to always look in the default module path even if they've specified + an alternate path in their xorg.conf file via the ModulePath option. A + note to users: you should remove this part of your xorg.conf unless you + need it, as the server will look in the right place for modules if you + don't specify a location. + * Run dh_install with --list-missing + * Add missing manpages all around. Thanks Roland Mas and Jan Hudec. + (closes: #362489, #364199) + * Actually install apps to xdmx-tools. Thanks Xavier Bestel. + (closes: #356813) + + [ Denis Barbier ] + * Add 13_debian_add_xkbpath_env_variable.diff so that the server takes + the XKBPATH environment variable into account. (closes: #363229) + + -- David Nusinow Sat, 22 Apr 2006 17:06:23 -0400 + +xorg-server (1:1.0.2-5) unstable; urgency=low + + * Add 11_debian_always_use_default_font_path.diff from Eugene Konev. This + patch causes the server to add the default font path to whatever the user + has specified. Right now, that's /usr/share/fonts/X11, as defined on + configure in debian/rules. Thanks Eugene, this will definitely go a long + way. + * Document how to get rid of error loading glcore (and other modules) in + NEWS.Debian. Thanks Matej Vela and others. + * Provide the virtual 'xserver' package. Thanks Steve Langasek and Daniel + Stone. (closes: #362750) + * Add 12_security_policy_in_etc.diff from Eugene Konev. This will allow us + to tell the server on configure to look in /etc/X11/xserver for the + SecurityPolicy file. Thanks Joey Hess and Eugene. (closes: #362246) + + -- David Nusinow Mon, 17 Apr 2006 00:34:08 -0400 + +xorg-server (1:1.0.2-4) unstable; urgency=low + + * Document the need to update paths in xserver-xorg-core's NEWS file. + (closes: #362077, #362244, #362431) + * Make xserver-xorg-core Architecture: any. (closes: #362150) + * Build with --with-fontdir=/usr/share/fonts/X11. Remove + --with-default-font-path option to make this work. Thanks Eugene Konev. + + -- David Nusinow Thu, 13 Apr 2006 23:54:06 -0400 + +xorg-server (1:1.0.2-3) unstable; urgency=low + + * Add build-conflicts on xlibs-static-dev. Thanks Zephaniah E. Hull. + + -- David Nusinow Tue, 11 Apr 2006 18:44:51 -0400 + +xorg-server (1:1.0.2-2) unstable; urgency=low + + * Upload to unstable + * Add versioned build-dep on libdmx-dev. Thanks Frank Lichtenheld. + (closes: #361752) + + -- David Nusinow Mon, 10 Apr 2006 19:34:04 -0400 + +xorg-server (1:1.0.2-1) experimental; urgency=low + + [ David Nusinow ] + * New upstream release. Fixes CVE-2006-0745 + + [ Denis Barbier ] + * Set XKB base path to /usr/share/X11/xkb. + + -- David Nusinow Mon, 20 Mar 2006 21:41:04 -0500 + +xorg-server (1:1.0.1-2) experimental; urgency=low + + [ David Nusinow ] + * Add versioned dependency on x11-common + * Remove old cruft in our patches directory + * Port patches from trunk + + 030_libvgahw_gcc4_volatile_fix.diff + + general/026_xc_programs_manpage_overhaul.diff + + arm/303_arm_cache_flush.diff + + arm/315_arm_is_not_x86_and_has_no_vga.diff + + general/099e_xorgconf_manpage_overhaul.diff + + s390/500_s390_support.diff + + debian/910_debian_Xserver_RTFF.diff + * add 04_read_rom_in_chunks.diff. This reads PCI ROM in large chunks rather + than one byte at a time. This patch by Alex Williamson and forwarded to us + by Dann Frazier. Thanks to both of them. (closes: #353168) + * Don't build xserver-xorg-core on s390. This means putting all the other + arches as being explicitly listed. Damn !s390. + * Version the conflict with xserver-xfree86 to allow for the transition + package to be installed + * Remove README.DRI, as it is non-free. Add it to prune list. + * Add 10_dont_look_in_home_for_config.diff to prevent looking in a user's + home directory for xorg.conf. Thanks Daniel Stone for the patch. + + -- David Nusinow Sun, 12 Mar 2006 16:18:13 -0500 + +xorg-server (1:1.0.1-1) experimental; urgency=low + + * First upload to Debian + * Add bison and flex to the build-depends + * Define INSTALL in debian/rules + * Add xserver-xorg-core dependency xserver-xorg-video-all | + xserver-xorg-video. The former is a metapackage that depends on all the + video drivers we ship and the latter is a virtual package that each video + driver provides. This scheme will install the metapackage by default but + will permit any single video driver to satsify the dependency. Do the same + thing for the input drivers. + * switch dpatch build-dependency to quilt + * Deal with mesa packaging rename: build-dep on mesa-swrast-source -> + mesa-swx11-source + * Change xserver-core depends to be on x11-common rather than xorg-common + * Have xserver-xorg-dev install the files in /usr/share/aclocal so we get + xorg-server.m4 + * Manually set permissions on serverabiver installation + * Set the default font path to /usr/share/fonts/X11 instead of + /usr/share/X11/fonts. Thanks Eugene Konev. + + -- David Nusinow Mon, 20 Feb 2006 00:18:45 -0500 + +xorg-server (1:0.99.2+cvs.20051025-3) dapper; urgency=low + + * Version mesa-swrast-source Build-Dep to 6.4.0 or higher, so GLcore is a + little less crash-happy (e.g. when moving your glxgears window). + * Export /usr/share/xserver-xorg/serverabiver to xserver-xorg-dev, which + describes the relationship needed from a driver on xserver-xorg-core. + + -- Daniel Stone Fri, 28 Oct 2005 13:00:26 +1000 + +xorg-server (1:0.99.2+cvs.20051025-2) dapper; urgency=low + + * Add Build-Deps on libxaw7-dev, libxmu-dev, libxt-dev, libxpm-dev, + libx11-dev, libxtst-dev, and libxres-dev for DMX utils. + + -- Daniel Stone Wed, 26 Oct 2005 14:34:40 +1000 + +xorg-server (1:0.99.2+cvs.20051025-1) dapper; urgency=low + + * Update to new upstream version. + * All applicable patches have been committed upstream, bar #989 and #990. + + -- Daniel Stone Thu, 20 Oct 2005 10:26:33 +1000 + +xorg-server (1:0.99.0+cvs.20050901-1) breezy; urgency=low + + * First xorg-server release. + + -- Daniel Stone Wed, 6 Jul 2005 15:48:17 +1000 --- xorg-server-1.18.2.orig/debian/compat +++ xorg-server-1.18.2/debian/compat @@ -0,0 +1 @@ +9 --- xorg-server-1.18.2.orig/debian/control +++ xorg-server-1.18.2/debian/control @@ -0,0 +1,414 @@ +Source: xorg-server +Section: x11 +Priority: optional +Maintainer: Debian X Strike Force +Build-Depends: + debhelper (>= 9), + po-debconf, + dpkg-dev (>= 1.16.1), + quilt, + lsb-release, + pkg-config, + bison, + flex, + automake, + libtool, + xutils-dev (>= 1:7.6+4), + xfonts-utils (>= 1:7.5+1), + x11proto-bigreqs-dev (>= 1:1.1.0), + x11proto-composite-dev (>= 1:0.4), + x11proto-core-dev (>= 7.0.28), + x11proto-damage-dev (>= 1.1), + x11proto-fixes-dev (>= 1:5.0), + x11proto-fonts-dev (>= 2.1.3), + x11proto-kb-dev (>= 1.0.3), + x11proto-xinerama-dev, + x11proto-randr-dev (>= 1.5.0), + x11proto-record-dev (>= 1.13.99.1), + x11proto-render-dev (>= 2:0.11), + x11proto-resource-dev (>= 1.2.0), + x11proto-scrnsaver-dev, + x11proto-video-dev, + x11proto-xcmisc-dev (>= 1.2.0), + x11proto-xext-dev (>= 7.2.99.901), + x11proto-xf86bigfont-dev (>= 1.2.0), + x11proto-xf86dga-dev (>= 2.0.99.1), + x11proto-xf86vidmode-dev (>= 2.2.99.1), + x11proto-present-dev, + x11proto-dri3-dev, + xtrans-dev (>= 1.3.5), + libxau-dev (>= 1:1.0.5-2), + x11proto-input-dev (>= 2.3), + x11proto-dri2-dev (>= 2.8), + libxdmcp-dev (>= 1:0.99.1), + libxfont-dev (>= 1:1.4.2), + libxkbfile-dev (>= 1:0.99.1), + libpixman-1-dev (>= 0.27.2), + libpciaccess-dev (>= 0.12.901), + libgcrypt-dev, + nettle-dev, + libudev-dev (>= 151-3) [linux-any], + libselinux1-dev (>= 2.0.80) [linux-any], + libaudit-dev [linux-any], + x11proto-xf86dri-dev (>= 2.1.0), + libdrm-dev (>= 2.4.46) [!hurd-i386], + x11proto-gl-dev (>= 1.4.17), + libgl1-mesa-dev (>= 9.2), + libxmuu-dev (>= 1:0.99.1), + libxext-dev (>= 1:0.99.1), + libx11-dev (>= 2:1.6), + libxrender-dev (>= 1:0.9.0), + libxi-dev (>= 2:1.6.99.1), + x11proto-dmx-dev (>= 1:2.2.99.1), + libdmx-dev (>= 1:1.0.1), + libxpm-dev (>= 1:3.5.3), + libxaw7-dev (>= 1:0.99.1), + libxt-dev (>= 1:0.99.1), + libxmu-dev (>= 1:0.99.1), + libxtst-dev (>= 1:0.99.1), + libxres-dev (>= 1:0.99.1), + libxfixes-dev (>= 1:3.0.0), + libxv-dev, + libxinerama-dev, + libxshmfence-dev (>= 1.1) [!hurd-i386], +# glamor + libepoxy-dev [linux-any kfreebsd-any], + libegl1-mesa-dev [linux-any kfreebsd-any], + libgbm-dev (>= 10.2) [linux-any kfreebsd-any], +# XCB bits for Xephyr + libxcb1-dev, + libxcb-shape0-dev, + libxcb-render0-dev, + libxcb-render-util0-dev, + libxcb-util0-dev, + libxcb-image0-dev, + libxcb-icccm4-dev, + libxcb-shm0-dev, + libxcb-keysyms1-dev, + libxcb-randr0-dev, + libxcb-xv0-dev, + libxcb-glx0-dev, + libxcb-xf86dri0-dev (>= 1.6), +# unit tests + xkb-data, + x11-xkb-utils, +# getpeereid() + libbsd-dev [kfreebsd-any], +# xwayland + libwayland-dev [linux-any], +#logind + libdbus-1-dev (>= 1.0) [linux-any], +# systemd-daemon + libsystemd-dev [linux-any], +Standards-Version: 3.9.6 +Vcs-Git: https://anonscm.debian.org/git/pkg-xorg/xserver/xorg-server.git +Vcs-Browser: https://anonscm.debian.org/cgit/pkg-xorg/xserver/xorg-server.git +Homepage: http://www.x.org/ + +Package: xserver-xorg-core +Architecture: any +Depends: + xserver-common (>= ${source:Version}), + keyboard-configuration [linux-any kfreebsd-any], + udev (>= 149) [linux-any], + devd [kfreebsd-any], +# for glamor; not a shlibdep because we use epoxy + libegl1-mesa [linux-any kfreebsd-any] | libegl1 [linux-any kfreebsd-any], + ${shlibs:Depends}, + ${misc:Depends}, +Recommends: + libgl1-mesa-dri (>= 7.10.2-4), + libpam-systemd, +Suggests: xfonts-100dpi | xfonts-75dpi, xfonts-scalable +Breaks: + xserver-xorg-video, + xserver-xorg-video-1.0, + xserver-xorg-video-1.9, + xserver-xorg-video-2, + xserver-xorg-video-4, + xserver-xorg-video-5, + xserver-xorg-video-6, + xserver-xorg-input, + xserver-xorg-input-2, + xserver-xorg-input-2.1, + xserver-xorg-input-4, + xserver-xorg-input-7, + xserver-xorg-input-wacom (<< 0.7.8), + xserver-xorg-input-joystick (<= 1:1.5.0-3), + xserver-xorg-input-synaptics (<= 1.2.2-1), + xserver-xorg-input-tslib (<= 0.0.6-3), + xserver-xorg-input-vmmouse (<= 1:12.6.5-4), + xserver-xorg-input-wacom (<= 0.10.5+20100415-1), + xserver-xorg-video-cyrix (<= 1:1.1.0-8), + xserver-xorg-video-i810 (<< 2:2.4), + xserver-xorg-video-imstt (<= 1:1.1.0-7), + xserver-xorg-video-nsc (<= 1:2.8.3-4), + xserver-xorg-video-sunbw2 (<= 1:1.1.0-5), + xserver-xorg-video-v4l (<< 1:0.2.0), + xserver-xorg-video-vga (<= 1:4.1.0-8), + libgl1-mesa-dri (<< 7.10.2-4), + libgl1-mesa-dri-experimental (<< 7.10.2-4), + xserver-xorg (<< 1:7.7+10~), + systemd (<< 226-4~), +Replaces: + xserver-xorg-video-modesetting, + xserver-xorg (<< 1:7.7+10~), +Conflicts: + xserver-xorg-input-evtouch, + xserver-xorg-video-modesetting, +Provides: + ${videoabi}, + ${inputabi}, + xserver-xorg-video-modesetting, +Description: Xorg X server - core server + The Xorg X server is an X server for several architectures and operating + systems, which is derived from the XFree86 4.x series of X servers. + . + The Xorg server supports most modern graphics hardware from most vendors, + and supersedes all XFree86 X servers. + . + More information about X.Org can be found at: + + . + This package is built from the X.org xserver module. + +Package: xserver-xorg-core-udeb +XC-Package-Type: udeb +Section: debian-installer +# exclude sparc because of linker errors +Architecture: any +Depends: +# merged: xserver-common (>= ${source:Version}), + xkb-data-udeb, + x11-xkb-utils-udeb, +# disabled: keyboard-configuration [linux-any kfreebsd-any], + udev-udeb (>= 149) [linux-any], + devd-udeb [kfreebsd-any], + ${shlibs:Depends}, + ${misc:Depends}, +Provides: + ${videoabi}, + ${inputabi}, +Description: Xorg X server - core server + This is a udeb, or a microdeb, for the debian-installer. + +Package: xserver-xorg-dev +Architecture: any +Depends: + libpixman-1-dev (>= 0.27.2), + x11proto-core-dev (>= 7.0.28), + x11proto-input-dev (>= 2.3), + x11proto-xext-dev (>= 7.2.99.901), + x11proto-video-dev, + x11proto-randr-dev (>= 1.5.0), + x11proto-render-dev (>= 2:0.11), + x11proto-dri2-dev (>= 2.8), + x11proto-gl-dev (>= 1.4.17), + x11proto-fonts-dev (>= 2.1.3), + x11proto-xinerama-dev, + x11proto-kb-dev, + x11proto-xf86dri-dev, + x11proto-resource-dev (>= 1.2.0), + x11proto-scrnsaver-dev, + x11proto-xf86bigfont-dev (>= 1.2.0), + x11proto-dri3-dev, + x11proto-present-dev, + libxfont-dev, + libxkbfile-dev, + libpciaccess-dev, + mesa-common-dev, + ${misc:Depends}, +Description: Xorg X server - development files + This package provides development files for the X.Org ('Xorg') X server. + This is not quite the same as the DDK (Driver Development Kit) from the + XFree86 4.x and X.Org 6.7, 6.8 and 6.9 series of servers; it provides + headers and a pkg-config file for drivers using autotools to build + against. + . + Unless you are developing or building a driver, you probably want + xserver-xorg and/or xserver-xorg-core instead. + . + More information about X.Org can be found at: + + . + This package is built from the X.org xserver module. + +Package: xdmx +Architecture: any +Depends: + xserver-common (>= ${source:Version}), + ${shlibs:Depends}, + ${misc:Depends}, +Description: distributed multihead X server + Xdmx is a proxy X server that uses one or more other X servers as its + display device(s). It provides multi-head X functionality for displays that + might be located on different machines. Xdmx functions as a front-end X server + that acts as a proxy to a set of back-end X servers. All of the visible + rendering is passed to the back-end X servers. Clients connect to the Xdmx + front-end, and everything appears as it would in a regular multi-head + configuration. If Xinerama is enabled (e.g., with +xinerama on the command + line), the clients see a single large screen. + . + More information about X.Org can be found at: + + . + This package is built from the X.org xserver module. + +Package: xdmx-tools +Architecture: any +Depends: + xdmx, + ${shlibs:Depends}, + ${misc:Depends}, +Description: Distributed Multihead X tools + This package provides a collection of tools used for administration of + the Xdmx server; see the xdmx package for more information. + . + More information about X.Org can be found at: + + . + This package is built from the X.org xserver module. + +Package: xnest +Architecture: any +Depends: + xserver-common (>= ${source:Version}), + ${shlibs:Depends}, + ${misc:Depends}, +Recommends: libgl1-mesa-dri (>= 7.1~rc1) +Provides: xserver +Description: Nested X server + Xnest is a nested X server that simply relays all its requests to another + X server, where it runs as a client. This means that it appears as another + window in your current X session. Xnest relies upon its parent X server + for font services. + . + Use of the Xephyr X server instead of Xnest is recommended. + . + More information about X.Org can be found at: + + . + This package is built from the X.org xserver module. + +Package: xvfb +Architecture: any +Depends: + xserver-common (>= ${source:Version}), + ${shlibs:Depends}, + ${misc:Depends}, +Recommends: xauth +Provides: xserver +Multi-Arch: foreign +Description: Virtual Framebuffer 'fake' X server + Xvfb provides an X server that can run on machines with no display hardware + and no physical input devices. It emulates a dumb framebuffer using virtual + memory. The primary use of this server was intended to be server testing, + but other novel uses for it have been found, including testing clients + against unusual depths and screen configurations, doing batch processing with + Xvfb as a background rendering engine, load testing, as an aid to porting the + X server to a new platform, and providing an unobtrusive way to run + applications that don't really need an X server but insist on having one + anyway. + . + This package also contains a convenience script called xvfb-run which + simplifies the automated execution of X clients in a virtual server + environment. This convenience script requires the use of the xauth + program. + . + More information about X.Org can be found at: + + . + This package is built from the X.org xserver module. + +Package: xserver-xephyr +Architecture: any +Depends: + xserver-common (>= ${source:Version}), + ${shlibs:Depends}, + ${misc:Depends}, +Recommends: libgl1-mesa-dri (>= 7.1~rc1) +Provides: xserver +Description: nested X server + Xephyr is an X server that can be run inside another X server, + much like Xnest. It is based on the kdrive X server, and as a + result it supports newer extensions than Xnest, including render and + composite. + . + More information about X.Org can be found at: + + . + This package is built from the X.org xserver module. + +Package: xserver-xorg-core-dbg +Architecture: any +Depends: + xserver-xorg-core (= ${binary:Version}), + ${misc:Depends}, +Priority: extra +Section: debug +Description: Xorg - the X.Org X server (debugging symbols) + The Xorg X server is an X server for several architectures and operating + systems, which is derived from the XFree86 4.x series of X servers. + . + The Xorg server supports most modern graphics hardware from most vendors, + and supersedes all XFree86 X servers. + . + This package provides debugging symbols for the Xorg X server and associated + modules. + +Package: xserver-common +Architecture: all +Multi-Arch: foreign +Depends: + x11-common, + xkb-data, + x11-xkb-utils, + ${misc:Depends}, +Recommends: + xfonts-base, + xauth, +Replaces: xserver-xorg-core (<< 2:1.5.2) +Description: common files used by various X servers + This package provides files necessary for all X.Org based X servers. + +Package: xorg-server-source +Architecture: all +Depends: + ${misc:Depends}, +Description: Xorg X server - source files + This package provides original Debian (with Debian patches already + applied, and autotools files updated) sources for the X.Org ('Xorg') + X server shipped in a tarball. This enables other projects re-using + X server codebase (e.g. VNC servers) to (re-)use officially + Debian-supported version of the X xserver for their builds. + . + Unless you are building a software product using X server sources, + you probably want xserver-xorg and/or xserver-xorg-core instead. + +Package: xwayland +Architecture: linux-any +Depends: + xserver-common (>= ${source:Version}), + ${shlibs:Depends}, + ${misc:Depends}, +Description: Xwayland X server + This package provides an X server running on top of wayland, using wayland + input devices for input and forwarding either the root window or individual + top-level windows as wayland surfaces. + +Package: xserver-xorg-legacy +Architecture: any +Priority: extra +Depends: + xserver-common (>= ${source:Version}), + ${shlibs:Depends}, + ${misc:Depends}, +Breaks: + x11-common (<< 1:7.7+10~), + xserver-xorg-core (<< 2:1.17.2-3~), +Replaces: + x11-common (<< 1:7.7+10~), + xserver-xorg-core (<< 2:1.17.2-3~), +Description: setuid root Xorg server wrapper + This package provides a wrapper for the Xorg X server, which is + necessary for legacy drivers and non-Linux kernels. --- xorg-server-1.18.2.orig/debian/copyright +++ xorg-server-1.18.2/debian/copyright @@ -0,0 +1,1847 @@ +The following is the 'standard copyright' agreed upon by most contributors, +and is currently the canonical license preferred by the X.Org Foundation. +This is a slight variant of the common MIT license form published by the +Open Source Initiative at http://www.opensource.org/licenses/mit-license.php + +Copyright holders of new code should use this license statement where +possible, and insert their name to this list. Please sort by surname +for people, and by the full name for other entities (e.g. Juliusz +Chroboczek sorts before Intel Corporation sorts before Daniel Stone). + +Copyright © 2011 Dave Airlie +Copyright © 2000-2001 Juliusz Chroboczek +Copyright © 1998 Egbert Eich +Copyright © 2006-2007 Intel Corporation +Copyright © 2006 Nokia Corporation +Copyright © 2006-2008 Peter Hutterer +Copyright © 2006 Adam Jackson +Copyright © 2009-2010 NVIDIA Corporation +Copyright © 1987, 2003-2006, 2008-2010 Oracle and/or its affiliates. +Copyright © 1999 Keith Packard +Copyright © 2007-2009 Red Hat, Inc. +Copyright © 2005-2008 Daniel Stone +Copyright © 2006-2009 Simon Thum +Copyright © 2003-2008, 2013 Geert Uytterhoeven +Copyright © 2006 Luc Verhaegen + +Permission is hereby granted, free of charge, to any person obtaining a +copy of this software and associated documentation files (the "Software"), +to deal in the Software without restriction, including without limitation +the rights to use, copy, modify, merge, publish, distribute, sublicense, +and/or sell copies of the Software, and to permit persons to whom the +Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice (including the next +paragraph) shall be included in all copies or substantial portions of the +Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +DEALINGS IN THE SOFTWARE. + + + + +The following licenses are 'legacy': usually MIT/X11 licenses with the name +of the copyright holder(s) in the license statement, but also some BSD-like +licenses. + + +Copyright (C) 1994-2003 The XFree86 Project, Inc. All Rights Reserved. +Copyright (C) Colin Harrison 2005-2008 + +Permission is hereby granted, free of charge, to any person obtaining a copy of +this software and associated documentation files (the "Software"), to deal in +the Software without restriction, including without limitation the rights to +use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies +of the Software, and to permit persons to whom the Software is furnished to do +so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FIT- +NESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +XFREE86 PROJECT BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN +AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +Except as contained in this notice, the name of the XFree86 Project shall not +be used in advertising or otherwise to promote the sale, use or other dealings +in this Software without prior written authorization from the XFree86 Project. + + +Copyright 1997 by The XFree86 Project, Inc. + +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation, and that the name of the XFree86 Project, Inc. +not be used in advertising or publicity pertaining to distribution of +the software without specific, written prior permission. The Xfree86 +Project, Inc. makes no representations about the suitability of this +software for any purpose. It is provided "as is" without express or +implied warranty. + +THE XFREE86 PROJECT, INC. DISCLAIMS ALL WARRANTIES WITH REGARD +TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND +FITNESS, IN NO EVENT SHALL OREST ZBOROWSKI OR DAVID WEXELBLAT BE LIABLE +FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN +ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF +OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + + +Copyright 1985-1998, 2001 The Open Group +Copyright 2002 Red Hat Inc., Durham, North Carolina. + +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN +AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +Except as contained in this notice, the name of The Open Group shall not be +used in advertising or otherwise to promote the sale, use or other dealings +in this Software without prior written authorization from The Open Group. + + +Copyright (c) 1987, 1989-1990, 1992-1995 X Consortium + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN +AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +Except as contained in this notice, the name of the X Consortium shall not be +used in advertising or otherwise to promote the sale, use or other dealings +in this Software without prior written authorization from the X Consortium. + + +Copyright 2008 Tungsten Graphics, Inc., Cedar Park, Texas. + +Permission is hereby granted, free of charge, to any person obtaining a +copy of this software and associated documentation files (the +"Software"), to deal in the Software without restriction, including +without limitation the rights to use, copy, modify, merge, publish, +distribute, sub license, and/or sell copies of the Software, and to +permit persons to whom the Software is furnished to do so, subject to +the following conditions: + +The above copyright notice and this permission notice (including the +next paragraph) shall be included in all copies or substantial portions +of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. +IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS BE LIABLE FOR +ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + + +Copyright © 1999-2000 SuSE, Inc. +Copyright © 2007 Red Hat, Inc. + +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation, and that the name of SuSE not be used in advertising or +publicity pertaining to distribution of the software without specific, +written prior permission. SuSE makes no representations about the +suitability of this software for any purpose. It is provided "as is" +without express or implied warranty. + +SuSE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL SuSE +BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION +OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN +CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + + +Copyright 1987-1991, 1993 by Digital Equipment Corporation, Maynard, Massachusetts. +Copyright 1991 Massachusetts Institute of Technology, Cambridge, Massachusetts. +Copyright 1991, 1993 Olivetti Research Limited, Cambridge, England. + + All Rights Reserved + +Permission to use, copy, modify, and distribute this software and its +documentation for any purpose and without fee is hereby granted, +provided that the above copyright notice appear in all copies and that +both that copyright notice and this permission notice appear in +supporting documentation, and that the name of Digital not be +used in advertising or publicity pertaining to distribution of the +software without specific, written prior permission. + +DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING +ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL +DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR +ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, +WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, +ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS +SOFTWARE. + + +Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts, +Copyright 1994 Quarterdeck Office Systems. + + All Rights Reserved + +Permission to use, copy, modify, and distribute this software and its +documentation for any purpose and without fee is hereby granted, +provided that the above copyright notice appear in all copies and that +both that copyright notice and this permission notice appear in +supporting documentation, and that the names of Digital and +Quarterdeck not be used in advertising or publicity pertaining to +distribution of the software without specific, written prior +permission. + +DIGITAL AND QUARTERDECK DISCLAIM ALL WARRANTIES WITH REGARD TO THIS +SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND +FITNESS, IN NO EVENT SHALL DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT +OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS +OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE +OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE +OR PERFORMANCE OF THIS SOFTWARE. + + +Copyright 1997 Digital Equipment Corporation. +All rights reserved. + +This software is furnished under license and may be used and copied only in +accordance with the following terms and conditions. Subject to these +conditions, you may download, copy, install, use, modify and distribute +this software in source and/or binary form. No title or ownership is +transferred hereby. + +1) Any source code used, modified or distributed must reproduce and retain + this copyright notice and list of conditions as they appear in the + source file. + +2) No right is granted to use any trade name, trademark, or logo of Digital + Equipment Corporation. Neither the "Digital Equipment Corporation" + name nor any trademark or logo of Digital Equipment Corporation may be + used to endorse or promote products derived from this software without + the prior written permission of Digital Equipment Corporation. + +3) This software is provided "AS-IS" and any express or implied warranties, + including but not limited to, any implied warranties of merchantability, + fitness for a particular purpose, or non-infringement are disclaimed. + In no event shall DIGITAL be liable for any damages whatsoever, and in + particular, DIGITAL shall not be liable for special, indirect, + consequential, or incidental damages or damages for lost profits, loss + of revenue or loss of use, whether such damages arise in contract, + negligence, tort, under statute, in equity, at law or otherwise, even + if advised of the possibility of such damage. + + +Copyright (c) 1991, 1996-1997 Digital Equipment Corporation, Maynard, Massachusetts. + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software. + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +DIGITAL EQUIPMENT CORPORATION BE LIABLE FOR ANY CLAIM, DAMAGES, INCLUDING, +BUT NOT LIMITED TO CONSEQUENTIAL OR INCIDENTAL DAMAGES, OR OTHER LIABILITY, +WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR +IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +Except as contained in this notice, the name of Digital Equipment Corporation +shall not be used in advertising or otherwise to promote the sale, use or other +dealings in this Software without prior written authorization from Digital +Equipment Corporation. + + +SGI FREE SOFTWARE LICENSE B (Version 2.0, Sept. 18, 2008) +Copyright (C) 1991-2000 Silicon Graphics, Inc. All Rights Reserved. + +Permission is hereby granted, free of charge, to any person obtaining a +copy of this software and associated documentation files (the "Software"), +to deal in the Software without restriction, including without limitation +the rights to use, copy, modify, merge, publish, distribute, sublicense, +and/or sell copies of the Software, and to permit persons to whom the +Software is furnished to do so, subject to the following conditions: + +The above copyright notice including the dates of first publication and +either this permission notice or a reference to +http://oss.sgi.com/projects/FreeB/ +shall be included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +SILICON GRAPHICS, INC. BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF +OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. + + +Copyright (c) 1994, 1995 Hewlett-Packard Company + +Permission is hereby granted, free of charge, to any person obtaining +a copy of this software and associated documentation files (the +"Software"), to deal in the Software without restriction, including +without limitation the rights to use, copy, modify, merge, publish, +distribute, sublicense, and/or sell copies of the Software, and to +permit persons to whom the Software is furnished to do so, subject to +the following conditions: + +The above copyright notice and this permission notice shall be included +in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +IN NO EVENT SHALL HEWLETT-PACKARD COMPANY BE LIABLE FOR ANY CLAIM, +DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR +OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR +THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +Except as contained in this notice, the name of the Hewlett-Packard +Company shall not be used in advertising or otherwise to promote the +sale, use or other dealings in this Software without prior written +authorization from the Hewlett-Packard Company. + + +Copyright 1989 by Hewlett-Packard Company, Palo Alto, California. +All Rights Reserved + +Permission to use, copy, modify, and distribute this software and its +documentation for any purpose and without fee is hereby granted, +provided that the above copyright notice appear in all copies and that +both that copyright notice and this permission notice appear in +supporting documentation, and that the name of Hewlett-Packard not be +used in advertising or publicity pertaining to distribution of the +software without specific, written prior permission. + +HEWLETT-PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING +ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL +HEWLETT-PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR +ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, +WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, +ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS +SOFTWARE. + + +Copyright 2001-2004 Red Hat Inc., Durham, North Carolina. +Copyright (c) 2003 by the XFree86 Project, Inc. +Copyright 2004-2005 Red Hat Inc., Raleigh, North Carolina. +All Rights Reserved. + +Permission is hereby granted, free of charge, to any person obtaining +a copy of this software and associated documentation files (the +"Software"), to deal in the Software without restriction, including +without limitation on the rights to use, copy, modify, merge, +publish, distribute, sublicense, and/or sell copies of the Software, +and to permit persons to whom the Software is furnished to do so, +subject to the following conditions: + +The above copyright notice and this permission notice (including the +next paragraph) shall be included in all copies or substantial +portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NON-INFRINGEMENT. IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS +BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN +ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. + + +Copyright © 2008 Red Hat, Inc. +Partly based on code Copyright © 2000 SuSE, Inc. + +Permission to use, copy, modify, distribute, and sell this software +and its documentation for any purpose is hereby granted without +fee, provided that the above copyright notice appear in all copies +and that both that copyright notice and this permission notice +appear in supporting documentation, and that the name of Red Hat +not be used in advertising or publicity pertaining to distribution +of the software without specific, written prior permission. Red +Hat makes no representations about the suitability of this software +for any purpose. It is provided "as is" without express or implied +warranty. + +Red Hat DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN +NO EVENT SHALL Red Hat BE LIABLE FOR ANY SPECIAL, INDIRECT OR +CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS +OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, +NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN +CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation, and that the name of SuSE not be used in advertising or +publicity pertaining to distribution of the software without specific, +written prior permission. SuSE makes no representations about the +suitability of this software for any purpose. It is provided "as is" +without express or implied warranty. + +SuSE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL SuSE +BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION +OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN +CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + + +Copyright © 2006 Red Hat, Inc. +(C) Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas. +All Rights Reserved. + +Permission is hereby granted, free of charge, to any person obtaining a +copy of this software and associated documentation files (the "Software"), +to deal in the Software without restriction, including without limitation +the rights to use, copy, modify, merge, publish, distribute, sub license, +and/or sell copies of the Software, and to permit persons to whom the +Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice (including the next +paragraph) shall be included in all copies or substantial portions of the +Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL +RED HAT, INC, OR PRECISION INSIGHT AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY +CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT +OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR +THE USE OR OTHER DEALINGS IN THE SOFTWARE. + + +Copyright (c) 1995 X Consortium +Copyright 2004 Red Hat Inc., Durham, North Carolina. +All Rights Reserved. + +Permission is hereby granted, free of charge, to any person obtaining +a copy of this software and associated documentation files (the +"Software"), to deal in the Software without restriction, including +without limitation on the rights to use, copy, modify, merge, +publish, distribute, sublicense, and/or sell copies of the Software, +and to permit persons to whom the Software is furnished to do so, +subject to the following conditions: + +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NON-INFRINGEMENT. IN NO EVENT SHALL RED HAT, THE X CONSORTIUM, +AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, +ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +OTHER DEALINGS IN THE SOFTWARE. + +Except as contained in this notice, the name of the X Consortium +shall not be used in advertising or otherwise to promote the sale, +use or other dealings in this Software without prior written +authorization from the X Consortium. + + +Copyright 1998-2000 Precision Insight, Inc., Cedar Park, Texas. +Copyright 2000 VA Linux Systems, Inc. +Copyright (c) 2002, 2008, 2009 Apple Computer, Inc. +Copyright (c) 2003-2004 Torrey T. Lyons. +All Rights Reserved. + +Permission is hereby granted, free of charge, to any person obtaining a +copy of this software and associated documentation files (the +"Software"), to deal in the Software without restriction, including +without limitation the rights to use, copy, modify, merge, publish, +distribute, sub license, and/or sell copies of the Software, and to +permit persons to whom the Software is furnished to do so, subject to +the following conditions: + +The above copyright notice and this permission notice (including the +next paragraph) shall be included in all copies or substantial portions +of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. +IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR +ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + + +(C) Copyright IBM Corporation 2003 +All Rights Reserved. + +Permission is hereby granted, free of charge, to any person obtaining a +copy of this software and associated documentation files (the "Software"), +to deal in the Software without restriction, including without limitation +on the rights to use, copy, modify, merge, publish, distribute, sub +license, and/or sell copies of the Software, and to permit persons to whom +the Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice (including the next +paragraph) shall be included in all copies or substantial portions of the +Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL +VA LINUX SYSTEM, IBM AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM, +DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR +OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE +USE OR OTHER DEALINGS IN THE SOFTWARE. + + +(C) Copyright IBM Corporation 2004-2005 +All Rights Reserved. + +Permission is hereby granted, free of charge, to any person obtaining a +copy of this software and associated documentation files (the "Software"), +to deal in the Software without restriction, including without limitation +the rights to use, copy, modify, merge, publish, distribute, sub license, +and/or sell copies of the Software, and to permit persons to whom the +Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice (including the next +paragraph) shall be included in all copies or substantial portions of the +Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL +IBM, +AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF +OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. + + +Copyright (c) 1997 Metro Link Incorporated + +Permission is hereby granted, free of charge, to any person obtaining a +copy of this software and associated documentation files (the "Software"), +to deal in the Software without restriction, including without limitation +the rights to use, copy, modify, merge, publish, distribute, sublicense, +and/or sell copies of the Software, and to permit persons to whom the +Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +THE X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF +OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. + +Except as contained in this notice, the name of the Metro Link shall not be +used in advertising or otherwise to promote the sale, use or other dealings +in this Software without prior written authorization from Metro Link. + + +Copyright 1995-1998 by Metro Link, Inc. +Copyright (c) 1997 Matthieu Herrb + +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation, and that the name of Metro Link, Inc. not be used in +advertising or publicity pertaining to distribution of the software without +specific, written prior permission. Metro Link, Inc. makes no +representations about the suitability of this software for any purpose. + It is provided "as is" without express or implied warranty. + +METRO LINK, INC. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO +EVENT SHALL METRO LINK, INC. BE LIABLE FOR ANY SPECIAL, INDIRECT OR +CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, +DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER +TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +PERFORMANCE OF THIS SOFTWARE. + + +Copyright 1998 by Metro Link Incorporated + +Permission to use, copy, modify, distribute, and sell this software +and its documentation for any purpose is hereby granted without fee, +provided that the above copyright notice appear in all copies and that +both that copyright notice and this permission notice appear in +supporting documentation, and that the name of Metro Link +Incorporated not be used in advertising or publicity pertaining to +distribution of the software without specific, written prior +permission. Metro Link Incorporated makes no representations +about the suitability of this software for any purpose. It is +provided "as is" without express or implied warranty. + +METRO LINK INCORPORATED DISCLAIMS ALL WARRANTIES WITH REGARD +TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY +AND FITNESS, IN NO EVENT SHALL METRO LINK INCORPORATED BE +LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY +DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, +WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, +ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS +SOFTWARE. + + +Copyright (c) 2000 by Conectiva S.A. (http://www.conectiva.com) + +Permission is hereby granted, free of charge, to any person obtaining a +copy of this software and associated documentation files (the "Software"), +to deal in the Software without restriction, including without limitation +the rights to use, copy, modify, merge, publish, distribute, sublicense, +and/or sell copies of the Software, and to permit persons to whom the +Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +CONECTIVA LINUX BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF +OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. + +Except as contained in this notice, the name of Conectiva Linux shall +not be used in advertising or otherwise to promote the sale, use or other +dealings in this Software without prior written authorization from +Conectiva Linux. + + +Copyright (c) 2001, Andy Ritger aritger@nvidia.com +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions +are met: + +o Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. +o Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer + in the documentation and/or other materials provided with the + distribution. +o Neither the name of NVIDIA nor the names of its contributors + may be used to endorse or promote products derived from this + software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT +NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND +FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL +THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, +INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, +BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER +CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN +ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +POSSIBILITY OF SUCH DAMAGE. + + +Copyright 1992 Vrije Universiteit, The Netherlands + +Permission to use, copy, modify, and distribute this software and its +documentation for any purpose and without fee is hereby granted, provided +that the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation, and that the name of the Vrije Universiteit not be used in +advertising or publicity pertaining to distribution of the software without +specific, written prior permission. The Vrije Universiteit makes no +representations about the suitability of this software for any purpose. +It is provided "as is" without express or implied warranty. + +The Vrije Universiteit DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO +EVENT SHALL The Vrije Universiteit BE LIABLE FOR ANY SPECIAL, INDIRECT OR +CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, +DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER +TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +PERFORMANCE OF THIS SOFTWARE. + + +Copyright 1998 by Concurrent Computer Corporation + +Permission to use, copy, modify, distribute, and sell this software +and its documentation for any purpose is hereby granted without fee, +provided that the above copyright notice appear in all copies and that +both that copyright notice and this permission notice appear in +supporting documentation, and that the name of Concurrent Computer +Corporation not be used in advertising or publicity pertaining to +distribution of the software without specific, written prior +permission. Concurrent Computer Corporation makes no representations +about the suitability of this software for any purpose. It is +provided "as is" without express or implied warranty. + +CONCURRENT COMPUTER CORPORATION DISCLAIMS ALL WARRANTIES WITH REGARD +TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY +AND FITNESS, IN NO EVENT SHALL CONCURRENT COMPUTER CORPORATION BE +LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY +DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, +WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, +ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS +SOFTWARE. + + +Copyright © 2004 Nokia + +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation, and that the name of Nokia not be used in +advertising or publicity pertaining to distribution of the software without +specific, written prior permission. Nokia makes no +representations about the suitability of this software for any purpose. It +is provided "as is" without express or implied warranty. + +NOKIA DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO +EVENT SHALL NOKIA BE LIABLE FOR ANY SPECIAL, INDIRECT OR +CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, +DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER +TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +PERFORMANCE OF THIS SOFTWARE. + + +(c)Copyright 1988,1991 Adobe Systems Incorporated. +All rights reserved. + +Permission to use, copy, modify, distribute, and sublicense this software and its +documentation for any purpose and without fee is hereby granted, provided that +the above copyright notices appear in all copies and that both those copyright +notices and this permission notice appear in supporting documentation and that +the name of Adobe Systems Incorporated not be used in advertising or publicity +pertaining to distribution of the software without specific, written prior +permission. No trademark license to use the Adobe trademarks is hereby +granted. If the Adobe trademark "Display PostScript"(tm) is used to describe +this software, its functionality or for any other purpose, such use shall be +limited to a statement that this software works in conjunction with the Display +PostScript system. Proper trademark attribution to reflect Adobe's ownership +of the trademark shall be given whenever any such reference to the Display +PostScript system is made. + +ADOBE MAKES NO REPRESENTATIONS ABOUT THE SUITABILITY OF THE SOFTWARE FOR ANY +PURPOSE. IT IS PROVIDED "AS IS" WITHOUT EXPRESS OR IMPLIED WARRANTY. ADOBE +DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED +WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON- +INFRINGEMENT OF THIRD PARTY RIGHTS. IN NO EVENT SHALL ADOBE BE LIABLE TO YOU +OR ANY OTHER PARTY FOR ANY SPECIAL, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY +DAMAGES WHATSOEVER WHETHER IN AN ACTION OF CONTRACT,NEGLIGENCE, STRICT +LIABILITY OR ANY OTHER ACTION ARISING OUT OF OR IN CONNECTION WITH THE USE OR +PERFORMANCE OF THIS SOFTWARE. ADOBE WILL NOT PROVIDE ANY TRAINING OR OTHER +SUPPORT FOR THE SOFTWARE. + +Adobe, PostScript, and Display PostScript are trademarks of Adobe Systems +Incorporated which may be registered in certain jurisdictions. + + +Copyright 1989 Network Computing Devices, Inc., Mountain View, California. + +Permission to use, copy, modify, and distribute this software and its +documentation for any purpose and without fee is hereby granted, provided +that the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation, and that the name of N.C.D. not be used in advertising or +publicity pertaining to distribution of the software without specific, +written prior permission. N.C.D. makes no representations about the +suitability of this software for any purpose. It is provided "as is" +without express or implied warranty. + + +Copyright (c) 1987 by the Regents of the University of California + +Permission to use, copy, modify, and distribute this +software and its documentation for any purpose and without +fee is hereby granted, provided that the above copyright +notice appear in all copies. The University of California +makes no representations about the suitability of this +software for any purpose. It is provided "as is" without +express or implied warranty. + + +Copyright 1992, 1993 Data General Corporation; +Copyright 1992, 1993 OMRON Corporation + +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that the +above copyright notice appear in all copies and that both that copyright +notice and this permission notice appear in supporting documentation, and that +neither the name OMRON or DATA GENERAL be used in advertising or publicity +pertaining to distribution of the software without specific, written prior +permission of the party whose name is to be used. Neither OMRON or +DATA GENERAL make any representation about the suitability of this software +for any purpose. It is provided "as is" without express or implied warranty. + +OMRON AND DATA GENERAL EACH DISCLAIM ALL WARRANTIES WITH REGARD TO THIS +SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, +IN NO EVENT SHALL OMRON OR DATA GENERAL BE LIABLE FOR ANY SPECIAL, INDIRECT +OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, +DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER +TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE +OF THIS SOFTWARE. + + +Copyright © 1998-2004, 2006 Keith Packard +Copyright © 2000-2002 Keith Packard, member of The XFree86 Project, Inc. +Copyright (c) 2002 Apple Computer, Inc. +Copyright (c) 2003 Torrey T. Lyons. +All Rights Reserved. + +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation, and that the name of Keith Packard not be used in +advertising or publicity pertaining to distribution of the software without +specific, written prior permission. Keith Packard makes no +representations about the suitability of this software for any purpose. It +is provided "as is" without express or implied warranty. + +KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO +EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, +DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER +TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +PERFORMANCE OF THIS SOFTWARE. + + +Copyright © 1999 Keith Packard +Copyright © 2000 Compaq Computer Corporation +Copyright © 2002 MontaVista Software Inc. +Copyright © 2005 OpenedHand Ltd. +Copyright © 2006 Nokia Corporation + +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation, and that the name of the authors and/or copyright holders +not be used in advertising or publicity pertaining to distribution of the +software without specific, written prior permission. The authors and/or +copyright holders make no representations about the suitability of this +software for any purpose. It is provided "as is" without express or +implied warranty. + +THE AUTHORS AND/OR COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD +TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY +AND FITNESS, IN NO EVENT SHALL THE AUTHORS AND/OR COPYRIGHT HOLDERS BE +LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN +ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF +OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + + +Copyright 1993 by Davor Matic + +Permission to use, copy, modify, distribute, and sell this software +and its documentation for any purpose is hereby granted without fee, +provided that the above copyright notice appear in all copies and that +both that copyright notice and this permission notice appear in +supporting documentation. Davor Matic makes no representations about +the suitability of this software for any purpose. It is provided "as +is" without express or implied warranty. + + +Copyright (C) 2001-2004 Harold L Hunt II All Rights Reserved. +Copyright (C) Colin Harrison 2005-2008 + +Permission is hereby granted, free of charge, to any person obtaining +a copy of this software and associated documentation files (the +"Software"), to deal in the Software without restriction, including +without limitation the rights to use, copy, modify, merge, publish, +distribute, sublicense, and/or sell copies of the Software, and to +permit persons to whom the Software is furnished to do so, subject to +the following conditions: + +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT. IN NO EVENT SHALL HAROLD L HUNT II BE LIABLE FOR +ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF +CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +Except as contained in this notice, the name of Harold L Hunt II +shall not be used in advertising or otherwise to promote the sale, use +or other dealings in this Software without prior written authorization +from Harold L Hunt II. + + +Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany. + +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation, and that the name of Thomas Roell not be used in +advertising or publicity pertaining to distribution of the software without +specific, written prior permission. Thomas Roell makes no representations +about the suitability of this software for any purpose. It is provided +"as is" without express or implied warranty. + +THOMAS ROELL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO +EVENT SHALL THOMAS ROELL BE LIABLE FOR ANY SPECIAL, INDIRECT OR +CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, +DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER +TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +PERFORMANCE OF THIS SOFTWARE. + + +Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany +Copyright 1993 by David Wexelblat + +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation, and that the names of Thomas Roell and David Wexelblat +not be used in advertising or publicity pertaining to distribution of +the software without specific, written prior permission. Thomas Roell and +David Wexelblat makes no representations about the suitability of this +software for any purpose. It is provided "as is" without express or +implied warranty. + +THOMAS ROELL AND DAVID WEXELBLAT DISCLAIMS ALL WARRANTIES WITH REGARD TO +THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND +FITNESS, IN NO EVENT SHALL THOMAS ROELL OR DAVID WEXELBLAT BE LIABLE FOR +ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER +RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF +CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN +CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + + +Copyright 1990,91,92,93 by Thomas Roell, Germany. +Copyright 1991,92,93 by SGCS (Snitily Graphics Consulting Services), USA. + +Permission to use, copy, modify, distribute, and sell this software +and its documentation for any purpose is hereby granted without fee, +provided that the above copyright notice appear in all copies and +that both that copyright notice and this permission notice appear +in supporting documentation, and that the name of Thomas Roell nor +SGCS be used in advertising or publicity pertaining to distribution +of the software without specific, written prior permission. +Thomas Roell nor SGCS makes no representations about the suitability +of this software for any purpose. It is provided "as is" without +express or implied warranty. + +THOMAS ROELL AND SGCS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS +SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND +FITNESS, IN NO EVENT SHALL THOMAS ROELL OR SGCS BE LIABLE FOR ANY +SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER +RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF +CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN +CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + + +Copyright 1998 by Alan Hourihane, Wigan, England. +Copyright 2000-2002 by Alan Hourihane, Flint Mountain, North Wales. + +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation, and that the name of Alan Hourihane not be used in +advertising or publicity pertaining to distribution of the software without +specific, written prior permission. Alan Hourihane makes no representations +about the suitability of this software for any purpose. It is provided +"as is" without express or implied warranty. + +ALAN HOURIHANE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO +EVENT SHALL ALAN HOURIHANE BE LIABLE FOR ANY SPECIAL, INDIRECT OR +CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, +DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER +TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +PERFORMANCE OF THIS SOFTWARE. + + +Copyright 1995 Kaleb S. KEITHLEY + +Permission is hereby granted, free of charge, to any person obtaining +a copy of this software and associated documentation files (the +"Software"), to deal in the Software without restriction, including +without limitation the rights to use, copy, modify, merge, publish, +distribute, sublicense, and/or sell copies of the Software, and to +permit persons to whom the Software is furnished to do so, subject to +the following conditions: + +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +IN NO EVENT SHALL Kaleb S. KEITHLEY BE LIABLE FOR ANY CLAIM, DAMAGES +OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, +ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +OTHER DEALINGS IN THE SOFTWARE. + +Except as contained in this notice, the name of Kaleb S. KEITHLEY +shall not be used in advertising or otherwise to promote the sale, use +or other dealings in this Software without prior written authorization +from Kaleb S. KEITHLEY + + +Copyright (c) 1997 Matthieu Herrb + +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation, and that the name of Matthieu Herrb not be used in +advertising or publicity pertaining to distribution of the software without +specific, written prior permission. Matthieu Herrb makes no +representations about the suitability of this software for any purpose. + It is provided "as is" without express or implied warranty. + +MATTHIEU HERRB DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO +EVENT SHALL MATTHIEU HERRB BE LIABLE FOR ANY SPECIAL, INDIRECT OR +CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, +DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER +TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +PERFORMANCE OF THIS SOFTWARE. + + +Copyright 2004, Egbert Eich + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to +deal in the Software without restriction, including without limitation the +rights to use, copy, modify, merge, publish, distribute, sublicense, and/or +sell copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +EGBERT EICH BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER +IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CON- +NECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +Except as contained in this notice, the name of Egbert Eich shall not +be used in advertising or otherwise to promote the sale, use or other deal- +ings in this Software without prior written authorization from Egbert Eich. + + +Copyright 1993 by David Wexelblat +Copyright 2005 by Kean Johnston +Copyright 1993 by David McCullough + +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation, and that the name of David Wexelblat not be used in +advertising or publicity pertaining to distribution of the software without +specific, written prior permission. David Wexelblat makes no representations +about the suitability of this software for any purpose. It is provided +"as is" without express or implied warranty. + +DAVID WEXELBLAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO +EVENT SHALL DAVID WEXELBLAT BE LIABLE FOR ANY SPECIAL, INDIRECT OR +CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, +DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER +TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +PERFORMANCE OF THIS SOFTWARE. + + +Copyright 1992 by Orest Zborowski +Copyright 1993 by David Wexelblat + +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation, and that the names of Orest Zborowski and David Wexelblat +not be used in advertising or publicity pertaining to distribution of +the software without specific, written prior permission. Orest Zborowski +and David Wexelblat make no representations about the suitability of this +software for any purpose. It is provided "as is" without express or +implied warranty. + +OREST ZBOROWSKI AND DAVID WEXELBLAT DISCLAIMS ALL WARRANTIES WITH REGARD +TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND +FITNESS, IN NO EVENT SHALL OREST ZBOROWSKI OR DAVID WEXELBLAT BE LIABLE +FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN +ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF +OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + + +Copyright 1992 by Orest Zborowski +Copyright 1993 by David Dawes + +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation, and that the names of Orest Zborowski and David Dawes +not be used in advertising or publicity pertaining to distribution of +the software without specific, written prior permission. Orest Zborowski +and David Dawes make no representations about the suitability of this +software for any purpose. It is provided "as is" without express or +implied warranty. + +OREST ZBOROWSKI AND DAVID DAWES DISCLAIMS ALL WARRANTIES WITH REGARD +TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND +FITNESS, IN NO EVENT SHALL OREST ZBOROWSKI OR DAVID DAWES BE LIABLE +FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN +ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF +OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + + +Copyright 1995-1999 by Frederic Lepied, France. + +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation, and that the name of Frederic Lepied not be used in +advertising or publicity pertaining to distribution of the software without +specific, written prior permission. Frederic Lepied makes no +representations about the suitability of this software for any purpose. It +is provided "as is" without express or implied warranty. + +FREDERIC LEPIED DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO +EVENT SHALL FREDERIC LEPIED BE LIABLE FOR ANY SPECIAL, INDIRECT OR +CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, +DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER +TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +PERFORMANCE OF THIS SOFTWARE. + + +Copyright 1992 by Rich Murphey +Copyright 1993 by David Wexelblat + +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation, and that the names of Rich Murphey and David Wexelblat +not be used in advertising or publicity pertaining to distribution of +the software without specific, written prior permission. Rich Murphey and +David Wexelblat make no representations about the suitability of this +software for any purpose. It is provided "as is" without express or +implied warranty. + +RICH MURPHEY AND DAVID WEXELBLAT DISCLAIM ALL WARRANTIES WITH REGARD TO +THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND +FITNESS, IN NO EVENT SHALL RICH MURPHEY OR DAVID WEXELBLAT BE LIABLE FOR +ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER +RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF +CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN +CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + + +Copyright 1992 by Rich Murphey +Copyright 1993 by David Dawes + +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation, and that the names of Rich Murphey and David Dawes +not be used in advertising or publicity pertaining to distribution of +the software without specific, written prior permission. Rich Murphey and +David Dawes make no representations about the suitability of this +software for any purpose. It is provided "as is" without express or +implied warranty. + +RICH MURPHEY AND DAVID DAWES DISCLAIM ALL WARRANTIES WITH REGARD TO +THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND +FITNESS, IN NO EVENT SHALL RICH MURPHEY OR DAVID DAWES BE LIABLE FOR +ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER +RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF +CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN +CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + + +Copyright © 2003-2004 Anders Carlsson + +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation, and that the name of Anders Carlsson not be used in +advertising or publicity pertaining to distribution of the software without +specific, written prior permission. Anders Carlsson makes no +representations about the suitability of this software for any purpose. It +is provided "as is" without express or implied warranty. + +ANDERS CARLSSON DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO +EVENT SHALL ANDERS CARLSSON BE LIABLE FOR ANY SPECIAL, INDIRECT OR +CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, +DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER +TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +PERFORMANCE OF THIS SOFTWARE. + + +Copyright (C) 2003 Anders Carlsson +Copyright © 2003-2004 Eric Anholt +Copyright © 2004 Keith Packard + +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation, and that the name of Eric Anholt not be used in +advertising or publicity pertaining to distribution of the software without +specific, written prior permission. Eric Anholt makes no +representations about the suitability of this software for any purpose. It +is provided "as is" without express or implied warranty. + +ERIC ANHOLT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO +EVENT SHALL ERIC ANHOLT BE LIABLE FOR ANY SPECIAL, INDIRECT OR +CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, +DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER +TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +PERFORMANCE OF THIS SOFTWARE. + + +Copyright (c) 1998 Todd C. Miller + +Permission to use, copy, modify, and distribute this software for any +purpose with or without fee is hereby granted, provided that the above +copyright notice and this permission notice appear in all copies. + +THE SOFTWARE IS PROVIDED "AS IS" AND TODD C. MILLER DISCLAIMS ALL +WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES +OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL TODD C. MILLER BE LIABLE +FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION +OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN +CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + + +Copyright © 2003-2004 Philip Blundell + +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation, and that the name of Philip Blundell not be used in +advertising or publicity pertaining to distribution of the software without +specific, written prior permission. Philip Blundell makes no +representations about the suitability of this software for any purpose. It +is provided "as is" without express or implied warranty. + +PHILIP BLUNDELL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO +EVENT SHALL PHILIP BLUNDELL BE LIABLE FOR ANY SPECIAL, INDIRECT OR +CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, +DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER +TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +PERFORMANCE OF THIS SOFTWARE. + + + +Copyright (c) 1994-2003 by The XFree86 Project, Inc. +Copyright 1997 by Metro Link, Inc. +Copyright 2003 by David H. Dawes. +Copyright 2003 by X-Oz Technologies. +Copyright (c) 2004, X.Org Foundation + +Permission is hereby granted, free of charge, to any person obtaining a +copy of this software and associated documentation files (the "Software"), +to deal in the Software without restriction, including without limitation +the rights to use, copy, modify, merge, publish, distribute, sublicense, +and/or sell copies of the Software, and to permit persons to whom the +Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR +OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, +ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +OTHER DEALINGS IN THE SOFTWARE. + +Except as contained in this notice, the name of the copyright holder(s) +and author(s) shall not be used in advertising or otherwise to promote +the sale, use or other dealings in this Software without prior written +authorization from the copyright holder(s) and author(s). + + +Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany +Copyright 1993 by David Wexelblat +Copyright 1999 by David Holland +Copyright © 2000 Compaq Computer Corporation +Copyright © 2002 Hewlett-Packard Company +Copyright © 2004, 2005 Red Hat, Inc. +Copyright © 2004 Nicholas Miell +Copyright © 2005 Trolltech AS +Copyright © 2006 Intel Corporation +Copyright © 2006-2007 Keith Packard +Copyright © 2008 Red Hat, Inc +Copyright © 2008 George Sapountzis + +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that copyright +notice and this permission notice appear in supporting documentation, and +that the name of the copyright holders not be used in advertising or +publicity pertaining to distribution of the software without specific, +written prior permission. The copyright holders make no representations +about the suitability of this software for any purpose. It is provided "as +is" without express or implied warranty. + +THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS +SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND +FITNESS, IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY +SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN +AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING +OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS +SOFTWARE. + + +Copyright © 2000 Keith Packard, member of The XFree86 Project, Inc. + 2005 Lars Knoll & Zack Rusin, Trolltech + +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation, and that the name of Keith Packard not be used in +advertising or publicity pertaining to distribution of the software without +specific, written prior permission. Keith Packard makes no +representations about the suitability of this software for any purpose. It +is provided "as is" without express or implied warranty. + +THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS +SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND +FITNESS, IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY +SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN +AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING +OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS +SOFTWARE. + + +Copyright 1987, 1998 The Open Group +Copyright © 1998-1999, 2001 The XFree86 Project, Inc. +Copyright © 2000 VA Linux Systems, Inc. +Copyright (c) 2000, 2001 Nokia Home Communications +Copyright © 2007, 2008 Red Hat, Inc. +All rights reserved. + +Permission is hereby granted, free of charge, to any person obtaining a +copy of this software and associated documentation files (the +"Software"), to deal in the Software without restriction, including +without limitation the rights to use, copy, modify, merge, publish, +distribute, and/or sell copies of the Software, and to permit persons +to whom the Software is furnished to do so, provided that the above +copyright notice(s) and this permission notice appear in all copies of +the Software and that both the above copyright notice(s) and this +permission notice appear in supporting documentation. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT +OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR +HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL +INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING +FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, +NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION +WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + +Except as contained in this notice, the name of a copyright holder +shall not be used in advertising or otherwise to promote the sale, use +or other dealings in this Software without prior written authorization +of the copyright holder. + + +Copyright 1996 by Thomas E. Dickey + + All Rights Reserved + +Permission to use, copy, modify, and distribute this software and its +documentation for any purpose and without fee is hereby granted, +provided that the above copyright notice appear in all copies and that +both that copyright notice and this permission notice appear in +supporting documentation, and that the name of the above listed +copyright holder(s) not be used in advertising or publicity pertaining +to distribution of the software without specific, written prior +permission. + +THE ABOVE LISTED COPYRIGHT HOLDER(S) DISCLAIM ALL WARRANTIES WITH REGARD +TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY +AND FITNESS, IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT HOLDER(S) BE +LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN +ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF +OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + + +Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas. +Copyright (c) 2001 Andreas Monitzer. +Copyright (c) 2001-2004 Greg Parker. +Copyright (c) 2001-2004 Torrey T. Lyons +Copyright (c) 2002-2003 Apple Computer, Inc. +Copyright (c) 2004-2005 Alexander Gottwald +Copyright (c) 2002-2009 Apple Inc. +Copyright (c) 2007 Jeremy Huddleston +All Rights Reserved. + +Permission is hereby granted, free of charge, to any person obtaining a +copy of this software and associated documentation files (the "Software"), +to deal in the Software without restriction, including without limitation +the rights to use, copy, modify, merge, publish, distribute, sublicense, +and/or sell copies of the Software, and to permit persons to whom the +Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +THE ABOVE LISTED COPYRIGHT HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR +OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, +ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +DEALINGS IN THE SOFTWARE. + +Except as contained in this notice, the name(s) of the above copyright +holders shall not be used in advertising or otherwise to promote the sale, +use or other dealings in this Software without prior written authorization. + + +Copyright (C) 1999,2000 by Eric Sunshine +Copyright (C) 2001-2005 by Thomas Winischhofer, Vienna, Austria. + +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + + 1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + 3. The name of the author may not be used to endorse or promote products + derived from this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR +IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN +NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED +TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR +PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF +LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + + +Copyright (C) 2005 Bogdan D. bogdand@users.sourceforge.net + +Permission is hereby granted, free of charge, to any person obtaining a copy of +this software and associated documentation files (the "Software"), to deal in +the Software without restriction, including without limitation the rights to +use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies +of the Software, and to permit persons to whom the Software is furnished to do +so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHOR BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN +ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +Except as contained in this notice, the name of the author shall not be used in +advertising or otherwise to promote the sale, use or other dealings in this +Software without prior written authorization from the author. + + +Copyright © 2002 David Dawes + +Permission is hereby granted, free of charge, to any person obtaining a +copy of this software and associated documentation files (the "Software"), +to deal in the Software without restriction, including without limitation +the rights to use, copy, modify, merge, publish, distribute, sublicense, +and/or sell copies of the Software, and to permit persons to whom the +Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +THE AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF +OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. + +Except as contained in this notice, the name of the author(s) shall +not be used in advertising or otherwise to promote the sale, use or other +dealings in this Software without prior written authorization from +the author(s). + + +Copyright (C) 1996-1999 SciTech Software, Inc. +Copyright (C) David Mosberger-Tang +Copyright (C) 1999 Egbert Eich +Copyright (C) 2008 Bart Trojanowski, Symbio Technologies, LLC + +Permission to use, copy, modify, distribute, and sell this software and +its documentation for any purpose is hereby granted without fee, +provided that the above copyright notice appear in all copies and that +both that copyright notice and this permission notice appear in +supporting documentation, and that the name of the authors not be used +in advertising or publicity pertaining to distribution of the software +without specific, written prior permission. The authors makes no +representations about the suitability of this software for any purpose. +It is provided "as is" without express or implied warranty. + +THE AUTHORS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO +EVENT SHALL THE AUTHORS BE LIABLE FOR ANY SPECIAL, INDIRECT OR +CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF +USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR +OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +PERFORMANCE OF THIS SOFTWARE. + + +Copyright 2005-2006 Luc Verhaegen. + +Permission is hereby granted, free of charge, to any person obtaining a +copy of this software and associated documentation files (the "Software"), +to deal in the Software without restriction, including without limitation +the rights to use, copy, modify, merge, publish, distribute, sublicense, +and/or sell copies of the Software, and to permit persons to whom the +Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR +OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, +ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +OTHER DEALINGS IN THE SOFTWARE. + + +Copyright 1995 by Robin Cutshaw +Copyright 2000 by Egbert Eich +Copyright 2002 by David Dawes + +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation, and that the names of the above listed copyright holder(s) +not be used in advertising or publicity pertaining to distribution of +the software without specific, written prior permission. The above listed +copyright holder(s) make(s) no representations about the suitability of this +software for any purpose. It is provided "as is" without express or +implied warranty. + +THE ABOVE LISTED COPYRIGHT HOLDER(S) DISCLAIM(S) ALL WARRANTIES WITH REGARD +TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY +AND FITNESS, IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT HOLDER(S) BE +LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY +DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER +IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING +OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + + +Copyright 1997-2004 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org + +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that copyright +notice and this permission notice appear in supporting documentation, and +that the name of Marc Aurele La France not be used in advertising or +publicity pertaining to distribution of the software without specific, +written prior permission. Marc Aurele La France makes no representations +about the suitability of this software for any purpose. It is provided +"as-is" without express or implied warranty. + +MARC AURELE LA FRANCE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO +EVENT SHALL MARC AURELE LA FRANCE BE LIABLE FOR ANY SPECIAL, INDIRECT OR +CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, +DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER +TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE +OF THIS SOFTWARE. + + +Copyright 1990, 1991 by Thomas Roell, Dinkelscherben, Germany +Copyright 1992 by David Dawes +Copyright 1992 by Jim Tsillas +Copyright 1992 by Rich Murphey +Copyright 1992 by Robert Baron +Copyright 1992 by Orest Zborowski +Copyright 1993 by Vrije Universiteit, The Netherlands +Copyright 1993 by David Wexelblat +Copyright 1994, 1996 by Holger Veit +Copyright 1997 by Takis Psarogiannakopoulos +Copyright 1994-2003 by The XFree86 Project, Inc + +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation, and that the names of the above listed copyright holders +not be used in advertising or publicity pertaining to distribution of +the software without specific, written prior permission. The above listed +copyright holders make no representations about the suitability of this +software for any purpose. It is provided "as is" without express or +implied warranty. + +THE ABOVE LISTED COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD +TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY +AND FITNESS, IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT HOLDERS BE +LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY +DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER +IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING +OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + + +Copyright 2001-2005 by J. Kean Johnston + +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation, and that the name J. Kean Johnston not be used in +advertising or publicity pertaining to distribution of the software without +specific, written prior permission. J. Kean Johnston makes no +representations about the suitability of this software for any purpose. +It is provided "as is" without express or implied warranty. + +J. KEAN JOHNSTON DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO +EVENT SHALL J. KEAN JOHNSTON BE LIABLE FOR ANY SPECIAL, INDIRECT OR +CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF +USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR +OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +PERFORMANCE OF THIS SOFTWARE. + + +Copyright (C) 2000 Jakub Jelinek (jakub@redhat.com) + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +JAKUB JELINEK BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER +IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + + +Copyright 1997,1998 by UCHIYAMA Yasushi + +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation, and that the name of UCHIYAMA Yasushi not be used in +advertising or publicity pertaining to distribution of the software without +specific, written prior permission. UCHIYAMA Yasushi makes no representations +about the suitability of this software for any purpose. It is provided +"as is" without express or implied warranty. + +UCHIYAMA YASUSHI DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO +EVENT SHALL UCHIYAMA YASUSHI BE LIABLE FOR ANY SPECIAL, INDIRECT OR +CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, +DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER +TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +PERFORMANCE OF THIS SOFTWARE. + + +Copyright (C) 2000 Keith Packard + 2004 Eric Anholt + 2005 Zack Rusin + +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation, and that the name of copyright holders not be used in +advertising or publicity pertaining to distribution of the software without +specific, written prior permission. Copyright holders make no +representations about the suitability of this software for any purpose. It +is provided "as is" without express or implied warranty. + +THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS +SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND +FITNESS, IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY +SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN +AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING +OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS +SOFTWARE. + + +(C) Copyright IBM Corporation 2002-2007 +All Rights Reserved. + +Permission is hereby granted, free of charge, to any person obtaining a +copy of this software and associated documentation files (the "Software"), +to deal in the Software without restriction, including without limitation +on the rights to use, copy, modify, merge, publish, distribute, sub +license, and/or sell copies of the Software, and to permit persons to whom +the Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice (including the next +paragraph) shall be included in all copies or substantial portions of the +Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL +THE COPYRIGHT HOLDERS AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM, +DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR +OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE +USE OR OTHER DEALINGS IN THE SOFTWARE. + + +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +this permission notice appear in supporting documentation. This permission +notice shall be included in all copies or substantial portions of the +Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHOR BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN +AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + + +Copyright © 2007 OpenedHand Ltd + +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation, and that the name of OpenedHand Ltd not be used in +advertising or publicity pertaining to distribution of the software without +specific, written prior permission. OpenedHand Ltd makes no +representations about the suitability of this software for any purpose. It +is provided "as is" without express or implied warranty. + +OpenedHand Ltd DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO +EVENT SHALL OpenedHand Ltd BE LIABLE FOR ANY SPECIAL, INDIRECT OR +CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, +DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER +TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +PERFORMANCE OF THIS SOFTWARE. + + +Copyright (c) 1987, 1990, 1993 + The Regents of the University of California. All rights reserved. + +This code is derived from software contributed to Berkeley by +Chris Torek. + +This code is derived from software contributed to Berkeley by +Michael Rendell of Memorial University of Newfoundland. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions +are met: + 1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + 4. Neither the name of the University nor the names of its contributors + may be used to endorse or promote products derived from this software + without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE +FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +SUCH DAMAGE. --- xorg-server-1.18.2.orig/debian/gbp.conf +++ xorg-server-1.18.2/debian/gbp.conf @@ -0,0 +1,8 @@ +[DEFAULT] +# the default branch for upstream sources: +upstream-branch = upstream-experimental +# the default branch for the debian patch: +debian-branch = debian-experimental +# use pristine-tar: +pristine-tar = True + --- xorg-server-1.18.2.orig/debian/local/10-kbd.conf +++ xorg-server-1.18.2/debian/local/10-kbd.conf @@ -0,0 +1,5 @@ +Section "InputClass" + Identifier "kbd catchall" + MatchIsKeyboard "on" + Driver "kbd" +EndSection --- xorg-server-1.18.2.orig/debian/local/10-mouse.conf +++ xorg-server-1.18.2/debian/local/10-mouse.conf @@ -0,0 +1,5 @@ +Section "InputClass" + Identifier "mouse catchall" + MatchIsPointer "on" + Driver "mouse" +EndSection --- xorg-server-1.18.2.orig/debian/local/64-xorg-xkb.rules +++ xorg-server-1.18.2/debian/local/64-xorg-xkb.rules @@ -0,0 +1,8 @@ +ACTION!="add|change", GOTO="xorg_xkb_end" +SUBSYSTEM!="input", GOTO="xorg_xkb_end" +KERNEL!="event*", GOTO="xorg_xkb_end" + +# import keyboard layout from /etc/default/keyboard +ENV{ID_INPUT_KEY}=="?*", IMPORT{file}="/etc/default/keyboard" + +LABEL="xorg_xkb_end" --- xorg-server-1.18.2.orig/debian/local/dh_xsf_substvars +++ xorg-server-1.18.2/debian/local/dh_xsf_substvars @@ -0,0 +1,53 @@ +#!/bin/sh +# © 2011 Cyril Brulebois +# +# Usage: +# Call this script from debian/rules, before dh_gencontrol is run, +# to get all needed variables computed in debian/$p.substvars for +# each package $p found through dh_listpackages. +# . +# This script has support for udebs. +set -e + +# Sanity check. All drivers build-depend on debhelper: +if ! which dh_listpackages >/dev/null 2>&1; then + echo "E: dh_listpackages not found, debhelper package missing?" + exit 1 +fi + +# Read the dependencies once: +INPUTDEP=$(cat /usr/share/xserver-xorg/xinputdep 2>/dev/null) +VIDEODEP=$(cat /usr/share/xserver-xorg/videodrvdep 2>/dev/null) + +# Iterate on the packages: +for package in $(dh_listpackages); do + case $package in + *-udeb) + # udebs depend on udebs, tweak the dependency on the server: + inputdep=$(echo "$INPUTDEP"|sed 's/xserver-xorg-core/&-udeb/') + videodep=$(echo "$VIDEODEP"|sed 's/xserver-xorg-core/&-udeb/') + ;; + *) + # just copy the dependencies read previously: + inputdep="$INPUTDEP" + videodep="$VIDEODEP" + esac + + # To avoid having "unused substitution variable" warnings from + # dpkg-gencontrol, only set variables which make sense: + case $package in + *-dbg|*-dev|*-all) + # debug, devel, or meta package, no need for Depends/Provides. + : + ;; + xserver-xorg-input-*) + # input driver: + echo "xinpdriver:Depends=$inputdep" >> debian/$package.substvars + echo "xinpdriver:Provides=xorg-driver-input" >> debian/$package.substvars + ;; + xserver-xorg-video-*) + # video driver: + echo "xviddriver:Depends=$videodep" >> debian/$package.substvars + echo "xviddriver:Provides=xorg-driver-video" >> debian/$package.substvars + esac +done --- xorg-server-1.18.2.orig/debian/local/xsf.pm +++ xorg-server-1.18.2/debian/local/xsf.pm @@ -0,0 +1,8 @@ +#!/usr/bin/perl +use warnings; +use strict; +use Debian::Debhelper::Dh_Lib; + +insert_before("dh_gencontrol", "dh_xsf_substvars"); + +1; --- xorg-server-1.18.2.orig/debian/local/xvfb-run +++ xorg-server-1.18.2/debian/local/xvfb-run @@ -0,0 +1,190 @@ +#!/bin/sh + +# This script starts an instance of Xvfb, the "fake" X server, runs a command +# with that server available, and kills the X server when done. The return +# value of the command becomes the return value of this script. +# +# If anyone is using this to build a Debian package, make sure the package +# Build-Depends on xvfb and xauth. + +set -e + +PROGNAME=xvfb-run +SERVERNUM=99 +AUTHFILE= +ERRORFILE=/dev/null +XVFBARGS="-screen 0 640x480x8" +LISTENTCP="-nolisten tcp" +XAUTHPROTO=. + +# Query the terminal to establish a default number of columns to use for +# displaying messages to the user. This is used only as a fallback in the event +# the COLUMNS variable is not set. ($COLUMNS can react to SIGWINCH while the +# script is running, and this cannot, only being calculated once.) +DEFCOLUMNS=$(stty size 2>/dev/null | awk '{print $2}') || true +if ! expr "$DEFCOLUMNS" : "[[:digit:]]\+$" >/dev/null 2>&1; then + DEFCOLUMNS=80 +fi + +# Display a message, wrapping lines at the terminal width. +message () { + echo "$PROGNAME: $*" | fmt -t -w ${COLUMNS:-$DEFCOLUMNS} +} + +# Display an error message. +error () { + message "error: $*" >&2 +} + +# Display a usage message. +usage () { + if [ -n "$*" ]; then + message "usage error: $*" + fi + cat <>"$ERRORFILE" 2>&1 + fi + if [ -n "$XVFB_RUN_TMPDIR" ]; then + if ! rm -r "$XVFB_RUN_TMPDIR"; then + error "problem while cleaning up temporary directory" + exit 5 + fi + fi + if [ -n "$XVFBPID" ]; then + kill "$XVFBPID" >>"$ERRORFILE" 2>&1 + fi +} + +# Parse the command line. +ARGS=$(getopt --options +ae:f:hn:lp:s:w: \ + --long auto-servernum,error-file:,auth-file:,help,server-num:,listen-tcp,xauth-protocol:,server-args:,wait: \ + --name "$PROGNAME" -- "$@") +GETOPT_STATUS=$? + +if [ $GETOPT_STATUS -ne 0 ]; then + error "internal error; getopt exited with status $GETOPT_STATUS" + exit 6 +fi + +eval set -- "$ARGS" + +while :; do + case "$1" in + -a|--auto-servernum) SERVERNUM=$(find_free_servernum); AUTONUM="yes" ;; + -e|--error-file) ERRORFILE="$2"; shift ;; + -f|--auth-file) AUTHFILE="$2"; shift ;; + -h|--help) SHOWHELP="yes" ;; + -n|--server-num) SERVERNUM="$2"; shift ;; + -l|--listen-tcp) LISTENTCP="" ;; + -p|--xauth-protocol) XAUTHPROTO="$2"; shift ;; + -s|--server-args) XVFBARGS="$2"; shift ;; + -w|--wait) shift ;; + --) shift; break ;; + *) error "internal error; getopt permitted \"$1\" unexpectedly" + exit 6 + ;; + esac + shift +done + +if [ "$SHOWHELP" ]; then + usage + exit 0 +fi + +if [ -z "$*" ]; then + usage "need a command to run" >&2 + exit 2 +fi + +if ! which xauth >/dev/null; then + error "xauth command not found" + exit 3 +fi + +# tidy up after ourselves +trap clean_up EXIT + +# If the user did not specify an X authorization file to use, set up a temporary +# directory to house one. +if [ -z "$AUTHFILE" ]; then + XVFB_RUN_TMPDIR="$(mktemp -d -t $PROGNAME.XXXXXX)" + # Create empty file to avoid xauth warning + AUTHFILE=$(tempfile -n "$XVFB_RUN_TMPDIR/Xauthority") +fi + +# Start Xvfb. +MCOOKIE=$(mcookie) +tries=10 +while [ $tries -gt 0 ]; do + tries=$(( $tries - 1 )) + XAUTHORITY=$AUTHFILE xauth source - << EOF >>"$ERRORFILE" 2>&1 +add :$SERVERNUM $XAUTHPROTO $MCOOKIE +EOF + # handle SIGUSR1 so Xvfb knows to send a signal when it's ready to accept + # connections + trap : USR1 + (trap '' USR1; exec Xvfb ":$SERVERNUM" $XVFBARGS $LISTENTCP -auth $AUTHFILE >>"$ERRORFILE" 2>&1) & + XVFBPID=$! + + wait || : + if kill -0 $XVFBPID 2>/dev/null; then + break + elif [ -n "$AUTONUM" ]; then + # The display is in use so try another one (if '-a' was specified). + SERVERNUM=$((SERVERNUM + 1)) + SERVERNUM=$(find_free_servernum) + continue + fi + error "Xvfb failed to start" >&2 + XVFBPID= + exit 1 +done + +# Start the command and save its exit status. +set +e +DISPLAY=:$SERVERNUM XAUTHORITY=$AUTHFILE "$@" 2>&1 +RETVAL=$? +set -e + +# Return the executed command's exit status. +exit $RETVAL + +# vim:set ai et sts=4 sw=4 tw=80: --- xorg-server-1.18.2.orig/debian/local/xvfb-run.1 +++ xorg-server-1.18.2/debian/local/xvfb-run.1 @@ -0,0 +1,275 @@ +.\" Copyright 1998-2004 Branden Robinson . +.\" +.\" This is free software; you may redistribute it and/or modify +.\" it under the terms of the GNU General Public License as +.\" published by the Free Software Foundation; either version 2, +.\" or (at your option) any later version. +.\" +.\" This is distributed in the hope that it will be useful, but +.\" WITHOUT ANY WARRANTY; without even the implied warranty of +.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +.\" GNU General Public License for more details. +.\" +.\" You should have received a copy of the GNU General Public License with +.\" the Debian operating system, in /usr/share/common-licenses/GPL; if +.\" not, write to the Free Software Foundation, Inc., 59 Temple Place, +.\" Suite 330, Boston, MA 02111-1307 USA +.\" +.\" We need the URL macro from groff's www macro package, but also want +.\" things to work all right for people who don't have it. So we define +.\" our own URL macro and let the www macro package override it if it's +.\" available. +.de URL +\\$2 \(laURL: \\$1 \(ra\\$3 +.. +.if \n[.g] .mso www.tmac +.TH xvfb\-run 1 "2004\-11\-12" "Debian Project" +.SH NAME +xvfb\-run \- run specified X client or command in a virtual X server environment +.SH SYNOPSIS +.B xvfb\-run +[ +.I options +] +.I command +.SH DESCRIPTION +.B xvfb\-run +is a wrapper for the +.BR Xvfb (1x) +command which simplifies the task of running commands (typically an X +client, or a script containing a list of clients to be run) within a virtual +X server environment. +.PP +.B xvfb\-run +sets up an X authority file (or uses an existing user\-specified one), +writes a cookie to it (see +.BR xauth (1x)) +and then starts the +.B Xvfb +X server as a background process. +The process ID of +.B Xvfb +is stored for later use. +The specified +.I command +is then run using the X display corresponding to the +.B Xvfb +server +just started and the X authority file created earlier. +.PP +When the +.I command +exits, its status is saved, the +.B Xvfb +server is killed (using the process ID stored earlier), the X authority +cookie removed, and the authority file deleted (if the user did not specify +one to use). +.B xvfb\-run +then exits with the exit status of +.IR command . +.PP +.B xvfb\-run +requires the +.B xauth +command to function. +.SH OPTIONS +.TP +.B \-a\fR,\fB \-\-auto\-servernum +Try to get a free server number, starting at 99, or the argument to +.BR \-\-server\-num . +.TP +.BI \-e\ file \fR,\fB\ \-\-error\-file= file +Store output from +.B xauth +and +.B Xvfb +in +.IR file . +The default is +.IR /dev/null . +.TP +.BI \-f\ file \fR,\fB\ \-\-auth\-file= file +Store X authentication data in +.IR file . +By default, a temporary directory called +.IR xvfb\-run. PID +(where PID is the process ID of +.B xvfb\-run +itself) is created in the directory specified by the environment variable +.B TMPDIR +(or +.I /tmp +if that variable is null or unset), and the +.BR tempfile (1) +command is used to create a file in that temporary directory called +.IR Xauthority . +.TP +.B \-h\fR,\fB \-\-help +Display a usage message and exit. +.TP +.BI \-n\ servernumber \fR,\fB\ \-\-server\-num= servernumber +Use +.I servernumber +as the server number (but see the +.B \-a\fR,\fB \-\-auto\-servernum +option above). +The default is 99. +.TP +.B \-l\fR,\fB \-\-listen\-tcp +Enable TCP port listening in the X server. +For security reasons (to avoid denial\-of\-service attacks or exploits), +TCP port listening is disabled by default. +.TP +.BI \-p\ protocolname \fR,\fB\ \-\-xauth\-protocol= protocolname +Use +.I protocolname +as the X authority protocol to use. +The default is \(oq.\(cq, which +.B xauth +interprets as its own default protocol, which is MIT\-MAGIC\-COOKIE\-1. +.TP +.BI \-s\ arguments \fR,\fB\ \-\-server\-args= arguments +Pass +.I arguments +to the +.B Xvfb +server. +Be careful to quote any whitespace characters that may occur within +.I arguments +to prevent them from regarded as separators for +.BR xvfb\-run 's +own arguments. +Also, note that specification of \(oq\-nolisten tcp\(cq in +.I arguments +may override the function of +.BR xvfb\-run 's +own +.B \-l\fR,\fB \-\-listen\-tcp +option, and that specification of the server number (e.g., \(oq:1\(cq) may +be ignored because of the way the X server parses its argument list. +Use the +.B xvfb\-run +option +.BI \-n\ servernumber \fR,\fB\ \-\-server\-num= servernumber +to achieve the latter function. +The default is \(oq\-screen 0 640x480x8\(cq. +.TP +.BI \-w\ delay \fR,\fB\ \-\-wait= delay +Ignored for compatibility with earlier versions. +.SH ENVIRONMENT +.TP +.B COLUMNS +indicates the width of the terminal device in character cells. +This value is used for formatting diagnostic messages. +If not set, the terminal is queried using +.BR stty (1) +to determine its width. +If that fails, a value of \(oq80\(cq is assumed. +.TP +.B TMPDIR +specifies the directory in which to place +.BR xvfb\-run 's +temporary directory for storage of the X authority file; only used if the +.B \-f +or +.B \-\-auth\-file +options are not specified. +.SH "OUTPUT FILES" +.PP +Unless the +.B \-f +or +.B \-\-auth\-file +options are specified, a temporary +directory and file within it are created (and deleted) to store the X +authority cookies used by the +.B Xvfb +server and client(s) run under it. +See +.BR tempfile (1). +If \-f or \-\-auth\-file are used, then the specified X authority file is +only written to, not created or deleted (though +.B xauth +creates an authority file itself if told to use use that does not already +exist). +.PP +An error file with a user\-specified name is also created if the +.B \-e +or +.B \-\-error\-file +options are specifed; see above. +.SH "EXIT STATUS" +.B xvfb\-run +uses its exit status as well as output to standard error to communicate +diagnostics. +The exit status of \(oq1\(cq is not used, and should be interpreted as failure +of the specified command. +.TP +0 +.B xvfb\-run +only uses this exit status if the +.B \-h\fR,\fB \-\-help +option is given. +In all other situations, this may be interpreted as success of the specified +command. +.TP +2 +No command to run was specified. +.TP +3 +The +.B xauth +command is not available. +.TP +4 +The temporary directory that was going to be used already exists; since +.B xvfb\-run +produces a uniquely named directory, this may indicate an attempt by another +process on the system to exploit a temporary file race condition. +.TP +5 +A problem was encountered while cleaning up the temporary directory. +.TP +6 +A problem was encountered while using +.BR getopt (1) +to parse the command\-line arguments. +.SH EXAMPLES +.TP +.B xvfb\-run \-\-auto\-servernum \-\-server\-num=1 xlogo +runs the +.BR xlogo (1x) +demonstration client inside the +.B Xvfb +X server on the first available server number greater than or equal to 1. +.TP +.B xvfb\-run \-\-server\-args="\-screen 0 1024x768x24" ico \-faces +runs the +.BR ico (1x) +demonstration client (and passes it the +.B \-faces +argument) inside the +.B Xvfb +X server, configured with a root window of 1024 by 768 pixels and a color +depth of 24 bits. +.PP +Note that the demo X clients used in the above examples will not exit on +their own, so they will have to be killed before +.B xvfb\-run +will exit. +.SH BUGS +See +.URL "http://bugs.debian.org/xvfb" "the Debian Bug Tracking System" . +If you wish to report a bug in +.BR xvfb\-run , +please use the +.BR reportbug (1) +command. +.SH AUTHOR +.B xvfb\-run +was written by Branden Robinson and Jeff Licquia with sponsorship from +Progeny Linux Systems. +.SH "SEE ALSO" +.BR Xvfb (1x), +.BR xauth (1x) +.\" vim:set et tw=80: --- xorg-server-1.18.2.orig/debian/patches/001_fedora_extramodes.patch +++ xorg-server-1.18.2/debian/patches/001_fedora_extramodes.patch @@ -0,0 +1,83 @@ +From: Adam Jackson +Date: Sun, 28 Oct 2007 09:37:52 +0100 +Subject: [PATCH] Fedora extra modes list + +--- +--- a/hw/xfree86/common/extramodes ++++ b/hw/xfree86/common/extramodes +@@ -3,16 +3,75 @@ + // + // $XFree86: xc/programs/Xserver/hw/xfree86/etc/extramodes,v 1.5 2002/06/05 19:43:05 dawes Exp $ + // ++// NOTE: Please keep all video modes sorted in order of X res, then Y res for ++// ease of maintenance and readability. + + # 832x624 @ 75Hz (74.55Hz) (fix if the official/Apple spec is different) hsync: 49.725kHz + ModeLine "832x624" 57.284 832 864 928 1152 624 625 628 667 -Hsync -Vsync + ++# 1152x864 @ 60.00 Hz (GTF) hsync: 53.70 kHz; pclk: 81.62 MHz ++Modeline "1152x864" 81.62 1152 1216 1336 1520 864 865 868 895 -HSync +Vsync ++ ++# 1152x864 @ 70.00 Hz (GTF) hsync: 63.00 kHz; pclk: 96.77 MHz ++Modeline "1152x864" 96.77 1152 1224 1344 1536 864 865 868 900 -HSync +Vsync ++ ++# 1152x864 @ 75.00 Hz (GTF) hsync: 67.65 kHz; pclk: 104.99 MHz ++Modeline "1152x864" 104.99 1152 1224 1352 1552 864 865 868 902 -HSync +Vsync ++ ++# 1152x864 @ 85.00 Hz (GTF) hsync: 77.10 kHz; pclk: 119.65 MHz ++Modeline "1152x864" 119.65 1152 1224 1352 1552 864 865 868 907 -HSync +Vsync ++ ++# 1152x864 @ 85Hz (Red Hat custom modeline) ++ModeLine "1152x864" 121.5 1152 1216 1344 1568 864 865 868 911 +hsync -vsync ++ ++# 1152x864 @ 100.00 Hz (GTF) hsync: 91.50 kHz; pclk: 143.47 MHz ++Modeline "1152x864" 143.47 1152 1232 1360 1568 864 865 868 915 -HSync +Vsync ++ ++# 1360x768 59.96 Hz (CVT) hsync: 47.37 kHz; pclk: 72.00 MHz ++Modeline "1360x768" 72.00 1360 1408 1440 1520 768 771 781 790 +hsync -vsync ++ ++# 1360x768 59.80 Hz (CVT) hsync: 47.72 kHz; pclk: 84.75 MHz ++Modeline "1360x768" 84.75 1360 1432 1568 1776 768 771 781 798 -hsync +vsync ++ + # 1400x1050 @ 60Hz (VESA GTF) hsync: 65.5kHz + ModeLine "1400x1050" 122.0 1400 1488 1640 1880 1050 1052 1064 1082 +hsync +vsync + ++# 1400x1050 @ 70.00 Hz (GTF) hsync: 76.51 kHz; pclk: 145.06 MHz ++Modeline "1400x1050" 145.06 1400 1496 1648 1896 1050 1051 1054 1093 -HSync +Vsync ++ + # 1400x1050 @ 75Hz (VESA GTF) hsync: 82.2kHz + ModeLine "1400x1050" 155.8 1400 1464 1784 1912 1050 1052 1064 1090 +hsync +vsync + ++# 1400x1050 @ 85.00 Hz (GTF) hsync: 93.76 kHz; pclk: 179.26 MHz ++Modeline "1400x1050" 179.26 1400 1504 1656 1912 1050 1051 1054 1103 -HSync +Vsync ++ ++# 1440x900 @ 60.00 Hz (CVT) field rate 59.89 Hz; hsync: 55.93 kHz; pclk: 106.50 MHz ++Modeline "1440x900" 106.50 1440 1520 1672 1904 900 903 909 934 -HSync +Vsync ++ ++# 1600x1024 for SGI 1600 SW ++ModeLine "1600x1024" 103.125 1600 1600 1656 1664 1024 1024 1029 1030 +Hsync +Vsync ++ ++# 1680x1050 59.88 Hz (CVT 1.76MA-R) hsync: 64.67 kHz; pclk: 119.00 MHz ++Modeline "1680x1050" 119.00 1680 1728 1760 1840 1050 1053 1059 1080 +hsync -vsync ++ ++# 1680x1050 59.95 Hz (CVT 1.76MA) hsync: 65.29 kHz; pclk: 146.25 MHz ++Modeline "1680x1050" 146.25 1680 1784 1960 2240 1050 1053 1059 1089 -hsync +vsync ++ ++# 1680x1050 69.88 Hz (CVT) hsync: 76.58 kHz; pclk: 174.00 MHz ++Modeline "1680x1050" 174.00 1680 1800 1976 2272 1050 1053 1059 1096 -hsync +vsync ++ ++# 1680x1050 74.89 Hz (CVT 1.76MA) hsync: 82.31 kHz; pclk: 187.00 MHz ++Modeline "1680x1050" 187.00 1680 1800 1976 2272 1050 1053 1059 1099 -hsync +vsync ++ ++# 1680x1050 84.94 Hz (CVT 1.76MA) hsync: 93.86 kHz; pclk: 214.75 MHz ++Modeline "1680x1050" 214.75 1680 1808 1984 2288 1050 1053 1059 1105 -hsync +vsync ++ ++# 1920x1080 59.93 Hz (CVT 2.07M9-R) hsync: 66.59 kHz; pclk: 138.50 MHz ++Modeline "1920x1080" 138.50 1920 1968 2000 2080 1080 1083 1088 1111 +hsync -vsync ++ ++# 1920x1200 59.95 Hz (CVT 2.30MA-R) hsync: 74.04 kHz; pclk: 154.00 MHz ++Modeline "1920x1200" 154.00 1920 1968 2000 2080 1200 1203 1209 1235 +hsync -vsync ++ + # 1920x1440 @ 85Hz (VESA GTF) hsync: 128.5kHz + Modeline "1920x1440" 341.35 1920 2072 2288 2656 1440 1441 1444 1512 -hsync +vsync + --- xorg-server-1.18.2.orig/debian/patches/02_kbsd-input-devd.diff +++ xorg-server-1.18.2/debian/patches/02_kbsd-input-devd.diff @@ -0,0 +1,560 @@ +>From d96e2bd2a2b48ede527ad7071d3e0eeda9861b73 Mon Sep 17 00:00:00 2001 +From: Robert Millan +Date: Mon, 24 Feb 2014 23:22:57 +0100 +Subject: [PATCH] Add devd config backend for FreeBSD (and GNU/kFreeBSD) + +Based on original code by Baptiste Daroussin, with some fixes made +by Koop Mast and myself. + +Signed-off-by: Robert Millan +--- + config/Makefile.am | 4 + + config/config-backends.h | 5 + + config/config.c | 5 + + config/devd.c | 387 +++++++++++++++++++++++++++++++++++++++ + configure.ac | 16 ++ + hw/xfree86/common/xf86Config.c | 7 +- + hw/xfree86/common/xf86Globals.c | 3 +- + include/dix-config.h.in | 3 + + 8 files changed, 427 insertions(+), 3 deletions(-) + create mode 100644 config/devd.c + +Index: xorg-server/config/Makefile.am +=================================================================== +--- xorg-server.orig/config/Makefile.am ++++ xorg-server/config/Makefile.am +@@ -34,6 +34,10 @@ if CONFIG_WSCONS + libconfig_la_SOURCES += wscons.c + endif # CONFIG_WSCONS + ++if CONFIG_DEVD ++libconfig_la_SOURCES += devd.c ++endif ++ + endif # !CONFIG_HAL + + endif # !CONFIG_UDEV +Index: xorg-server/config/config-backends.h +=================================================================== +--- xorg-server.orig/config/config-backends.h ++++ xorg-server/config/config-backends.h +@@ -44,3 +44,8 @@ void config_hal_fini(void); + int config_wscons_init(void); + void config_wscons_fini(void); + #endif ++ ++#ifdef CONFIG_DEVD ++int config_devd_init(void); ++void config_devd_fini(void); ++#endif +Index: xorg-server/config/config.c +=================================================================== +--- xorg-server.orig/config/config.c ++++ xorg-server/config/config.c +@@ -55,6 +55,9 @@ config_init(void) + #elif defined(CONFIG_WSCONS) + if (!config_wscons_init()) + ErrorF("[config] failed to initialise wscons\n"); ++#elif defined(CONFIG_DEVD) ++ if (!config_devd_init()) ++ ErrorF("[config] failed to initialise devd\n"); + #endif + } + +@@ -67,6 +70,8 @@ config_fini(void) + config_hal_fini(); + #elif defined(CONFIG_WSCONS) + config_wscons_fini(); ++#elif defined(CONFIG_DEVD) ++ config_devd_fini(); + #endif + } + +Index: xorg-server/config/devd.c +=================================================================== +--- /dev/null ++++ xorg-server/config/devd.c +@@ -0,0 +1,387 @@ ++/* ++ * Copyright © 2012 Baptiste Daroussin ++ * Copyright © 2014 Robert Millan ++ * ++ * Permission is hereby granted, free of charge, to any person obtaining a ++ * copy of this software and associated documentation files (the "Software"), ++ * to deal in the Software without restriction, including without limitation ++ * the rights to use, copy, modify, merge, publish, distribute, sublicense, ++ * and/or sell copies of the Software, and to permit persons to whom the ++ * Software is furnished to do so, subject to the following conditions: ++ * ++ * The above copyright notice and this permission notice (including the next ++ * paragraph) shall be included in all copies or substantial portions of the ++ * Software. ++ * ++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR ++ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, ++ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL ++ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER ++ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING ++ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER ++ * DEALINGS IN THE SOFTWARE. ++ * ++ * Author: Baptiste Daroussin ++ */ ++ ++#ifdef HAVE_DIX_CONFIG_H ++#include ++#endif ++ ++#include ++#include ++#include ++#include ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++#include "input.h" ++#include "inputstr.h" ++#include "hotplug.h" ++#include "config-backends.h" ++#include "os.h" ++ ++#define DEVD_SOCK_PATH "/var/run/devd.pipe" ++ ++#define DEVD_EVENT_ADD '+' ++#define DEVD_EVENT_REMOVE '-' ++ ++static int sock_devd = -1; ++ ++struct hw_type { ++ const char *driver; ++ int flag; ++ const char *xdriver; ++}; ++ ++static struct hw_type hw_types[] = { ++ {"ukbd", ATTR_KEYBOARD, "kbd"}, ++ {"atkbd", ATTR_KEYBOARD, "kbd"}, ++ {"ums", ATTR_POINTER, "mouse"}, ++ {"psm", ATTR_POINTER, "mouse"}, ++ {"uhid", ATTR_POINTER, "mouse"}, ++ {"joy", ATTR_JOYSTICK, NULL}, ++ {"atp", ATTR_TOUCHPAD, NULL}, ++ {"uep", ATTR_TOUCHSCREEN, NULL}, ++ {NULL, -1, NULL}, ++}; ++ ++static bool ++sysctl_exists(const char *format, ...) ++{ ++ va_list args; ++ char *name = NULL; ++ size_t len; ++ int ret; ++ ++ if (format == NULL) ++ return false; ++ ++ va_start(args, format); ++ vasprintf(&name, format, args); ++ va_end(args); ++ ++ ret = sysctlbyname(name, NULL, &len, NULL, 0); ++ ++ if (ret == -1) ++ len = 0; ++ ++ free(name); ++ return (len > 0); ++} ++ ++static char * ++sysctl_get_str(const char *format, ...) ++{ ++ va_list args; ++ char *name = NULL; ++ char *dest = NULL; ++ size_t len; ++ ++ if (format == NULL) ++ return NULL; ++ ++ va_start(args, format); ++ vasprintf(&name, format, args); ++ va_end(args); ++ ++ if (sysctlbyname(name, NULL, &len, NULL, 0) == 0) { ++ dest = malloc(len + 1); ++ if (!dest) ++ goto unwind; ++ if (sysctlbyname(name, dest, &len, NULL, 0) == 0) ++ dest[len] = '\0'; ++ else { ++ free(dest); ++ dest = NULL; ++ } ++ } ++ ++ unwind: ++ free(name); ++ return dest; ++} ++ ++static void ++device_added(char *devname) ++{ ++ char path[PATH_MAX]; ++ char *vendor; ++ char *product = NULL; ++ char *config_info = NULL; ++ char *walk; ++ InputOption *options = NULL; ++ InputAttributes attrs = { }; ++ DeviceIntPtr dev = NULL; ++ int i, rc; ++ int fd; ++ ++ for (i = 0; hw_types[i].driver != NULL; i++) { ++ if (strncmp(devname, hw_types[i].driver, ++ strlen(hw_types[i].driver)) == 0 && ++ isdigit(*(devname + strlen(hw_types[i].driver)))) { ++ attrs.flags |= hw_types[i].flag; ++ break; ++ } ++ } ++ if (hw_types[i].driver == NULL) { ++ LogMessageVerb(X_INFO, 10, "config/devd: ignoring device %s\n", ++ devname); ++ return; ++ } ++ if (hw_types[i].xdriver == NULL) { ++ LogMessageVerb(X_INFO, 10, "config/devd: ignoring device %s\n", ++ devname); ++ return; ++ } ++ snprintf(path, sizeof(path), "/dev/%s", devname); ++ ++ options = input_option_new(NULL, "_source", "server/devd"); ++ if (!options) ++ return; ++ ++ vendor = ++ sysctl_get_str("dev.%s.%s.%%desc", hw_types[i].driver, ++ devname + strlen(hw_types[i].driver)); ++ if (vendor == NULL) { ++ attrs.vendor = strdup("(unnamed)"); ++ attrs.product = strdup("(unnamed)"); ++ } ++ else { ++ if ((walk = strchr(vendor, ' ')) != NULL) { ++ walk[0] = '\0'; ++ walk++; ++ product = walk; ++ if ((walk = strchr(product, ',')) != NULL) ++ walk[0] = '\0'; ++ } ++ ++ attrs.vendor = strdup(vendor); ++ if (product) ++ attrs.product = strdup(product); ++ else ++ attrs.product = strdup("(unnamed)"); ++ ++ options = input_option_new(options, "name", xstrdup(attrs.product)); ++ ++ free(vendor); ++ } ++ attrs.usb_id = NULL; ++ attrs.device = strdup(path); ++ options = input_option_new(options, "driver", hw_types[i].xdriver); ++ if (attrs.flags & ATTR_KEYBOARD) { ++ /* ++ * Don't pass device option if keyboard is attached to console (open fails), ++ * thus activating special logic in xf86-input-keyboard. ++ */ ++ fd = open(path, O_RDONLY | O_NONBLOCK | O_EXCL); ++ if (fd > 0) { ++ close(fd); ++ options = input_option_new(options, "device", xstrdup(path)); ++ } ++ } ++ else { ++ options = input_option_new(options, "device", xstrdup(path)); ++ } ++ ++ if (asprintf(&config_info, "devd:%s", devname) == -1) { ++ config_info = NULL; ++ goto unwind; ++ } ++ ++ if (device_is_duplicate(config_info)) { ++ LogMessage(X_WARNING, "config/devd: device %s already added. " ++ "Ignoring.\n", attrs.product); ++ goto unwind; ++ } ++ ++ options = input_option_new(options, "config_info", config_info); ++ LogMessage(X_INFO, "config/devd: adding input device %s (%s)\n", ++ attrs.product, path); ++ ++ rc = NewInputDeviceRequest(options, &attrs, &dev); ++ ++ if (rc != Success) ++ goto unwind; ++ ++ unwind: ++ free(config_info); ++ input_option_free_list(&options); ++ ++ free(attrs.usb_id); ++ free(attrs.product); ++ free(attrs.device); ++ free(attrs.vendor); ++} ++ ++static void ++device_removed(char *devname) ++{ ++ char *value; ++ ++ if (asprintf(&value, "devd:%s", devname) == -1) ++ return; ++ ++ remove_devices("devd", value); ++ ++ free(value); ++} ++ ++static ssize_t ++socket_getline(int fd, char **out) ++{ ++ char *buf, *newbuf; ++ ssize_t ret, cap, sz = 0; ++ char c; ++ ++ cap = 1024; ++ buf = malloc(cap * sizeof(char)); ++ if (!buf) ++ return -1; ++ ++ for (;;) { ++ ret = read(sock_devd, &c, 1); ++ if (ret < 1) { ++ if (errno == EINTR) ++ continue; ++ free(buf); ++ return -1; ++ } ++ ++ if (c == '\n') ++ break; ++ ++ if (sz + 1 >= cap) { ++ cap *= 2; ++ newbuf = realloc(buf, cap * sizeof(char)); ++ if (!newbuf) { ++ free(buf); ++ return -1; ++ } ++ buf = newbuf; ++ } ++ buf[sz] = c; ++ sz++; ++ } ++ ++ buf[sz] = '\0'; ++ if (sz >= 0) ++ *out = buf; ++ else ++ free(buf); ++ ++ return sz; /* number of bytes in the line, not counting the line break */ ++} ++ ++static void ++wakeup_handler(void *data, int err, void *read_mask) ++{ ++ char *line = NULL; ++ char *walk; ++ ++ if (err < 0) ++ return; ++ ++ if (FD_ISSET(sock_devd, (fd_set *) read_mask)) { ++ if (socket_getline(sock_devd, &line) < 0) ++ return; ++ ++ walk = strchr(line + 1, ' '); ++ if (walk != NULL) ++ walk[0] = '\0'; ++ ++ switch (*line) { ++ case DEVD_EVENT_ADD: ++ device_added(line + 1); ++ break; ++ case DEVD_EVENT_REMOVE: ++ device_removed(line + 1); ++ break; ++ default: ++ break; ++ } ++ free(line); ++ } ++} ++ ++static void ++block_handler(void *data, struct timeval **tv, void *read_mask) ++{ ++} ++ ++int ++config_devd_init(void) ++{ ++ struct sockaddr_un devd; ++ char devicename[1024]; ++ int i, j; ++ ++ /* first scan the sysctl to determine the hardware if needed */ ++ ++ for (i = 0; hw_types[i].driver != NULL; i++) { ++ for (j = 0; sysctl_exists("dev.%s.%i.%%desc", hw_types[i].driver, j); ++ j++) { ++ snprintf(devicename, sizeof(devicename), "%s%i", hw_types[i].driver, ++ j); ++ device_added(devicename); ++ } ++ ++ } ++ sock_devd = socket(AF_UNIX, SOCK_STREAM, 0); ++ if (sock_devd < 0) { ++ ErrorF("config/devd: Fail opening stream socket"); ++ return 0; ++ } ++ ++ devd.sun_family = AF_UNIX; ++ strlcpy(devd.sun_path, DEVD_SOCK_PATH, sizeof(devd.sun_path)); ++ ++ if (connect(sock_devd, (struct sockaddr *) &devd, sizeof(devd)) < 0) { ++ close(sock_devd); ++ ErrorF("config/devd: Fail to connect to devd"); ++ return 0; ++ } ++ ++ RegisterBlockAndWakeupHandlers(block_handler, wakeup_handler, NULL); ++ AddGeneralSocket(sock_devd); ++ ++ return 1; ++} ++ ++void ++config_devd_fini(void) ++{ ++ if (sock_devd < 0) ++ return; ++ ++ RemoveGeneralSocket(sock_devd); ++ RemoveBlockAndWakeupHandlers(block_handler, wakeup_handler, NULL); ++ close(sock_devd); ++} +Index: xorg-server/configure.ac +=================================================================== +--- xorg-server.orig/configure.ac ++++ xorg-server/configure.ac +@@ -606,6 +606,7 @@ AC_ARG_ENABLE(dpms, AS_HELP_ST + AC_ARG_ENABLE(config-udev, AS_HELP_STRING([--enable-config-udev], [Build udev support (default: auto)]), [CONFIG_UDEV=$enableval], [CONFIG_UDEV=auto]) + AC_ARG_ENABLE(config-udev-kms, AS_HELP_STRING([--enable-config-udev-kms], [Build udev kms support (default: auto)]), [CONFIG_UDEV_KMS=$enableval], [CONFIG_UDEV_KMS=auto]) + AC_ARG_ENABLE(config-hal, AS_HELP_STRING([--disable-config-hal], [Build HAL support (default: auto)]), [CONFIG_HAL=$enableval], [CONFIG_HAL=auto]) ++AC_ARG_ENABLE(config-devd, AS_HELP_STRING([--disable-config-devd], [Build devd support (default: auto)]), [CONFIG_DEVD=$enableval], [CONFIG_DEVD=auto]) + AC_ARG_ENABLE(config-wscons, AS_HELP_STRING([--enable-config-wscons], [Build wscons config support (default: auto)]), [CONFIG_WSCONS=$enableval], [CONFIG_WSCONS=auto]) + AC_ARG_ENABLE(xfree86-utils, AS_HELP_STRING([--enable-xfree86-utils], [Build xfree86 DDX utilities (default: enabled)]), [XF86UTILS=$enableval], [XF86UTILS=yes]) + AC_ARG_ENABLE(vgahw, AS_HELP_STRING([--enable-vgahw], [Build Xorg with vga access (default: enabled)]), [VGAHW=$enableval], [VGAHW=yes]) +@@ -953,6 +954,21 @@ if test "x$CONFIG_WSCONS" = xyes; then + AC_DEFINE(CONFIG_WSCONS, 1, [Use wscons for input auto configuration]) + fi + ++if test "x$CONFIG_DEVD" = xauto; then ++ case $host_os in ++ freebsd* | kfreebsd*-gnu) ++ CONFIG_DEVD=yes; ++ ;; ++ *) ++ CONFIG_DEVD=no; ++ ;; ++ esac ++fi ++AM_CONDITIONAL(CONFIG_DEVD, [test "x$CONFIG_DEVD" = xyes]) ++if test "x$CONFIG_DEVD" = xyes; then ++ AC_DEFINE(CONFIG_DEVD, 1, [Use devd for input auto configuration]) ++fi ++ + if test "x$USE_SIGIO_BY_DEFAULT" = xyes; then + USE_SIGIO_BY_DEFAULT_VALUE=TRUE + else +@@ -2507,7 +2523,7 @@ AC_SUBST([prefix]) + + AC_CONFIG_COMMANDS([sdksyms], [touch hw/xfree86/sdksyms.dep]) + +-if test "x$CONFIG_HAL" = xno && test "x$CONFIG_UDEV" = xno; then ++if test "x$CONFIG_HAL" = xno && test "x$CONFIG_UDEV" = xno && test "x$CONFIG_DEVD" = xno; then + AC_MSG_WARN([ + *********************************************** + Neither HAL nor udev backend will be enabled. +Index: xorg-server/hw/xfree86/common/xf86Config.c +=================================================================== +--- xorg-server.orig/hw/xfree86/common/xf86Config.c ++++ xorg-server/hw/xfree86/common/xf86Config.c +@@ -1384,15 +1384,18 @@ checkCoreInputDevices(serverLayoutPtr se + } + + if (!xf86Info.forceInputDevices && !(foundPointer && foundKeyboard)) { +-#if defined(CONFIG_HAL) || defined(CONFIG_UDEV) || defined(CONFIG_WSCONS) ++#if defined(CONFIG_HAL) || defined(CONFIG_UDEV) || defined(CONFIG_WSCONS) || \ ++ defined(CONFIG_DEVD) + const char *config_backend; + + #if defined(CONFIG_HAL) + config_backend = "HAL"; + #elif defined(CONFIG_UDEV) + config_backend = "udev"; +-#else ++#elif defined(CONFIG_WSCONS) + config_backend = "wscons"; ++#elif defined(CONFIG_DEVD) ++ config_backend = "devd"; + #endif + xf86Msg(X_INFO, "The server relies on %s to provide the list of " + "input devices.\n\tIf no devices become available, " +Index: xorg-server/hw/xfree86/common/xf86Globals.c +=================================================================== +--- xorg-server.orig/hw/xfree86/common/xf86Globals.c ++++ xorg-server/hw/xfree86/common/xf86Globals.c +@@ -122,7 +122,8 @@ xf86InfoRec xf86Info = { + .pmFlag = TRUE, + .disableRandR = FALSE, + .randRFrom = X_DEFAULT, +-#if defined(CONFIG_HAL) || defined(CONFIG_UDEV) || defined(CONFIG_WSCONS) ++#if defined(CONFIG_HAL) || defined(CONFIG_UDEV) || defined(CONFIG_WSCONS) || \ ++ defined(CONFIG_DEVD) + .forceInputDevices = FALSE, + .autoAddDevices = TRUE, + .autoEnableDevices = TRUE, +Index: xorg-server/include/dix-config.h.in +=================================================================== +--- xorg-server.orig/include/dix-config.h.in ++++ xorg-server/include/dix-config.h.in +@@ -439,6 +439,9 @@ + /* Enable systemd-logind integration */ + #undef SYSTEMD_LOGIND 1 + ++/* Support devd for hotplug */ ++#undef CONFIG_DEVD ++ + /* Have a monotonic clock from clock_gettime() */ + #undef MONOTONIC_CLOCK + --- xorg-server-1.18.2.orig/debian/patches/03_static-nettle.diff +++ xorg-server-1.18.2/debian/patches/03_static-nettle.diff @@ -0,0 +1,17 @@ +Link against static libnettle + +There's no libnettle udeb. + +Index: xorg-server/configure.ac +=================================================================== +--- xorg-server.orig/configure.ac ++++ xorg-server/configure.ac +@@ -1656,7 +1656,7 @@ fi + if test "x$with_sha1" = xlibnettle; then + AC_DEFINE([HAVE_SHA1_IN_LIBNETTLE], [1], + [Use libnettle SHA1 functions]) +- SHA1_LIBS=-lnettle ++ SHA1_LIBS=-l:libnettle.a + fi + AC_CHECK_LIB([gcrypt], [gcry_md_open], [HAVE_LIBGCRYPT=yes]) + if test "x$with_sha1" = x && test "x$HAVE_LIBGCRYPT" = xyes; then --- xorg-server-1.18.2.orig/debian/patches/05_Revert-Unload-submodules.diff +++ xorg-server-1.18.2/debian/patches/05_Revert-Unload-submodules.diff @@ -0,0 +1,30 @@ +From 272537ae14a04911fcf2fec51492fa0f91c4a676 Mon Sep 17 00:00:00 2001 +From: Julien Cristau +Date: Wed, 29 Aug 2012 20:16:40 +0200 +Subject: [PATCH] Revert "Unload submodules." + +This reverts commit 0d4bb5442ceb8e8e4a8de6cfc4203cae469eee72. + +This doesn't seem to work quite well. See Debian bug#686152. +--- + hw/xfree86/common/xf86Helper.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +Index: xorg-server/hw/xfree86/common/xf86Helper.c +=================================================================== +--- xorg-server.orig/hw/xfree86/common/xf86Helper.c ++++ xorg-server/hw/xfree86/common/xf86Helper.c +@@ -1636,7 +1636,13 @@ xf86LoadOneModule(const char *name, void + void + xf86UnloadSubModule(void *mod) + { ++ /* ++ * This is disabled for now. The loader isn't smart enough yet to undo ++ * relocations. ++ */ ++#if 0 + UnloadSubModule(mod); ++#endif + } + + Bool --- xorg-server-1.18.2.orig/debian/patches/08_xfree86_fix_ia64_inx_outx.diff +++ xorg-server-1.18.2/debian/patches/08_xfree86_fix_ia64_inx_outx.diff @@ -0,0 +1,66 @@ +From: Stephan Schreiber +Subject: xfree86: restore {in,out}{b,w,l} on linux/ia64 + +Call the equivalent glibc functions. + +Debian bug #685750 + +Index: xorg-server/hw/xfree86/common/compiler.h +=================================================================== +--- xorg-server.orig/hw/xfree86/common/compiler.h ++++ xorg-server/hw/xfree86/common/compiler.h +@@ -439,6 +439,54 @@ extern _X_EXPORT unsigned int inl(unsign + #include + #endif /* __NetBSD__ */ + ++#elif defined(linux) && defined(__ia64__) ++/* for Linux on ia64, we use the LIBC _inx/_outx routines */ ++/* note that the appropriate setup via "ioperm" needs to be done */ ++/* *before* any inx/outx is done. */ ++ ++extern _X_EXPORT void _outb(unsigned char val, unsigned long port); ++extern _X_EXPORT void _outw(unsigned short val, unsigned long port); ++extern _X_EXPORT void _outl(unsigned int val, unsigned long port); ++extern _X_EXPORT unsigned int _inb(unsigned long port); ++extern _X_EXPORT unsigned int _inw(unsigned long port); ++extern _X_EXPORT unsigned int _inl(unsigned long port); ++ ++static __inline__ void ++outb(unsigned long port, unsigned char val) ++{ ++ _outb(val, port); ++} ++ ++static __inline__ void ++outw(unsigned long port, unsigned short val) ++{ ++ _outw(val, port); ++} ++ ++static __inline__ void ++outl(unsigned long port, unsigned int val) ++{ ++ _outl(val, port); ++} ++ ++static __inline__ unsigned int ++inb(unsigned long port) ++{ ++ return _inb(port); ++} ++ ++static __inline__ unsigned int ++inw(unsigned long port) ++{ ++ return _inw(port); ++} ++ ++static __inline__ unsigned int ++inl(unsigned long port) ++{ ++ return _inl(port); ++} ++ + #elif (defined(linux) || defined(__FreeBSD__)) && defined(__amd64__) + + #include --- xorg-server-1.18.2.orig/debian/patches/glamor-swizzle-red-to-0-for-alpha-textures.diff +++ xorg-server-1.18.2/debian/patches/glamor-swizzle-red-to-0-for-alpha-textures.diff @@ -0,0 +1,31 @@ +commit a288cf58a0dc0f965a6f964c76bb86bb1989d797 +Author: Dave Airlie +Date: Wed Mar 16 10:45:54 2016 +1000 + + glamor: swizzle RED to 0 for alpha textures + + I'm pretty sure Eric suspected this could cause a problem, and we + couldn't find a test. Well loading feedly in firefox seems to trigger + badness that this solves. + + bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=94554 + Reviewed-by: Adam Jackson + Signed-off-by: Dave Airlie + Tested-by: Timo Aaltonen + +diff --git a/glamor/glamor_fbo.c b/glamor/glamor_fbo.c +index a531f60..f4f8749 100644 +--- a/glamor/glamor_fbo.c ++++ b/glamor/glamor_fbo.c +@@ -352,8 +352,10 @@ _glamor_create_tex(glamor_screen_private *glamor_priv, + glBindTexture(GL_TEXTURE_2D, tex); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); +- if (format == glamor_priv->one_channel_format && format == GL_RED) ++ if (format == glamor_priv->one_channel_format && format == GL_RED) { ++ glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_SWIZZLE_R, GL_ZERO); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_SWIZZLE_A, GL_RED); ++ } + glamor_priv->suppress_gl_out_of_memory_logging = true; + glTexImage2D(GL_TEXTURE_2D, 0, format, w, h, 0, + format, GL_UNSIGNED_BYTE, NULL); --- xorg-server-1.18.2.orig/debian/patches/make-sure-hw-cursor-is-hidden-when-it-should.diff +++ xorg-server-1.18.2/debian/patches/make-sure-hw-cursor-is-hidden-when-it-should.diff @@ -0,0 +1,36 @@ +commit 418fe365b45a143680d3b4143dc60f7cdc5a3507 +Author: Michel Dänzer +Date: Thu Mar 24 17:34:23 2016 +0900 + + xfree86/modes: Make sure the HW cursor is hidden when it should be + + When the HW cursor is hidden (e.g. because xf86CursorResetCursor + triggers a switch from HW cursor to SW cursor), the driver isn't + notified of this for disabled CRTCs. If the HW cursor was shown when the + CRTC was disabled, it may still be displayed when the CRTC is enabled + again. + + Prevent this by explicitly hiding the HW cursor again after setting a + mode if it's currently supposed to be hidden. + + Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=94560 + Reviewed-by: Adam Jackson + Signed-off-by: Michel Dänzer + +diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c +index 2639a30..6091b5e 100644 +--- a/hw/xfree86/modes/xf86Crtc.c ++++ b/hw/xfree86/modes/xf86Crtc.c +@@ -368,6 +368,12 @@ xf86CrtcSetModeTransform(xf86CrtcPtr crtc, DisplayModePtr mode, + xf86CrtcSetScreenSubpixelOrder(scrn->pScreen); + if (scrn->ModeSet) + scrn->ModeSet(scrn); ++ ++ /* Make sure the HW cursor is hidden if it's supposed to be, in case ++ * it was hidden while the CRTC was disabled ++ */ ++ if (!xf86_config->cursor_on) ++ xf86_hide_cursors(scrn); + } + else { + crtc->x = saved_x; --- xorg-server-1.18.2.orig/debian/patches/os-treat-ssh-as-a-non-local-client.diff +++ xorg-server-1.18.2/debian/patches/os-treat-ssh-as-a-non-local-client.diff @@ -0,0 +1,97 @@ +commit adefbaee499b9679c6cac21f52ec6545af2b36b5 +Author: Adam Jackson +Date: Mon Mar 28 18:11:09 2016 +0900 + + os: Treat ssh as a non-local client (v4) + + By the time we get to ComputeLocalClient, we've already done + NextAvailableClient → ReserveClientIds → DetermineClientCmd (assuming + we're built with #define CLIENTIDS), so we can look up the name of the + client process and refuse to treat ssh's X forwarding as if it were + local. + + v2: (Michel Dänzer) + * Only match "ssh" itself, not other executable names starting with + that prefix. + * Ignore executable path for the match. + v3: (Michel Dänzer) + * Use GetClientCmdName (Mark Kettenis) + * Perform check on Windows as well, but only ignore path on Cygwin + (Martin Peres, Emil Velikov, Jon Turney) + v4: (Michel Dänzer) + * Cut of any colon and whatever comes after it. (Adam Jackson) + * Add bugzilla reference. + + Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=93261 + + Signed-off-by: Adam Jackson + Signed-off-by: Michel Dänzer + +diff --git a/os/access.c b/os/access.c +index 8b2177f..58f95a9 100644 +--- a/os/access.c ++++ b/os/access.c +@@ -173,6 +173,10 @@ SOFTWARE. + + #endif /* WIN32 */ + ++#if !defined(WIN32) || defined(__CYGWIN__) ++#include ++#endif ++ + #define X_INCLUDE_NETDB_H + #include + +@@ -1080,9 +1084,8 @@ ResetHosts(const char *display) + } + } + +-/* Is client on the local host */ +-Bool +-ComputeLocalClient(ClientPtr client) ++static Bool ++xtransLocalClient(ClientPtr client) + { + int alen, family, notused; + Xtransaddr *from = NULL; +@@ -1115,6 +1118,40 @@ ComputeLocalClient(ClientPtr client) + return FALSE; + } + ++/* Is client on the local host */ ++Bool ++ComputeLocalClient(ClientPtr client) ++{ ++ const char *cmdname = GetClientCmdName(client); ++ ++ if (!xtransLocalClient(client)) ++ return FALSE; ++ ++ /* If the executable name is "ssh", assume that this client connection ++ * is forwarded from another host via SSH ++ */ ++ if (cmdname) { ++ char **cmd; ++ Bool ret; ++ ++ /* Cut off any colon and whatever comes after it, see ++ * https://lists.freedesktop.org/archives/xorg-devel/2015-December/048164.html ++ */ ++ cmd = xstrtokenize(cmdname, ":"); ++ ++#if !defined(WIN32) || defined(__CYGWIN__) ++ cmd[0] = basename(cmd[0]); ++#endif ++ ++ ret = strcmp(cmd[0], "ssh") != 0; ++ free(cmd); ++ ++ return ret; ++ } ++ ++ return TRUE; ++} ++ + /* + * Return the uid and all gids of a connected local client + * Allocates a LocalClientCredRec - caller must call FreeLocalClientCreds --- xorg-server-1.18.2.orig/debian/patches/present-only-requeue-for-next-msc-after-flip-fail.diff +++ xorg-server-1.18.2/debian/patches/present-only-requeue-for-next-msc-after-flip-fail.diff @@ -0,0 +1,35 @@ +commit 3b385105b2d19a1c55e9779ae88d775185eea231 +Author: Michel Dänzer +Date: Thu Mar 24 17:42:47 2016 +0900 + + present: Only requeue for next MSC after flip failure + + This code was added to deal with the driver present hook failing, in + which case we need to wait for the next MSC before executing the + presentation. + + However, it could also take effect in cases where the driver incorrectly + thinks the current MSC matches the target one (e.g. due to the kernel + interface only supporting 32-bit MSC values), in which case it could + result in the presentation getting requeued over and over. + + To prevent such issues, check specifically for the target MSC + immediately following the current MSC. + + Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=94596 + Signed-off-by: Michel Dänzer + Reviewed-by: Keith Packard + +diff --git a/present/present.c b/present/present.c +index 55f6aa7..105e2bf 100644 +--- a/present/present.c ++++ b/present/present.c +@@ -726,7 +726,7 @@ present_execute(present_vblank_ptr vblank, uint64_t ust, uint64_t crtc_msc) + } + + /* If present_flip failed, we may have to requeue for the target MSC */ +- if (msc_is_after(vblank->target_msc, crtc_msc) && ++ if (vblank->target_msc == crtc_msc + 1 && + Success == present_queue_vblank(screen, + vblank->crtc, + vblank->event_id, --- xorg-server-1.18.2.orig/debian/patches/series +++ xorg-server-1.18.2/debian/patches/series @@ -0,0 +1,15 @@ +## Patches with a number < 100 are applied in debian. +## Ubuntu patches start with 100. +001_fedora_extramodes.patch +02_kbsd-input-devd.diff +03_static-nettle.diff +05_Revert-Unload-submodules.diff +#08_xfree86_fix_ia64_inx_outx.diff + +# 1.18.2 regression fixes/workarounds +vidmode-reduce-verbosity-of-getmodeline.diff +glamor-swizzle-red-to-0-for-alpha-textures.diff +present-only-requeue-for-next-msc-after-flip-fail.diff +make-sure-hw-cursor-is-hidden-when-it-should.diff + +os-treat-ssh-as-a-non-local-client.diff --- xorg-server-1.18.2.orig/debian/patches/vidmode-reduce-verbosity-of-getmodeline.diff +++ xorg-server-1.18.2/debian/patches/vidmode-reduce-verbosity-of-getmodeline.diff @@ -0,0 +1,372 @@ +commit 75eecf28ae3709181a51571132b0accd9cae316e +Author: Chris Wilson +Date: Sun Mar 13 13:54:01 2016 +0000 + + Xext/vidmode: Reduce verbosity of GetModeLine debug messages + + In commit f175cf45aebcdda53f3ae49c0eaf27da1f194e92 + Author: Olivier Fourdan + Date: Wed Feb 10 09:34:34 2016 +0100 + + vidmode: move to a separate library of its own + + the verbosity of some old debug messages (which print the reply to every + GetModeLine client request and others) was increased leading to lots of + log spam. Downgrade the logging back to DebugF. + + [ajax: Fix a typo so it compiles.] + + Reviewed-by: Adam Jackson + References: https://bugs.freedesktop.org/show_bug.cgi?id=94515 + Signed-off-by: Chris Wilson + Cc: Olivier Fourdan + +diff --git a/Xext/vidmode.c b/Xext/vidmode.c +index 7c838f4..0cbbdc3 100644 +--- a/Xext/vidmode.c ++++ b/Xext/vidmode.c +@@ -69,7 +69,7 @@ typedef struct { + dixSetPrivate(&(c)->devPrivates, VidModeClientPrivateKey, p) + + #ifdef DEBUG +-#define DEBUG_P(x) LogMessage(X_INFO, x"\n"); ++#define DEBUG_P(x) DebugF(x"\n") + #else + #define DEBUG_P(x) /**/ + #endif +@@ -267,13 +267,13 @@ ProcVidModeGetModeLine(ClientPtr client) + rep.vtotal = VidModeGetModeValue(mode, VIDMODE_V_TOTAL); + rep.flags = VidModeGetModeValue(mode, VIDMODE_FLAGS); + +- LogMessage(X_INFO, "GetModeLine - scrn: %d clock: %ld\n", +- stuff->screen, (unsigned long) rep.dotclock); +- LogMessage(X_INFO, "GetModeLine - hdsp: %d hbeg: %d hend: %d httl: %d\n", +- rep.hdisplay, rep.hsyncstart, rep.hsyncend, rep.htotal); +- LogMessage(X_INFO, " vdsp: %d vbeg: %d vend: %d vttl: %d flags: %ld\n", +- rep.vdisplay, rep.vsyncstart, rep.vsyncend, +- rep.vtotal, (unsigned long) rep.flags); ++ DebugF("GetModeLine - scrn: %d clock: %ld\n", ++ stuff->screen, (unsigned long) rep.dotclock); ++ DebugF("GetModeLine - hdsp: %d hbeg: %d hend: %d httl: %d\n", ++ rep.hdisplay, rep.hsyncstart, rep.hsyncend, rep.htotal); ++ DebugF(" vdsp: %d vbeg: %d vend: %d vttl: %d flags: %ld\n", ++ rep.vdisplay, rep.vsyncstart, rep.vsyncend, ++ rep.vtotal, (unsigned long) rep.flags); + + /* + * Older servers sometimes had server privates that the VidMode +@@ -483,23 +483,23 @@ ProcVidModeAddModeLine(ClientPtr client) + stuff->after_vtotal = oldstuff->after_vtotal; + stuff->after_flags = oldstuff->after_flags; + } +- LogMessage(X_INFO, "AddModeLine - scrn: %d clock: %ld\n", +- (int) stuff->screen, (unsigned long) stuff->dotclock); +- LogMessage(X_INFO, "AddModeLine - hdsp: %d hbeg: %d hend: %d httl: %d\n", +- stuff->hdisplay, stuff->hsyncstart, +- stuff->hsyncend, stuff->htotal); +- LogMessage(X_INFO, " vdsp: %d vbeg: %d vend: %d vttl: %d flags: %ld\n", +- stuff->vdisplay, stuff->vsyncstart, stuff->vsyncend, +- stuff->vtotal, (unsigned long) stuff->flags); +- LogMessage(X_INFO, " after - scrn: %d clock: %ld\n", +- (int) stuff->screen, (unsigned long) stuff->after_dotclock); +- LogMessage(X_INFO, " hdsp: %d hbeg: %d hend: %d httl: %d\n", +- stuff->after_hdisplay, stuff->after_hsyncstart, +- stuff->after_hsyncend, stuff->after_htotal); +- LogMessage(X_INFO, " vdsp: %d vbeg: %d vend: %d vttl: %d flags: %ld\n", +- stuff->after_vdisplay, stuff->after_vsyncstart, +- stuff->after_vsyncend, stuff->after_vtotal, +- (unsigned long) stuff->after_flags); ++ DebugF("AddModeLine - scrn: %d clock: %ld\n", ++ (int) stuff->screen, (unsigned long) stuff->dotclock); ++ DebugF("AddModeLine - hdsp: %d hbeg: %d hend: %d httl: %d\n", ++ stuff->hdisplay, stuff->hsyncstart, ++ stuff->hsyncend, stuff->htotal); ++ DebugF(" vdsp: %d vbeg: %d vend: %d vttl: %d flags: %ld\n", ++ stuff->vdisplay, stuff->vsyncstart, stuff->vsyncend, ++ stuff->vtotal, (unsigned long) stuff->flags); ++ DebugF(" after - scrn: %d clock: %ld\n", ++ (int) stuff->screen, (unsigned long) stuff->after_dotclock); ++ DebugF(" hdsp: %d hbeg: %d hend: %d httl: %d\n", ++ stuff->after_hdisplay, stuff->after_hsyncstart, ++ stuff->after_hsyncend, stuff->after_htotal); ++ DebugF(" vdsp: %d vbeg: %d vend: %d vttl: %d flags: %ld\n", ++ stuff->after_vdisplay, stuff->after_vsyncstart, ++ stuff->after_vsyncend, stuff->after_vtotal, ++ (unsigned long) stuff->after_flags); + + if (ver < 2) { + REQUEST_AT_LEAST_SIZE(xXF86OldVidModeAddModeLineReq); +@@ -572,7 +572,7 @@ ProcVidModeAddModeLine(ClientPtr client) + VidModeSetModeValue(mode, VIDMODE_FLAGS, stuff->flags); + + if (stuff->privsize) +- LogMessage(X_INFO, "AddModeLine - Privates in request have been ignored\n"); ++ DebugF("AddModeLine - Privates in request have been ignored\n"); + + /* Check that the mode is consistent with the monitor specs */ + switch (pVidMode->CheckModeForMonitor(pScreen, mode)) { +@@ -601,7 +601,7 @@ ProcVidModeAddModeLine(ClientPtr client) + + pVidMode->AddModeline(pScreen, mode); + +- LogMessage(X_INFO, "AddModeLine - Succeeded\n"); ++ DebugF("AddModeLine - Succeeded\n"); + + return Success; + } +@@ -640,14 +640,14 @@ ProcVidModeDeleteModeLine(ClientPtr client) + stuff->flags = oldstuff->flags; + stuff->privsize = oldstuff->privsize; + } +- LogMessage(X_INFO, "DeleteModeLine - scrn: %d clock: %ld\n", +- (int) stuff->screen, (unsigned long) stuff->dotclock); +- LogMessage(X_INFO, " hdsp: %d hbeg: %d hend: %d httl: %d\n", +- stuff->hdisplay, stuff->hsyncstart, +- stuff->hsyncend, stuff->htotal); +- LogMessage(X_INFO, " vdsp: %d vbeg: %d vend: %d vttl: %d flags: %ld\n", +- stuff->vdisplay, stuff->vsyncstart, stuff->vsyncend, stuff->vtotal, +- (unsigned long) stuff->flags); ++ DebugF("DeleteModeLine - scrn: %d clock: %ld\n", ++ (int) stuff->screen, (unsigned long) stuff->dotclock); ++ DebugF(" hdsp: %d hbeg: %d hend: %d httl: %d\n", ++ stuff->hdisplay, stuff->hsyncstart, ++ stuff->hsyncend, stuff->htotal); ++ DebugF(" vdsp: %d vbeg: %d vend: %d vttl: %d flags: %ld\n", ++ stuff->vdisplay, stuff->vsyncstart, stuff->vsyncend, stuff->vtotal, ++ (unsigned long) stuff->flags); + + if (ver < 2) { + REQUEST_AT_LEAST_SIZE(xXF86OldVidModeDeleteModeLineReq); +@@ -662,11 +662,11 @@ ProcVidModeDeleteModeLine(ClientPtr client) + bytes_to_int32(sizeof(xXF86VidModeDeleteModeLineReq)); + } + if (len != stuff->privsize) { +- LogMessage(X_INFO, "req_len = %ld, sizeof(Req) = %d, privsize = %ld, " +- "len = %d, length = %d\n", +- (unsigned long) client->req_len, +- (int) sizeof(xXF86VidModeDeleteModeLineReq) >> 2, +- (unsigned long) stuff->privsize, len, stuff->length); ++ DebugF("req_len = %ld, sizeof(Req) = %d, privsize = %ld, " ++ "len = %d, length = %d\n", ++ (unsigned long) client->req_len, ++ (int) sizeof(xXF86VidModeDeleteModeLineReq) >> 2, ++ (unsigned long) stuff->privsize, len, stuff->length); + return BadLength; + } + +@@ -681,46 +681,46 @@ ProcVidModeDeleteModeLine(ClientPtr client) + if (!pVidMode->GetCurrentModeline(pScreen, &mode, &dotClock)) + return BadValue; + +- LogMessage(X_INFO, "Checking against clock: %d (%d)\n", ++ DebugF("Checking against clock: %d (%d)\n", ++ VidModeGetModeValue(mode, VIDMODE_CLOCK), dotClock); ++ DebugF(" hdsp: %d hbeg: %d hend: %d httl: %d\n", ++ VidModeGetModeValue(mode, VIDMODE_H_DISPLAY), ++ VidModeGetModeValue(mode, VIDMODE_H_SYNCSTART), ++ VidModeGetModeValue(mode, VIDMODE_H_SYNCEND), ++ VidModeGetModeValue(mode, VIDMODE_H_TOTAL)); ++ DebugF(" vdsp: %d vbeg: %d vend: %d vttl: %d flags: %d\n", ++ VidModeGetModeValue(mode, VIDMODE_V_DISPLAY), ++ VidModeGetModeValue(mode, VIDMODE_V_SYNCSTART), ++ VidModeGetModeValue(mode, VIDMODE_V_SYNCEND), ++ VidModeGetModeValue(mode, VIDMODE_V_TOTAL), ++ VidModeGetModeValue(mode, VIDMODE_FLAGS)); ++ ++ if ((pVidMode->GetDotClock(pScreen, stuff->dotclock) == dotClock) && ++ MODEMATCH(mode, stuff)) ++ return BadValue; ++ ++ if (!pVidMode->GetFirstModeline(pScreen, &mode, &dotClock)) ++ return BadValue; ++ ++ do { ++ DebugF("Checking against clock: %d (%d)\n", + VidModeGetModeValue(mode, VIDMODE_CLOCK), dotClock); +- LogMessage(X_INFO, " hdsp: %d hbeg: %d hend: %d httl: %d\n", ++ DebugF(" hdsp: %d hbeg: %d hend: %d httl: %d\n", + VidModeGetModeValue(mode, VIDMODE_H_DISPLAY), + VidModeGetModeValue(mode, VIDMODE_H_SYNCSTART), + VidModeGetModeValue(mode, VIDMODE_H_SYNCEND), + VidModeGetModeValue(mode, VIDMODE_H_TOTAL)); +- LogMessage(X_INFO, " vdsp: %d vbeg: %d vend: %d vttl: %d flags: %d\n", ++ DebugF(" vdsp: %d vbeg: %d vend: %d vttl: %d flags: %d\n", + VidModeGetModeValue(mode, VIDMODE_V_DISPLAY), + VidModeGetModeValue(mode, VIDMODE_V_SYNCSTART), + VidModeGetModeValue(mode, VIDMODE_V_SYNCEND), + VidModeGetModeValue(mode, VIDMODE_V_TOTAL), + VidModeGetModeValue(mode, VIDMODE_FLAGS)); + +- if ((pVidMode->GetDotClock(pScreen, stuff->dotclock) == dotClock) && +- MODEMATCH(mode, stuff)) +- return BadValue; +- +- if (!pVidMode->GetFirstModeline(pScreen, &mode, &dotClock)) +- return BadValue; +- +- do { +- LogMessage(X_INFO, "Checking against clock: %d (%d)\n", +- VidModeGetModeValue(mode, VIDMODE_CLOCK), dotClock); +- LogMessage(X_INFO, " hdsp: %d hbeg: %d hend: %d httl: %d\n", +- VidModeGetModeValue(mode, VIDMODE_H_DISPLAY), +- VidModeGetModeValue(mode, VIDMODE_H_SYNCSTART), +- VidModeGetModeValue(mode, VIDMODE_H_SYNCEND), +- VidModeGetModeValue(mode, VIDMODE_H_TOTAL)); +- LogMessage(X_INFO, " vdsp: %d vbeg: %d vend: %d vttl: %d flags: %d\n", +- VidModeGetModeValue(mode, VIDMODE_V_DISPLAY), +- VidModeGetModeValue(mode, VIDMODE_V_SYNCSTART), +- VidModeGetModeValue(mode, VIDMODE_V_SYNCEND), +- VidModeGetModeValue(mode, VIDMODE_V_TOTAL), +- VidModeGetModeValue(mode, VIDMODE_FLAGS)); +- + if ((pVidMode->GetDotClock(pScreen, stuff->dotclock) == dotClock) && + MODEMATCH(mode, stuff)) { + pVidMode->DeleteModeline(pScreen, mode); +- LogMessage(X_INFO, "DeleteModeLine - Succeeded\n"); ++ DebugF("DeleteModeLine - Succeeded\n"); + return Success; + } + } while (pVidMode->GetNextModeline(pScreen, &mode, &dotClock)); +@@ -761,12 +761,12 @@ ProcVidModeModModeLine(ClientPtr client) + stuff->flags = oldstuff->flags; + stuff->privsize = oldstuff->privsize; + } +- LogMessage(X_INFO, "ModModeLine - scrn: %d hdsp: %d hbeg: %d hend: %d httl: %d\n", +- (int) stuff->screen, stuff->hdisplay, stuff->hsyncstart, +- stuff->hsyncend, stuff->htotal); +- LogMessage(X_INFO, " vdsp: %d vbeg: %d vend: %d vttl: %d flags: %ld\n", +- stuff->vdisplay, stuff->vsyncstart, stuff->vsyncend, +- stuff->vtotal, (unsigned long) stuff->flags); ++ DebugF("ModModeLine - scrn: %d hdsp: %d hbeg: %d hend: %d httl: %d\n", ++ (int) stuff->screen, stuff->hdisplay, stuff->hsyncstart, ++ stuff->hsyncend, stuff->htotal); ++ DebugF(" vdsp: %d vbeg: %d vend: %d vttl: %d flags: %ld\n", ++ stuff->vdisplay, stuff->vsyncstart, stuff->vsyncend, ++ stuff->vtotal, (unsigned long) stuff->flags); + + if (ver < 2) { + REQUEST_AT_LEAST_SIZE(xXF86OldVidModeModModeLineReq); +@@ -816,7 +816,7 @@ ProcVidModeModModeLine(ClientPtr client) + VidModeSetModeValue(modetmp, VIDMODE_FLAGS, stuff->flags); + + if (stuff->privsize) +- LogMessage(X_INFO, "ModModeLine - Privates in request have been ignored\n"); ++ DebugF("ModModeLine - Privates in request have been ignored\n"); + + /* Check that the mode is consistent with the monitor specs */ + switch (pVidMode->CheckModeForMonitor(pScreen, modetmp)) { +@@ -856,7 +856,7 @@ ProcVidModeModModeLine(ClientPtr client) + pVidMode->SetCrtcForMode(pScreen, mode); + pVidMode->SwitchMode(pScreen, mode); + +- LogMessage(X_INFO, "ModModeLine - Succeeded\n"); ++ DebugF("ModModeLine - Succeeded\n"); + return Success; + } + +@@ -896,14 +896,14 @@ ProcVidModeValidateModeLine(ClientPtr client) + stuff->privsize = oldstuff->privsize; + } + +- LogMessage(X_INFO, "ValidateModeLine - scrn: %d clock: %ld\n", +- (int) stuff->screen, (unsigned long) stuff->dotclock); +- LogMessage(X_INFO, " hdsp: %d hbeg: %d hend: %d httl: %d\n", +- stuff->hdisplay, stuff->hsyncstart, +- stuff->hsyncend, stuff->htotal); +- LogMessage(X_INFO, " vdsp: %d vbeg: %d vend: %d vttl: %d flags: %ld\n", +- stuff->vdisplay, stuff->vsyncstart, stuff->vsyncend, stuff->vtotal, +- (unsigned long) stuff->flags); ++ DebugF("ValidateModeLine - scrn: %d clock: %ld\n", ++ (int) stuff->screen, (unsigned long) stuff->dotclock); ++ DebugF(" hdsp: %d hbeg: %d hend: %d httl: %d\n", ++ stuff->hdisplay, stuff->hsyncstart, ++ stuff->hsyncend, stuff->htotal); ++ DebugF(" vdsp: %d vbeg: %d vend: %d vttl: %d flags: %ld\n", ++ stuff->vdisplay, stuff->vsyncstart, stuff->vsyncend, stuff->vtotal, ++ (unsigned long) stuff->flags); + + if (ver < 2) { + REQUEST_AT_LEAST_SIZE(xXF86OldVidModeValidateModeLineReq); +@@ -956,7 +956,7 @@ ProcVidModeValidateModeLine(ClientPtr client) + VidModeSetModeValue(modetmp, VIDMODE_V_TOTAL, stuff->vtotal); + VidModeSetModeValue(modetmp, VIDMODE_FLAGS, stuff->flags); + if (stuff->privsize) +- LogMessage(X_INFO, "ValidateModeLine - Privates in request have been ignored\n"); ++ DebugF("ValidateModeLine - Privates in request have been ignored\n"); + + /* Check that the mode is consistent with the monitor specs */ + if ((status = +@@ -982,7 +982,7 @@ ProcVidModeValidateModeLine(ClientPtr client) + swapl(&rep.status); + } + WriteToClient(client, sizeof(xXF86VidModeValidateModeLineReply), &rep); +- LogMessage(X_INFO, "ValidateModeLine - Succeeded (status = %d)\n", status); ++ DebugF("ValidateModeLine - Succeeded (status = %d)\n", status); + + return Success; + } +@@ -1046,14 +1046,14 @@ ProcVidModeSwitchToMode(ClientPtr client) + stuff->privsize = oldstuff->privsize; + } + +- LogMessage(X_INFO, "SwitchToMode - scrn: %d clock: %ld\n", +- (int) stuff->screen, (unsigned long) stuff->dotclock); +- LogMessage(X_INFO, " hdsp: %d hbeg: %d hend: %d httl: %d\n", +- stuff->hdisplay, stuff->hsyncstart, +- stuff->hsyncend, stuff->htotal); +- LogMessage(X_INFO, " vdsp: %d vbeg: %d vend: %d vttl: %d flags: %ld\n", +- stuff->vdisplay, stuff->vsyncstart, stuff->vsyncend, stuff->vtotal, +- (unsigned long) stuff->flags); ++ DebugF("SwitchToMode - scrn: %d clock: %ld\n", ++ (int) stuff->screen, (unsigned long) stuff->dotclock); ++ DebugF(" hdsp: %d hbeg: %d hend: %d httl: %d\n", ++ stuff->hdisplay, stuff->hsyncstart, ++ stuff->hsyncend, stuff->htotal); ++ DebugF(" vdsp: %d vbeg: %d vend: %d vttl: %d flags: %ld\n", ++ stuff->vdisplay, stuff->vsyncstart, stuff->vsyncend, stuff->vtotal, ++ (unsigned long) stuff->flags); + + if (ver < 2) { + REQUEST_AT_LEAST_SIZE(xXF86OldVidModeSwitchToModeReq); +@@ -1089,19 +1089,19 @@ ProcVidModeSwitchToMode(ClientPtr client) + return BadValue; + + do { +- LogMessage(X_INFO, "Checking against clock: %d (%d)\n", +- VidModeGetModeValue(mode, VIDMODE_CLOCK), dotClock); +- LogMessage(X_INFO, " hdsp: %d hbeg: %d hend: %d httl: %d\n", +- VidModeGetModeValue(mode, VIDMODE_H_DISPLAY), +- VidModeGetModeValue(mode, VIDMODE_H_SYNCSTART), +- VidModeGetModeValue(mode, VIDMODE_H_SYNCEND), +- VidModeGetModeValue(mode, VIDMODE_H_TOTAL)); +- LogMessage(X_INFO, " vdsp: %d vbeg: %d vend: %d vttl: %d flags: %d\n", +- VidModeGetModeValue(mode, VIDMODE_V_DISPLAY), +- VidModeGetModeValue(mode, VIDMODE_V_SYNCSTART), +- VidModeGetModeValue(mode, VIDMODE_V_SYNCEND), +- VidModeGetModeValue(mode, VIDMODE_V_TOTAL), +- VidModeGetModeValue(mode, VIDMODE_FLAGS)); ++ DebugF("Checking against clock: %d (%d)\n", ++ VidModeGetModeValue(mode, VIDMODE_CLOCK), dotClock); ++ DebugF(" hdsp: %d hbeg: %d hend: %d httl: %d\n", ++ VidModeGetModeValue(mode, VIDMODE_H_DISPLAY), ++ VidModeGetModeValue(mode, VIDMODE_H_SYNCSTART), ++ VidModeGetModeValue(mode, VIDMODE_H_SYNCEND), ++ VidModeGetModeValue(mode, VIDMODE_H_TOTAL)); ++ DebugF(" vdsp: %d vbeg: %d vend: %d vttl: %d flags: %d\n", ++ VidModeGetModeValue(mode, VIDMODE_V_DISPLAY), ++ VidModeGetModeValue(mode, VIDMODE_V_SYNCSTART), ++ VidModeGetModeValue(mode, VIDMODE_V_SYNCEND), ++ VidModeGetModeValue(mode, VIDMODE_V_TOTAL), ++ VidModeGetModeValue(mode, VIDMODE_FLAGS)); + + if ((pVidMode->GetDotClock(pScreen, stuff->dotclock) == dotClock) && + MODEMATCH(mode, stuff)) { +@@ -1109,7 +1109,7 @@ ProcVidModeSwitchToMode(ClientPtr client) + if (!pVidMode->SwitchMode(pScreen, mode)) + return BadValue; + +- LogMessage(X_INFO, "SwitchToMode - Succeeded\n"); ++ DebugF("SwitchToMode - Succeeded\n"); + return Success; + } + } while (pVidMode->GetNextModeline(pScreen, &mode, &dotClock)); --- xorg-server-1.18.2.orig/debian/po/POTFILES.in +++ xorg-server-1.18.2/debian/po/POTFILES.in @@ -0,0 +1 @@ +[type: gettext/rfc822deb] xserver-xorg-legacy.templates --- xorg-server-1.18.2.orig/debian/po/ar.po +++ xorg-server-1.18.2/debian/po/ar.po @@ -0,0 +1,62 @@ +# translation of ar.po to Arabic +# xserver-xorg translation +# Copyright (C) 2006 The Arabeyes Project +# This file is distributed under the same license as the xserver-xorg package. +# +# Ossama M. Khayat , 2006, 2007, 2008. +msgid "" +msgstr "" +"Project-Id-Version: ar\n" +"Report-Msgid-Bugs-To: xorg@packages.debian.org\n" +"POT-Creation-Date: 2009-06-02 20:32+0200\n" +"PO-Revision-Date: 2008-06-12 03:41+0300\n" +"Last-Translator: Ossama M. Khayat \n" +"Language-Team: Arabic \n" +"Language: ar\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.11.4\n" +"Plural-Forms: nplurals=4; plural=n%100==1 || n==0 ? 0 : n%100==2 ? 2 : n" +"%100>=3 && n%100<=10 ? 2 : 3;\n" + +#. Type: select +#. Choices +#: ../xserver-xorg-legacy.templates:2001 +msgid "Root Only" +msgstr "المستخدم root فقط" + +#. Type: select +#. Choices +#: ../xserver-xorg-legacy.templates:2001 +msgid "Console Users Only" +msgstr "مستخدمي الطرفية فقط" + +#. Type: select +#. Choices +#: ../xserver-xorg-legacy.templates:2001 +msgid "Anybody" +msgstr "أي أحد" + +#. Type: select +#. Description +#: ../xserver-xorg-legacy.templates:2002 +msgid "Users allowed to start the X server:" +msgstr "المستخدمين المسموح لهم تشغيل خادم X:" + +#. Type: select +#. Description +#: ../xserver-xorg-legacy.templates:2002 +msgid "" +"Because the X server runs with superuser privileges, it may be unwise to " +"permit any user to start it, for security reasons. On the other hand, it is " +"even more unwise to run general-purpose X client programs as root, which is " +"what may happen if only root is permitted to start the X server. A good " +"compromise is to permit the X server to be started only by users logged in " +"to one of the virtual consoles." +msgstr "" +"لأن خادم X يعمل بصلاحية المستخدم الخارق، فقد لا يكون من الحكمة السماح لأي " +"مستخدم بتشغيله، لأسباب أمنية. من ناحية أخرى، فليس من الحكمة أيضاً تشغيل برامج " +"X العامة كمستخدم root، والذي قد يحدث إن كان المستخدم root هو الوحيد الذي " +"يمكنه تشغيل خادم X. لذا، فإن الحل الأمثل لهذه المعضلة هو السماح فقط لمستخدمي " +"النظام عبر أحد الطرفيات الوهمية." --- xorg-server-1.18.2.orig/debian/po/ast.po +++ xorg-server-1.18.2/debian/po/ast.po @@ -0,0 +1,64 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +msgid "" +msgstr "" +"Project-Id-Version: xorg_po\n" +"Report-Msgid-Bugs-To: xorg@packages.debian.org\n" +"POT-Creation-Date: 2009-06-02 20:32+0200\n" +"PO-Revision-Date: 2009-01-12 08:33+0100\n" +"Last-Translator: Marcos Alvarez Costales \n" +"Language-Team: Asturian \n" +"Language: ast\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Poedit-Language: Asturian\n" +"X-Poedit-Country: SPAIN\n" + +#. Type: select +#. Choices +#: ../xserver-xorg-legacy.templates:2001 +msgid "Root Only" +msgstr "Namái root" + +#. Type: select +#. Choices +#: ../xserver-xorg-legacy.templates:2001 +msgid "Console Users Only" +msgstr "Namái usuarios de consola" + +#. Type: select +#. Choices +#: ../xserver-xorg-legacy.templates:2001 +msgid "Anybody" +msgstr "Cualesquiera" + +#. Type: select +#. Description +#: ../xserver-xorg-legacy.templates:2002 +msgid "Users allowed to start the X server:" +msgstr "Usuarios a los que se-yos permite arrancar el sirvidor de X:" + +#. Type: select +#. Description +#: ../xserver-xorg-legacy.templates:2002 +msgid "" +"Because the X server runs with superuser privileges, it may be unwise to " +"permit any user to start it, for security reasons. On the other hand, it is " +"even more unwise to run general-purpose X client programs as root, which is " +"what may happen if only root is permitted to start the X server. A good " +"compromise is to permit the X server to be started only by users logged in " +"to one of the virtual consoles." +msgstr "" +"Darréu que'l servidor X execútase con privilexos de superusuariu, pue nun " +"ser enforma prudente dexar que cualesquier usuariu lu arranque, por sides de " +"seguridá. Per otru llau, ye entá más imprudente executar programes veceru de " +"X de forma xeneral como root, lo cual pue asoceder si namái se permite a " +"root aniciar el sirvidor X. Un compromisu ente dambos casos ye permitir " +"que'l sirvidor X lu anicien namái usuarios que tengan entrao per una de les " +"consoles virtuales." --- xorg-server-1.18.2.orig/debian/po/be.po +++ xorg-server-1.18.2/debian/po/be.po @@ -0,0 +1,58 @@ +# translation of xorg_be.po to Belarusian +# Pavel Piatruk , 2008. +# Version xorg 1:7.3+12 +msgid "" +msgstr "" +"Project-Id-Version: xorg_be\n" +"Report-Msgid-Bugs-To: xorg@packages.debian.org\n" +"POT-Creation-Date: 2009-06-02 20:32+0200\n" +"PO-Revision-Date: 2008-06-09 12:18+0300\n" +"Last-Translator: Pavel Piatruk \n" +"Language-Team: Belarusian \n" +"Language: be\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.11.4\n" + +#. Type: select +#. Choices +#: ../xserver-xorg-legacy.templates:2001 +msgid "Root Only" +msgstr "Толькі Root" + +#. Type: select +#. Choices +#: ../xserver-xorg-legacy.templates:2001 +msgid "Console Users Only" +msgstr "Толькі карыстальнікі кансолі" + +#. Type: select +#. Choices +#: ../xserver-xorg-legacy.templates:2001 +msgid "Anybody" +msgstr "Усе" + +#. Type: select +#. Description +#: ../xserver-xorg-legacy.templates:2002 +msgid "Users allowed to start the X server:" +msgstr "Карыстальнікі, якім дазволена запускаць X-сервер:" + +#. Type: select +#. Description +#: ../xserver-xorg-legacy.templates:2002 +msgid "" +"Because the X server runs with superuser privileges, it may be unwise to " +"permit any user to start it, for security reasons. On the other hand, it is " +"even more unwise to run general-purpose X client programs as root, which is " +"what may happen if only root is permitted to start the X server. A good " +"compromise is to permit the X server to be started only by users logged in " +"to one of the virtual consoles." +msgstr "" +"X-сервер працуе з прывілеямі супер-карыстальніка, таму з прычын бяспекі лепш " +"не дазваляць запускаць яго любому карыстальніку. З іншага боку, яшчэ горш " +"сітуацыя, калі ўсе кліенцкія X-праграмы працуюць з прывілеямі супер-" +"карыстальніка - так будзе, калі толькі супер-карыстальніку будзе дазволена " +"стартаваць X-сервер. Найлепшае выйсце - дазволіць запуск X-сервера толькі " +"тым карыстальнікам, што зайшлі ў адну з віртуальных кансоляў." --- xorg-server-1.18.2.orig/debian/po/bg.po +++ xorg-server-1.18.2/debian/po/bg.po @@ -0,0 +1,80 @@ +# translation of bg.po to Bulgarian +# debconf templates for xorg-x11 package +# Bulgarian translation +# +# $Id$ +# +# Copyrights: +# +# This file is distributed under the same license as the xorg-x11 package. +# Please see debian/copyright. +# +# Translators, if you are not familiar with the PO format, gettext +# documentation is worth reading, especially sections dedicated to +# this format, e.g. by running: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# +# Some information specific to po-debconf are available at +# /usr/share/doc/po-debconf/README-trans +# or http://www.debian.org/intl/l10n/po-debconf/README-trans +# +# Developers do not need to manually edit POT or PO files. +# +# Damyan Ivanov , 2006, 2007. +# Damyan Ivanov , 2008. +msgid "" +msgstr "" +"Project-Id-Version: xserver-xorg_debian_po_bg\n" +"Report-Msgid-Bugs-To: xorg@packages.debian.org\n" +"POT-Creation-Date: 2009-06-02 20:32+0200\n" +"PO-Revision-Date: 2008-06-09 09:47+0300\n" +"Last-Translator: Damyan Ivanov \n" +"Language-Team: Bulgarian \n" +"Language: bg\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.11.4\n" + +#. Type: select +#. Choices +#: ../xserver-xorg-legacy.templates:2001 +msgid "Root Only" +msgstr "Само root" + +#. Type: select +#. Choices +#: ../xserver-xorg-legacy.templates:2001 +msgid "Console Users Only" +msgstr "Само потребители на конзолата" + +#. Type: select +#. Choices +#: ../xserver-xorg-legacy.templates:2001 +msgid "Anybody" +msgstr "Всички потребители на системата" + +#. Type: select +#. Description +#: ../xserver-xorg-legacy.templates:2002 +msgid "Users allowed to start the X server:" +msgstr "Потребители, на които им е разрешено да стартират X-сървъра:" + +#. Type: select +#. Description +#: ../xserver-xorg-legacy.templates:2002 +msgid "" +"Because the X server runs with superuser privileges, it may be unwise to " +"permit any user to start it, for security reasons. On the other hand, it is " +"even more unwise to run general-purpose X client programs as root, which is " +"what may happen if only root is permitted to start the X server. A good " +"compromise is to permit the X server to be started only by users logged in " +"to one of the virtual consoles." +msgstr "" +"Понеже X-сървърът се изпълнява с администраторски привилегии, идеята всеки " +"потребител да може да го стартира не е много добра от гледна точка на " +"сигурността. От друга страна, вършенето на ежедневната работа като " +"администратор е още по-лоша идея. Добър компромис е да се разреши " +"стартирането на X-сървъра само на потребители, които работят на системната " +"конзола." --- xorg-server-1.18.2.orig/debian/po/bn.po +++ xorg-server-1.18.2/debian/po/bn.po @@ -0,0 +1,60 @@ +# Bengali translation of xorg. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# Md. Rezwan Shahid , 2009. +msgid "" +msgstr "" +"Project-Id-Version: xorg\n" +"Report-Msgid-Bugs-To: xorg@packages.debian.org\n" +"POT-Creation-Date: 2009-06-02 20:32+0200\n" +"PO-Revision-Date: 2009-04-15 12:27+0600\n" +"Last-Translator: Md. Rezwan Shahid \n" +"Language-Team: Bengali \n" +"Language: bn\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTf-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Generator: WordForge 0.5-beta1\n" + +#. Type: select +#. Choices +#: ../xserver-xorg-legacy.templates:2001 +msgid "Root Only" +msgstr "শুধুমাত্র রুট" + +#. Type: select +#. Choices +#: ../xserver-xorg-legacy.templates:2001 +msgid "Console Users Only" +msgstr "শুধুমাত্র কনসোল ব্যবহারকারী" + +#. Type: select +#. Choices +#: ../xserver-xorg-legacy.templates:2001 +msgid "Anybody" +msgstr "যেকেউ" + +#. Type: select +#. Description +#: ../xserver-xorg-legacy.templates:2002 +msgid "Users allowed to start the X server:" +msgstr "যেসকল ব্যবহারকারী X সার্ভার চালু করতে অনুমতিপ্রাপ্ত:" + +#. Type: select +#. Description +#: ../xserver-xorg-legacy.templates:2002 +msgid "" +"Because the X server runs with superuser privileges, it may be unwise to " +"permit any user to start it, for security reasons. On the other hand, it is " +"even more unwise to run general-purpose X client programs as root, which is " +"what may happen if only root is permitted to start the X server. A good " +"compromise is to permit the X server to be started only by users logged in " +"to one of the virtual consoles." +msgstr "" +"যেহেতু X সার্ভার সুপারইউজার সুবিধাসহ রান করে, যেকোনো ব্যবহারকারীকে এটি চালু করতে " +"দেয়া বুদ্ধিমানের কাজ হবে না (নিরাপত্তার জন্য)। আবার, সাধারন কারনে X ক্লায়েন্ট " +"প্রোগ্রাম চালানোর জন্য রুট হিসেবে লগ-ইন করা ঠিক নয় (যদি শুধুমাত্র রুটের অনুমতি থাকে X " +"সার্ভার চালু করার তখন এটি ঘটে)। একটি ভালো সমাধান হতে পারে, X সার্ভার শুধুমাত্র সেই " +"ব্যবহারকারীদের দ্বারা চালু করা যাবে যারা যেকোনো একটি ভার্চুয়াল কনসোলে লগ-ইন করা " +"আছে।" --- xorg-server-1.18.2.orig/debian/po/bs.po +++ xorg-server-1.18.2/debian/po/bs.po @@ -0,0 +1,70 @@ +# +# Translators, if you are not familiar with the PO format, gettext +# documentation is worth reading, especially sections dedicated to +# this format, e.g. by running: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# +# Some information specific to po-debconf are available at +# /usr/share/doc/po-debconf/README-trans +# or http://www.debian.org/intl/l10n/po-debconf/README-trans +# +# Developers do not need to manually edit POT or PO files. +# +msgid "" +msgstr "" +"Project-Id-Version: xorg\n" +"Report-Msgid-Bugs-To: xorg@packages.debian.org\n" +"POT-Creation-Date: 2009-06-02 20:32+0200\n" +"PO-Revision-Date: 2006-11-01 01:17+0100\n" +"Last-Translator: Safir Secerovic \n" +"Language-Team: Bosnian \n" +"Language: bs\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: 3\n" +"X-Poedit-Country: BOSNIA AND HERZEGOVINA\n" + +#. Type: select +#. Choices +#: ../xserver-xorg-legacy.templates:2001 +msgid "Root Only" +msgstr "Samo root" + +#. Type: select +#. Choices +#: ../xserver-xorg-legacy.templates:2001 +msgid "Console Users Only" +msgstr "Samo konzolni korisnici" + +#. Type: select +#. Choices +#: ../xserver-xorg-legacy.templates:2001 +msgid "Anybody" +msgstr "Svako" + +#. Type: select +#. Description +#: ../xserver-xorg-legacy.templates:2002 +msgid "Users allowed to start the X server:" +msgstr "Korisnici kojima je dopušteno pokretanje X severa:" + +#. Type: select +#. Description +#: ../xserver-xorg-legacy.templates:2002 +msgid "" +"Because the X server runs with superuser privileges, it may be unwise to " +"permit any user to start it, for security reasons. On the other hand, it is " +"even more unwise to run general-purpose X client programs as root, which is " +"what may happen if only root is permitted to start the X server. A good " +"compromise is to permit the X server to be started only by users logged in " +"to one of the virtual consoles." +msgstr "" +"Zbog činjenice što X server radi s privilegijama administratorskog " +"korisnika, nije pametno dopustiti svakom korisniku da ga pokreće iz " +"sigurnosnih razloga. S druge strane, još manje je pametno pokretati X " +"klijentske programe opšte namjene kao root, a što se može dogoditi ako samo " +"root korisniku dopustite pokretanje X servera. Dobar kompromis je dozvoliti " +"pokretanje X servera samo korisnicima koji su ulogirani na jednu od " +"virtuelnih konzola." --- xorg-server-1.18.2.orig/debian/po/ca.po +++ xorg-server-1.18.2/debian/po/ca.po @@ -0,0 +1,79 @@ +# debconf templates for xorg-x11 package +# Catalan translation +# +# $Id: ca.po 1042 2006-01-09 07:55:08Z ender $ +# +# Copyrights: +# Branden Robinson, 2000-2004 +# Ivan Vilata i Balaguer , 2002-2006 +# +# This file is distributed under the same license as the xorg-x11 package. +# Please see debian/copyright. +# +# Translators, if you are not familiar with the PO format, gettext +# documentation is worth reading, especially sections dedicated to +# this format, e.g. by running: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# +# Some information specific to po-debconf are available at +# /usr/share/doc/po-debconf/README-trans +# or http://www.debian.org/intl/l10n/po-debconf/README-trans +# +# Developers do not need to manually edit POT or PO files. +# +msgid "" +msgstr "" +"Project-Id-Version: xorg 1:7.3+12\n" +"Report-Msgid-Bugs-To: xorg@packages.debian.org\n" +"POT-Creation-Date: 2009-06-02 20:32+0200\n" +"PO-Revision-Date: 2008-06-09 09:35+0200\n" +"Last-Translator: Ivan Vilata i Balaguer \n" +"Language-Team: Catalan \n" +"Language: ca\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: select +#. Choices +#: ../xserver-xorg-legacy.templates:2001 +msgid "Root Only" +msgstr "Només root" + +#. Type: select +#. Choices +#: ../xserver-xorg-legacy.templates:2001 +msgid "Console Users Only" +msgstr "Només usuaris de la consola" + +#. Type: select +#. Choices +#: ../xserver-xorg-legacy.templates:2001 +msgid "Anybody" +msgstr "Qualsevol" + +#. Type: select +#. Description +#: ../xserver-xorg-legacy.templates:2002 +msgid "Users allowed to start the X server:" +msgstr "Usuaris que poden iniciar el servidor X:" + +#. Type: select +#. Description +#: ../xserver-xorg-legacy.templates:2002 +msgid "" +"Because the X server runs with superuser privileges, it may be unwise to " +"permit any user to start it, for security reasons. On the other hand, it is " +"even more unwise to run general-purpose X client programs as root, which is " +"what may happen if only root is permitted to start the X server. A good " +"compromise is to permit the X server to be started only by users logged in " +"to one of the virtual consoles." +msgstr "" +"Com que el servidor X corre amb privilegis de superusuari, podria no ser " +"assenyat que qualsevol usuari l’iniciara, per motius de seguretat. D’altra " +"banda, encara té menys seny emprar programes client X de propòsit general " +"com a root, cosa que ocorreria si només root puguera iniciar el servidor X. " +"Un bon compromís és deixar iniciar el servidor X només a aquells usuaris que " +"hagen entrat al sistema per una de les consoles virtuals." + --- xorg-server-1.18.2.orig/debian/po/cs.po +++ xorg-server-1.18.2/debian/po/cs.po @@ -0,0 +1,79 @@ +# debconf templates for xorg package +# Czech translation +# +# $Id: cs.po 490 2005-08-03 09:59:07Z ender $ +# +# Copyrights: +# Branden Robinson, 2000-2004 +# Miroslav Kure , 2004-2008 +# +# This file is distributed under the same license as the xorg-x11 package. +# Please see debian/copyright. +# +# Translators, if you are not familiar with the PO format, gettext +# documentation is worth reading, especially sections dedicated to +# this format, e.g. by running: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# +# Some information specific to po-debconf are available at +# /usr/share/doc/po-debconf/README-trans +# or http://www.debian.org/intl/l10n/po-debconf/README-trans +# +# Developers do not need to manually edit POT or PO files. +# +msgid "" +msgstr "" +"Project-Id-Version: xorg\n" +"Report-Msgid-Bugs-To: xorg@packages.debian.org\n" +"POT-Creation-Date: 2009-06-02 20:32+0200\n" +"PO-Revision-Date: 2008-06-14 14:41+0200\n" +"Last-Translator: Miroslav Kure \n" +"Language-Team: Czech \n" +"Language: cs\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: select +#. Choices +#: ../xserver-xorg-legacy.templates:2001 +msgid "Root Only" +msgstr "Pouze root" + +#. Type: select +#. Choices +#: ../xserver-xorg-legacy.templates:2001 +msgid "Console Users Only" +msgstr "Pouze konzoloví uživatelé" + +#. Type: select +#. Choices +#: ../xserver-xorg-legacy.templates:2001 +msgid "Anybody" +msgstr "Kdokoliv" + +#. Type: select +#. Description +#: ../xserver-xorg-legacy.templates:2002 +msgid "Users allowed to start the X server:" +msgstr "Uživatelé, kteří mohou spustit X server:" + +#. Type: select +#. Description +#: ../xserver-xorg-legacy.templates:2002 +msgid "" +"Because the X server runs with superuser privileges, it may be unwise to " +"permit any user to start it, for security reasons. On the other hand, it is " +"even more unwise to run general-purpose X client programs as root, which is " +"what may happen if only root is permitted to start the X server. A good " +"compromise is to permit the X server to be started only by users logged in " +"to one of the virtual consoles." +msgstr "" +"Protože X server běží se superuživatelskými právy, z bezpečnostního hlediska " +"není rozumné dát uživatelům možnost jej spouštět. Na druhou stranu, ještě " +"nebezpečnější je spouštět obecného X klienta jako root, což by se mohlo " +"stát, kdybyste start X serveru povolili pouze rootovi. Rozumným kompromisem " +"je povolit spouštění X serveru pouze uživatelům přihlášeným na virtuální " +"konzoli." + --- xorg-server-1.18.2.orig/debian/po/da.po +++ xorg-server-1.18.2/debian/po/da.po @@ -0,0 +1,98 @@ +# #-#-#-#-# xorg-da.po (xfree86_4.3.0-3_da) #-#-#-#-# +# Branden Robinson, 2000--2004. +# Dennis Haney, 2002. +# Morten Brix Pedersen , 2003. +# Claus Hindsgaul , 2004. +# Claus Hindsgaul , 2006. +# debconf templates for xfree86 package +# Danish translation +# $Id: da.po 1763M 2004-10-11 07:13:16Z (local) $# +# Copyrights:# +# This file is distributed under the same license as the xfree86 package. +# Please see debian/copyright.# +# Translators, if you are not familiar with the PO format, gettext +# documentation is worth reading, especially sections dedicated to +# this format, e.g. by running: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry'# +# Some information specific to po-debconf are available at +# /usr/share/doc/po-debconf/README-trans +# or http://www.debian.org/intl/l10n/po-debconf/README-trans# +# Developers do not need to manually edit POT or PO files.# +# #-#-#-#-# da.po (xfree86_4.3.0-3_da) #-#-#-#-# +# debconf templates for xfree86 package +# Danish translation# +# $Id: da.po 1763M 2004-10-11 07:13:16Z (local) $# +# Copyrights:# +# This file is distributed under the same license as the xfree86 package. +# Please see debian/copyright.# +# Translators, if you are not familiar with the PO format, gettext +# documentation is worth reading, especially sections dedicated to +# this format, e.g. by running: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry'# +# Some information specific to po-debconf are available at +# /usr/share/doc/po-debconf/README-trans +# or http://www.debian.org/intl/l10n/po-debconf/README-trans# +# Developers do not need to manually edit POT or PO files.# +msgid "" +msgstr "" +"Project-Id-Version: xfree86_4.3.0-3_da\n" +"Report-Msgid-Bugs-To: xorg@packages.debian.org\n" +"POT-Creation-Date: 2009-06-02 20:32+0200\n" +"PO-Revision-Date: 2006-07-04 13:46+0200\n" +"Last-Translator: Claus Hindsgaul \n" +"Language-Team: Danish\n" +"Language: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=ISO-8859-1\n" +"Content-Transfer-Encoding: 8bit\n" +"#-#-#-#-# xorg-da.po (xfree86_4.3.0-3_da) #-#-#-#-#\n" +"X-Generator: KBabel 1.11.2\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"#-#-#-#-# da.po (xfree86_4.3.0-3_da) #-#-#-#-#\n" +"X-Generator: KBabel 1.11.2\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#. Type: select +#. Choices +#: ../xserver-xorg-legacy.templates:2001 +msgid "Root Only" +msgstr "Kun root" + +#. Type: select +#. Choices +#: ../xserver-xorg-legacy.templates:2001 +msgid "Console Users Only" +msgstr "Kun konsolbrugere" + +#. Type: select +#. Choices +#: ../xserver-xorg-legacy.templates:2001 +msgid "Anybody" +msgstr "Alle" + +#. Type: select +#. Description +#: ../xserver-xorg-legacy.templates:2002 +msgid "Users allowed to start the X server:" +msgstr "Brugere, der m starte X-serveren:" + +#. Type: select +#. Description +#: ../xserver-xorg-legacy.templates:2002 +msgid "" +"Because the X server runs with superuser privileges, it may be unwise to " +"permit any user to start it, for security reasons. On the other hand, it is " +"even more unwise to run general-purpose X client programs as root, which is " +"what may happen if only root is permitted to start the X server. A good " +"compromise is to permit the X server to be started only by users logged in " +"to one of the virtual consoles." +msgstr "" +"Da X-serveren krer med superbruger-rettigheder kan det af sikkerhedsgrunde " +"vre en drlig id at tillade enhver at starte den. P den anden side er det " +"endnu drligere at kre normale X-programmer som root, hvilket netop er, " +"hvad der kan blive resultatet, hvis kun root m starte X-serveren. Et godt " +"kompromis er at kun tillade brugere der er logget ind p en virtuel konsol " +"at starte X-serveren." + --- xorg-server-1.18.2.orig/debian/po/de.po +++ xorg-server-1.18.2/debian/po/de.po @@ -0,0 +1,78 @@ +# debconf templates for xorg-x11 package +# German translation +# +# $Id: de.po 1042 2006-01-09 07:55:08Z ender $ +# +# Copyrights: +# Branden Robinson, 2000-2004 +# Martin Schuster, 2001 +# Sebastian Rittau, 2001 +# Erich Schubert, 2001 +# Knut Suebert, 2001 +# Sebastian Feltel, 2001 +# Philipp Matthias Hahn, 2001 +# Veit Waltemath, 2002 +# Andreas Metzler, 2002 +# Alwin Meschede , 2004, 2005. +# Jens Seidel , 2006, 2007. +# Helge Kreutzmann , 2008. +# +# This file is distributed under the same license as the xorg-x11 package. +# Please see debian/copyright. +# +msgid "" +msgstr "" +"Project-Id-Version: xorg 1:7.3+12\n" +"Report-Msgid-Bugs-To: xorg@packages.debian.org\n" +"POT-Creation-Date: 2009-06-02 20:32+0200\n" +"PO-Revision-Date: 2008-06-09 18:54+0200\n" +"Last-Translator: Helge Kreutzmann \n" +"Language-Team: German \n" +"Language: de\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: select +#. Choices +#: ../xserver-xorg-legacy.templates:2001 +msgid "Root Only" +msgstr "Nur Superuser" + +#. Type: select +#. Choices +#: ../xserver-xorg-legacy.templates:2001 +msgid "Console Users Only" +msgstr "Nur Konsolenbenutzer" + +#. Type: select +#. Choices +#: ../xserver-xorg-legacy.templates:2001 +msgid "Anybody" +msgstr "Jeder" + +#. Type: select +#. Description +#: ../xserver-xorg-legacy.templates:2002 +msgid "Users allowed to start the X server:" +msgstr "Benutzer, die den X-Server starten dürfen:" + +#. Type: select +#. Description +#: ../xserver-xorg-legacy.templates:2002 +msgid "" +"Because the X server runs with superuser privileges, it may be unwise to " +"permit any user to start it, for security reasons. On the other hand, it is " +"even more unwise to run general-purpose X client programs as root, which is " +"what may happen if only root is permitted to start the X server. A good " +"compromise is to permit the X server to be started only by users logged in " +"to one of the virtual consoles." +msgstr "" +"Weil der X-Server mit Superuser-Rechten läuft, kann es unter " +"Sicherheitsaspekten unklug sein, jedem Benutzer das Starten zu erlauben. " +"Andererseits ist es noch unklüger, allgemeine X-Programme als Superuser " +"auszuführen, was passieren könnte, wenn nur der Superuser den X-Server " +"starten darf. Ein guter Kompromiss kann sein, nur den Personen das Starten " +"des X-Servers zu erlauben, die auf einer der virtuellen Konsolen angemeldet " +"sind." + --- xorg-server-1.18.2.orig/debian/po/dz.po +++ xorg-server-1.18.2/debian/po/dz.po @@ -0,0 +1,73 @@ +# +# Translators, if you are not familiar with the PO format, gettext +# documentation is worth reading, especially sections dedicated to +# this format, e.g. by running: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# +# Some information specific to po-debconf are available at +# /usr/share/doc/po-debconf/README-trans +# or http://www.debian.org/intl/l10n/po-debconf/README-trans +# +# Developers do not need to manually edit POT or PO files. +# +msgid "" +msgstr "" +"Project-Id-Version: xorg.pot\n" +"Report-Msgid-Bugs-To: xorg@packages.debian.org\n" +"POT-Creation-Date: 2009-06-02 20:32+0200\n" +"PO-Revision-Date: 2008-06-30 09:48+0530\n" +"Last-Translator: Jurmey Rabgay(Bongop) (DIT,BHUTAN) \n" +"Language-Team: dzongkha \n" +"Language: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2;plural=(n!=1)\n" +"X-Poedit-Country: bhutan\n" +"X-Poedit-SourceCharset: utf-8\n" +"X-Poedit-Bookmarks: -1,-1,-1,95,-1,-1,-1,-1,-1,-1\n" + +#. Type: select +#. Choices +#: ../xserver-xorg-legacy.templates:2001 +msgid "Root Only" +msgstr "རྩ་བ་རྐྱངམ་ཅིག་" + +#. Type: select +#. Choices +#: ../xserver-xorg-legacy.templates:2001 +msgid "Console Users Only" +msgstr "མ་སྒྲོམ་ལག་ལེན་པ་ཚུ་རྐྱངམ་ཅིག" + +#. Type: select +#. Choices +#: ../xserver-xorg-legacy.templates:2001 +msgid "Anybody" +msgstr "ག་འབད་རུང་།" + +#. Type: select +#. Description +#: ../xserver-xorg-legacy.templates:2002 +msgid "Users allowed to start the X server:" +msgstr "ལག་ལེན་པ་ཚུ་ཨེགསི་སར་བར་འགོ་བཙུགས་ཆོག:" + +#. Type: select +#. Description +#: ../xserver-xorg-legacy.templates:2002 +msgid "" +"Because the X server runs with superuser privileges, it may be unwise to " +"permit any user to start it, for security reasons. On the other hand, it is " +"even more unwise to run general-purpose X client programs as root, which is " +"what may happen if only root is permitted to start the X server. A good " +"compromise is to permit the X server to be started only by users logged in " +"to one of the virtual consoles." +msgstr "" +"ཨེགསི་སར་བར་འདི་ ལག་ལེན་པ་གཙོ་བོའི་ཁེ་དབང་ཚུ་གི་ཐོག་ལས་ གཡོག་བཀོལཝ་ཨིནམ་ལས་ སྲུང་སྐྱོབས་ཀྱི་རྒྱུ་མཚན་" +"ལུ་བརྟེན་ཏེ་ འགོ་བཙུགས་ནིའི་དོན་ལས་ ལག་ལེན་པ་གང་རུང་ཅིག་ལུ་གནང་བ་བྱིན་ནིའི་དོན་ལུ་ འདི་ལེགས་ཤོམ་མེན་" +"འོང་། གཅིག་ལས་འབད་བ་ཅིན་ འདི་ཡོངས་ཁྱབ་དགོས་དོན་ ཨེགསི་ཞབས་ཏོག་སྤྱོད་མིའི་ལས་རིམ་འདི་ རྩ་བ་སྦེ་གཡོག་" +"བཀོལ་ནིའི་དོན་ལུ་ ཧེང་བཀལ་རང་ལེགས་ཤོམ་མེེདཔ་ཨིན་ དེ་ཡང་ ཨེགསི་སར་བར་འགོ་བཙུགས་ནིའི་དོན་ལུ་ རྩ་བ་" +"རྐྱངམ་ཅིག་ལུ་གནང་བ་བྱིན་ཏེ་ཡོད་པ་ཅིན་ ག་ཅི་འབད་འོང་། ནང་འགྲིགས་ལེགས་ཤོམ་འདི་ཡང་ བར་ཅུ་ཡལ་མ་སྒྲོམ་" +"གཅིག་ལུ་ ནང་བསྐྱོད་འབད་ཡོད་པའི་ལག་ལེན་པ་གིས་རྐྱངམ་ཅིག་འགོ་བཙུགས་ནི་ལུ་ ཨེགསི་སར་བར་ལུ་གནང་བ་བྱིན་" +"ནི་འདི་ཨིན།" + --- xorg-server-1.18.2.orig/debian/po/el.po +++ xorg-server-1.18.2/debian/po/el.po @@ -0,0 +1,84 @@ +# translation of xorg_po_el.po to +# debconf templates for xorg-x11 package +# Greek translation +# +# $Id: el.po 1042 2006-01-09 07:55:08Z ender $ +# +# Copyrights: +# +# This file is distributed under the same license as the xorg-x11 package. +# Please see debian/copyright. +# +# Translators, if you are not familiar with the PO format, gettext +# documentation is worth reading, especially sections dedicated to +# this format, e.g. by running: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# +# Some information specific to po-debconf are available at +# /usr/share/doc/po-debconf/README-trans +# or http://www.debian.org/intl/l10n/po-debconf/README-trans +# +# Developers do not need to manually edit POT or PO files. +# +# Branden Robinson, 2000-2004. +# Konstantinos Margaritis , 2004. +# QUAD-nrg.net , 2006. +msgid "" +msgstr "" +"Project-Id-Version: xorg_po_el\n" +"Report-Msgid-Bugs-To: xorg@packages.debian.org\n" +"POT-Creation-Date: 2009-06-02 20:32+0200\n" +"PO-Revision-Date: 2008-08-24 17:39+0300\n" +"Last-Translator: \n" +"Language-Team: \n" +"Language: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.11.4\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#. Type: select +#. Choices +#: ../xserver-xorg-legacy.templates:2001 +msgid "Root Only" +msgstr "Μόνο ο χρήστης root" + +#. Type: select +#. Choices +#: ../xserver-xorg-legacy.templates:2001 +msgid "Console Users Only" +msgstr "Μόνο από την κονσόλα" + +#. Type: select +#. Choices +#: ../xserver-xorg-legacy.templates:2001 +msgid "Anybody" +msgstr "Οποιοσδήποτε" + +#. Type: select +#. Description +#: ../xserver-xorg-legacy.templates:2002 +msgid "Users allowed to start the X server:" +msgstr "Χρήστες που επιτρέπεται να ξεκινούν τον εξυπηρετητή Χ:" + +#. Type: select +#. Description +#: ../xserver-xorg-legacy.templates:2002 +msgid "" +"Because the X server runs with superuser privileges, it may be unwise to " +"permit any user to start it, for security reasons. On the other hand, it is " +"even more unwise to run general-purpose X client programs as root, which is " +"what may happen if only root is permitted to start the X server. A good " +"compromise is to permit the X server to be started only by users logged in " +"to one of the virtual consoles." +msgstr "" +"Λόγω του ότι ο εξυπηρετητής X τρέχει ως χρήστης root, με τα αντίστοιχα " +"δικαιώματα, για λόγους ασφαλείας δε συνιστάται η εκκίνησή του από άπλό " +"χρήστη. Ωστόσο, ακόμη πιο επικίνδυνο για την ασφάλεια είναι η εκτέλεση " +"απλών προγραμμάτων στα X ως χρήστης root, το οποίο μπορεί να συμβεί αν ο " +"χρήστης root επιτρέπεται να εκκινήσει τον εξυπηρετητή X. Μια μέση οδός " +"είναι να επιτρέπεται η εκκίνηση του εξυπηρετητή X μόνο από τους χρήστες που " +"έχουν συνδεθεί στο σύστημα σε μία από τις εικονικές κονσόλες." + --- xorg-server-1.18.2.orig/debian/po/eo.po +++ xorg-server-1.18.2/debian/po/eo.po @@ -0,0 +1,61 @@ +# debconf templates for the xorg package +# Esperanto translation. +# Copyright (C) 2008 FSF +# This file is distributed under the same license as the xorg package. +# Felipe Castro , 2008. +# +msgid "" +msgstr "" +"Project-Id-Version: xorg\n" +"Report-Msgid-Bugs-To: xorg@packages.debian.org\n" +"POT-Creation-Date: 2009-06-02 20:32+0200\n" +"PO-Revision-Date: 2008-10-19 20:00-0300\n" +"Last-Translator: Felipe Castro \n" +"Language-Team: Esperanto \n" +"Language: eo\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: select +#. Choices +#: ../xserver-xorg-legacy.templates:2001 +msgid "Root Only" +msgstr "Nur 'Root'" + +#. Type: select +#. Choices +#: ../xserver-xorg-legacy.templates:2001 +msgid "Console Users Only" +msgstr "Nur Konzol-Uzantoj" + +#. Type: select +#. Choices +#: ../xserver-xorg-legacy.templates:2001 +msgid "Anybody" +msgstr "Iu ajn" + +#. Type: select +#. Description +#: ../xserver-xorg-legacy.templates:2002 +msgid "Users allowed to start the X server:" +msgstr "Uzantoj permesitaj ekigi la X-servilon:" + +#. Type: select +#. Description +#: ../xserver-xorg-legacy.templates:2002 +msgid "" +"Because the X server runs with superuser privileges, it may be unwise to " +"permit any user to start it, for security reasons. On the other hand, it is " +"even more unwise to run general-purpose X client programs as root, which is " +"what may happen if only root is permitted to start the X server. A good " +"compromise is to permit the X server to be started only by users logged in " +"to one of the virtual consoles." +msgstr "" +"Ĉar la X-servilo funkcias kun superaj privilegioj, eble estas malprudente " +"permesi ke iu ajn uzanto ekigu ĝin, pro sekurecaj kialoj. Tamen, estas eĉ " +"pli malprudente lanĉi ĝeneralajn klient-programojn per 'root', kio ĝuste " +"povas okazi kiam nur 'root' estas permesata ekigi la X-servilon. Bona " +"ekvilibro oni atingas permesante ke la X-servilo estu ekigebla nur por " +"uzantoj ensalutitaj en unu el la virtualaj konzoloj." + --- xorg-server-1.18.2.orig/debian/po/es.po +++ xorg-server-1.18.2/debian/po/es.po @@ -0,0 +1,88 @@ +# debconf templates for xorg-x11 package +# Spanish translation +# +# $Id: es.po 1042 2006-01-09 07:55:08Z ender $ +# +# Copyrights: +# Branden Robinson 2000-2004 +# Carlos Valdivia Yague, 2001 +# Javier Fernandez-Sanguino Pena, 2003, 2008 +# David Martinez Moreno, 2001, 2002, 2005, 2006 +# +# This file is distributed under the same license as the xorg-x11 package. +# Please see debian/copyright. +# +# Translators, if you are not familiar with the PO format, gettext +# documentation is worth reading, especially sections dedicated to +# this format, e.g. by running: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# +# Some information specific to po-debconf are available at +# /usr/share/doc/po-debconf/README-trans +# or http://www.debian.org/intl/l10n/po-debconf/README-trans +# +# Developers do not need to manually edit POT or PO files. +# +msgid "" +msgstr "" +"Project-Id-Version: xorg 7.0.24\n" +"Report-Msgid-Bugs-To: xorg@packages.debian.org\n" +"POT-Creation-Date: 2009-06-02 20:32+0200\n" +"PO-Revision-Date: 2008-09-10 02:11+0200\n" +"Last-Translator: Javier Fernandez-Sanguino \n" +"Language-Team: ES \n" +"Language: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=ISO-8859-15\n" +"Content-Transfer-Encoding: 8bit\n" +"X-POFile-SpellExtra: Bloq Mays nocaps macintoshold share dead symbols\n" +"X-POFile-SpellExtra: Window PCI metawin conf logo Type autodetectar AGP\n" +"X-POFile-SpellExtra: BusID xserver xkb keys Express multitarjeta Caps pc\n" +"X-POFile-SpellExtra: usr Xorg nodeadkeys lspci type nice bin fr ctrl XKB\n" +"X-POFile-SpellExtra: AT xorg not framebuffer sintase Lock swapcaps us\n" +"X-POFile-SpellExtra: PowerPC slamente altwin root macintosh\n" + +#. Type: select +#. Choices +#: ../xserver-xorg-legacy.templates:2001 +msgid "Root Only" +msgstr "Slo root" + +#. Type: select +#. Choices +#: ../xserver-xorg-legacy.templates:2001 +msgid "Console Users Only" +msgstr "Slo usuarios de consola" + +#. Type: select +#. Choices +#: ../xserver-xorg-legacy.templates:2001 +msgid "Anybody" +msgstr "Cualquiera" + +#. Type: select +#. Description +#: ../xserver-xorg-legacy.templates:2002 +msgid "Users allowed to start the X server:" +msgstr "Usuarios a los que se permite arrancar el servidor de X:" + +#. Type: select +#. Description +#: ../xserver-xorg-legacy.templates:2002 +msgid "" +"Because the X server runs with superuser privileges, it may be unwise to " +"permit any user to start it, for security reasons. On the other hand, it is " +"even more unwise to run general-purpose X client programs as root, which is " +"what may happen if only root is permitted to start the X server. A good " +"compromise is to permit the X server to be started only by users logged in " +"to one of the virtual consoles." +msgstr "" +"Debido a que el servidor X se ejecuta con privilegios de superusuario, puede " +"no ser muy prudente permitir que cualquier usuario lo arranque, por razones " +"de seguridad. Por otra parte, es an ms imprudente ejecutar programas " +"cliente de X de forma general como root, lo cual puede suceder si slamente " +"se permite a root iniciar el servidor X. Un compromiso entre ambos casos es " +"permitir que el servidor X lo inicien slo usuarios que hayan entrado por " +"una de las consolas virtuales." + --- xorg-server-1.18.2.orig/debian/po/eu.po +++ xorg-server-1.18.2/debian/po/eu.po @@ -0,0 +1,82 @@ +# translation of xorg-eu.po to Euskara +# debconf templates for xorg-x11 package +# Euskara translation +# +# $Id: eu.po 490 2005-08-03 09:59:07Z ender $ +# +# Copyright: +# +# This file is distributed under the same license as the xorg-x11 package. +# Please see debian/copyright. +# +# Translators, if you are not familiar with the PO format, gettext +# documentation is worth reading, especially sections dedicated to +# this format, e.g. by running: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# +# Some information specific to po-debconf is available at +# /usr/share/doc/po-debconf/README-trans +# or http://www.debian.org/intl/l10n/po-debconf/README-trans +# +# Developers do not need to manually edit POT or PO files. +# +# Branden Robinson, 2000-2004. +# Piarres Beobide , 2005, 2006, 2007, 2008. +msgid "" +msgstr "" +"Project-Id-Version: xorg-eu\n" +"Report-Msgid-Bugs-To: xorg@packages.debian.org\n" +"POT-Creation-Date: 2009-06-02 20:32+0200\n" +"PO-Revision-Date: 2008-06-08 22:57+0200\n" +"Last-Translator: Piarres Beobide \n" +"Language-Team: Euskara \n" +"Language: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.11.4\n" +"Plural-Forms: nplurals=2; plural=(n != 1)\n" + +#. Type: select +#. Choices +#: ../xserver-xorg-legacy.templates:2001 +msgid "Root Only" +msgstr "Root bakarrik" + +#. Type: select +#. Choices +#: ../xserver-xorg-legacy.templates:2001 +msgid "Console Users Only" +msgstr "Kontsola erabiltzaileak bakarrik" + +#. Type: select +#. Choices +#: ../xserver-xorg-legacy.templates:2001 +msgid "Anybody" +msgstr "Edozein" + +#. Type: select +#. Description +#: ../xserver-xorg-legacy.templates:2002 +msgid "Users allowed to start the X server:" +msgstr "X zerbitzaria abiarazteko gaitasuna duten erabiltzaileak:" + +#. Type: select +#. Description +#: ../xserver-xorg-legacy.templates:2002 +msgid "" +"Because the X server runs with superuser privileges, it may be unwise to " +"permit any user to start it, for security reasons. On the other hand, it is " +"even more unwise to run general-purpose X client programs as root, which is " +"what may happen if only root is permitted to start the X server. A good " +"compromise is to permit the X server to be started only by users logged in " +"to one of the virtual consoles." +msgstr "" +"X zerbitzaria supererabiltzaile baimenez abiarazten denez, segurtasun " +"arrazoiak direla eta ez da zentzuzkoa edozeini abiarazteko baimena ematea. " +"Beste aldetik ez da zentzuzkoa ere X bezero programa arruntak root bezala " +"abiaraztea, root-ek bakarrik X zerbitzari abiarazteko baimena duenean " +"gertatzen dena. Gomendagarriena X zerbitzaria kontsola birtual batetan " +"saioa abiarazirik duen edozeini abiarazten uztea da." + --- xorg-server-1.18.2.orig/debian/po/fi.po +++ xorg-server-1.18.2/debian/po/fi.po @@ -0,0 +1,62 @@ +# Debian Installer xserver-xorg. +# Translation to Finnish. +# Copyright (C) 2006 Tapio Lehtonen +# This file is distributed under the same license as the xserver-xorg package. +# Tapio Lehtonen , 2006. +# +msgid "" +msgstr "" +"Project-Id-Version: xorg\n" +"Report-Msgid-Bugs-To: xorg@packages.debian.org\n" +"POT-Creation-Date: 2009-06-02 20:32+0200\n" +"PO-Revision-Date: 2008-07-18 18:15-0000\n" +"Last-Translator: Esko Arajärvi \n" +"Language-Team: Finnish \n" +"Language: fi\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Poedit-Country: FINLAND\n" + +#. Type: select +#. Choices +#: ../xserver-xorg-legacy.templates:2001 +msgid "Root Only" +msgstr "Vain pääkäyttäjä" + +#. Type: select +#. Choices +#: ../xserver-xorg-legacy.templates:2001 +msgid "Console Users Only" +msgstr "Vain konsolikäyttäjät" + +#. Type: select +#. Choices +#: ../xserver-xorg-legacy.templates:2001 +msgid "Anybody" +msgstr "Kaikki" + +#. Type: select +#. Description +#: ../xserver-xorg-legacy.templates:2002 +msgid "Users allowed to start the X server:" +msgstr "Käyttäjät, jotka saavat käynnistää X-palvelimen:" + +#. Type: select +#. Description +#: ../xserver-xorg-legacy.templates:2002 +msgid "" +"Because the X server runs with superuser privileges, it may be unwise to " +"permit any user to start it, for security reasons. On the other hand, it is " +"even more unwise to run general-purpose X client programs as root, which is " +"what may happen if only root is permitted to start the X server. A good " +"compromise is to permit the X server to be started only by users logged in " +"to one of the virtual consoles." +msgstr "" +"Tietoturvasyistä on huono ajatus antaa kaikille oikeudet X-palvelimen " +"käynnistämiseen, koska sitä ajetaan pääkäyttäjän oikeuksilla. Toisaalta on " +"vielä huonompi ajatus suorittaa yleiskäyttöisiä X:n asiakasohjelmia " +"pääkäyttäjänä, mikä on tilanne, jos vain pääkäyttäjä saa käynnistää X-" +"palvelimen. Hyvä ratkaisu on sallia X-palvelimen käynnistys ainoastaan " +"käyttäjille, jotka ovat kirjautuneet jollekin virtuaalikonsolille." + --- xorg-server-1.18.2.orig/debian/po/fr.po +++ xorg-server-1.18.2/debian/po/fr.po @@ -0,0 +1,87 @@ +# translation of fr.po to French +# debconf templates for xfree86 package +# French translation +# +# $Id: fr.po 1763M 2004-10-11 07:13:17Z (local) $ +# +# Copyrights: +# +# This file is distributed under the same license as the xfree86 package. +# Please see debian/copyright. +# +# Translators, if you are not familiar with the PO format, gettext +# documentation is worth reading, especially sections dedicated to +# this format, e.g. by running: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# +# Some information specific to po-debconf are available at +# /usr/share/doc/po-debconf/README-trans +# or http://www.debian.org/intl/l10n/po-debconf/README-trans +# +# Developers do not need to manually edit POT or PO files. +# +# Branden Robinson, 2000--2004. +# Thomas Morin, 2001. +# Patrice Karatchentzeff, 2001. +# Jrme Schell, 2001. +# Jean-Christophe Dubacq, 2002. +# Christian Perrier , 2003, 2004, 2006, 2007, 2008. +msgid "" +msgstr "" +"Project-Id-Version: \n" +"Report-Msgid-Bugs-To: xorg@packages.debian.org\n" +"POT-Creation-Date: 2009-06-02 20:32+0200\n" +"PO-Revision-Date: 2008-06-08 22:26+0200\n" +"Last-Translator: Christian Perrier \n" +"Language-Team: French \n" +"Language: fr\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=ISO-8859-15\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.11.4\n" +"Plural-Forms: Plural-Forms: nplurals=2; plural=n>1;\n" +"\n" + +#. Type: select +#. Choices +#: ../xserver-xorg-legacy.templates:2001 +msgid "Root Only" +msgstr "Superutilisateur seulement" + +#. Type: select +#. Choices +#: ../xserver-xorg-legacy.templates:2001 +msgid "Console Users Only" +msgstr "Depuis la console" + +#. Type: select +#. Choices +#: ../xserver-xorg-legacy.templates:2001 +msgid "Anybody" +msgstr "N'importe qui" + +#. Type: select +#. Description +#: ../xserver-xorg-legacy.templates:2002 +msgid "Users allowed to start the X server:" +msgstr "Utilisateurs autoriss lancer un serveur X:" + +#. Type: select +#. Description +#: ../xserver-xorg-legacy.templates:2002 +msgid "" +"Because the X server runs with superuser privileges, it may be unwise to " +"permit any user to start it, for security reasons. On the other hand, it is " +"even more unwise to run general-purpose X client programs as root, which is " +"what may happen if only root is permitted to start the X server. A good " +"compromise is to permit the X server to be started only by users logged in " +"to one of the virtual consoles." +msgstr "" +"Le serveur X tant lanc avec des droits privilgis, il n'est pas trs " +"prudent pour des raisons de scurit de permettre n'importe qui de le " +"lancer. D'un autre ct, il est encore moins prudent de lancer les logiciels " +"clients X en tant que superutilisateur, ce qui risque d'arriver si seul le " +"superutilisateur est autoris lancer un serveur X. Un bon compromis est " +"que seuls les utilisateurs connects sur une des consoles virtuelles " +"puissent lancer un serveur X." --- xorg-server-1.18.2.orig/debian/po/gl.po +++ xorg-server-1.18.2/debian/po/gl.po @@ -0,0 +1,68 @@ +# debconf templates for xorg-x11 package +# Galician translation +# +# $Id: gl.po 1080 2006-01-14 02:15:39Z ender $ +# +# Copyrights: +# Branden Robinson, 2000-2004 +# Jacobo Tarrio, 2001, 2006, 2008 +# +# This file is distributed under the same license as the xorg-x11 package. +# Please see debian/copyright. +# +msgid "" +msgstr "" +"Project-Id-Version: xorg\n" +"Report-Msgid-Bugs-To: xorg@packages.debian.org\n" +"POT-Creation-Date: 2009-06-02 20:32+0200\n" +"PO-Revision-Date: 2008-06-08 22:17+0100\n" +"Last-Translator: Jacobo Tarrio \n" +"Language-Team: Galician \n" +"Language: gl\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: select +#. Choices +#: ../xserver-xorg-legacy.templates:2001 +msgid "Root Only" +msgstr "Só o administrador" + +#. Type: select +#. Choices +#: ../xserver-xorg-legacy.templates:2001 +msgid "Console Users Only" +msgstr "Só os usuarios da consola" + +#. Type: select +#. Choices +#: ../xserver-xorg-legacy.templates:2001 +msgid "Anybody" +msgstr "Todos" + +#. Type: select +#. Description +#: ../xserver-xorg-legacy.templates:2002 +msgid "Users allowed to start the X server:" +msgstr "Usuarios aos que se lles permite iniciar o servidor X:" + +#. Type: select +#. Description +#: ../xserver-xorg-legacy.templates:2002 +msgid "" +"Because the X server runs with superuser privileges, it may be unwise to " +"permit any user to start it, for security reasons. On the other hand, it is " +"even more unwise to run general-purpose X client programs as root, which is " +"what may happen if only root is permitted to start the X server. A good " +"compromise is to permit the X server to be started only by users logged in " +"to one of the virtual consoles." +msgstr "" +"Como o servidor X se executa con privilexios de superusuario, pode non ser " +"unha boa idea permitir que calquera usuario o inicie, por motivos de " +"seguridade. Por outro lado, pode ser aínda unha peor idea executar programas " +"cliente X de propósito xeral coma administrador, que é o que podería ocorrer " +"se só root pode iniciar o servidor X. Un bo compromiso consiste en permitir " +"que o servidor X o inicien só os usuarios que traballen nunha consola " +"virtual." + --- xorg-server-1.18.2.orig/debian/po/gu.po +++ xorg-server-1.18.2/debian/po/gu.po @@ -0,0 +1,59 @@ +# Gujarati translation of xorg. +# Copyright (C) 2008 THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# Kartik Mistry , 2008. +# +msgid "" +msgstr "" +"Project-Id-Version: xorg-gu\n" +"Report-Msgid-Bugs-To: xorg@packages.debian.org\n" +"POT-Creation-Date: 2009-06-02 20:32+0200\n" +"PO-Revision-Date: 2008-07-23 23:40+0530\n" +"Last-Translator: Kartik Mistry \n" +"Language-Team: Gujarati \n" +"Language: gu\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: select +#. Choices +#: ../xserver-xorg-legacy.templates:2001 +msgid "Root Only" +msgstr "ફક્ત રૂટ" + +#. Type: select +#. Choices +#: ../xserver-xorg-legacy.templates:2001 +msgid "Console Users Only" +msgstr "ફક્ત કોન્સોલ વપરાશકર્તાઓ" + +#. Type: select +#. Choices +#: ../xserver-xorg-legacy.templates:2001 +msgid "Anybody" +msgstr "કોઇપણ" + +#. Type: select +#. Description +#: ../xserver-xorg-legacy.templates:2002 +msgid "Users allowed to start the X server:" +msgstr "X સર્વર શરૂ કરવા માટે માન્ય વપરાશકર્તાઓ:" + +#. Type: select +#. Description +#: ../xserver-xorg-legacy.templates:2002 +msgid "" +"Because the X server runs with superuser privileges, it may be unwise to " +"permit any user to start it, for security reasons. On the other hand, it is " +"even more unwise to run general-purpose X client programs as root, which is " +"what may happen if only root is permitted to start the X server. A good " +"compromise is to permit the X server to be started only by users logged in " +"to one of the virtual consoles." +msgstr "" +"X સર્વર સુપરયુઝર હક સાથે ચાલવાનાં કારણે, કોઇપણ વપરાશકર્તા તેને ચાલુ કરી શકે તે, સલામતીનાં " +"કારણોસર સલાહ ભર્યું નથી. બીજી બાજુ, સામાન્ય-વપરાશનાં X ક્લાયન્ટ કાર્યક્રમો રૂટ તરીકે " +"ચલાવવા એ પણ ડહ્યાપણભર્યું નથી, જે મોટાભાગે રૂટને X સર્વર શરૂ કરવાની પરવાનગી આપવામાં આવે " +"ત્યારે થાય છે. સારી સમજૂતી એ છે કે માત્ર પ્રવેશ કરેલ વપરાશકર્તાઓને તેમનાં વર્ચ્યુઅલ કોન્સોલ્સ " +"વડે X સર્વર શરૂ કરવાની પરવાનગી આપવામાં આવે." + --- xorg-server-1.18.2.orig/debian/po/he.po +++ xorg-server-1.18.2/debian/po/he.po @@ -0,0 +1,61 @@ +# translation of he.po to Hebrew +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Amit Dovev , 2007. +# Lior Kaplan , 2007, 2008. +msgid "" +msgstr "" +"Project-Id-Version: he\n" +"Report-Msgid-Bugs-To: xorg@packages.debian.org\n" +"POT-Creation-Date: 2009-06-02 20:32+0200\n" +"PO-Revision-Date: 2008-06-09 09:13+0300\n" +"Last-Translator: Lior Kaplan \n" +"Language-Team: Hebrew \n" +"Language: he\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.11.4\n" + +#. Type: select +#. Choices +#: ../xserver-xorg-legacy.templates:2001 +msgid "Root Only" +msgstr "משתמש-על בלבד" + +#. Type: select +#. Choices +#: ../xserver-xorg-legacy.templates:2001 +msgid "Console Users Only" +msgstr "משתמשי מסוף בלבד" + +#. Type: select +#. Choices +#: ../xserver-xorg-legacy.templates:2001 +msgid "Anybody" +msgstr "כל המשתמשים" + +#. Type: select +#. Description +#: ../xserver-xorg-legacy.templates:2002 +msgid "Users allowed to start the X server:" +msgstr "משתמשים הרשאים לאתחל את שרת ה-X:" + +#. Type: select +#. Description +#: ../xserver-xorg-legacy.templates:2002 +msgid "" +"Because the X server runs with superuser privileges, it may be unwise to " +"permit any user to start it, for security reasons. On the other hand, it is " +"even more unwise to run general-purpose X client programs as root, which is " +"what may happen if only root is permitted to start the X server. A good " +"compromise is to permit the X server to be started only by users logged in " +"to one of the virtual consoles." +msgstr "" +"מכיוון ששרת ה-X רץ עם הרשאות משתמש-על, זה כנראה יהיה לא חכם להרשות לכל משתמש " +"לאתחל אותו, מסיבות אבטחה. מצד שני, יהיה זה לא חכם להריץ תוכניות לקוח X " +"כמשתמש-על, שזה מה שעלול לקרות אם רק משתמש-העל יהיה מורשה לאתחל את שרת ה-X. " +"פשרה טובה תהיה להרשות לשרת ה-X להיות מאותחל רק ע\"י משתמשים שמחוברים לאחד " +"מהמסופים הווירטואליים." + --- xorg-server-1.18.2.orig/debian/po/hr.po +++ xorg-server-1.18.2/debian/po/hr.po @@ -0,0 +1,56 @@ +msgid "" +msgstr "" +"Project-Id-Version: Debian installer HR\n" +"Report-Msgid-Bugs-To: xorg@packages.debian.org\n" +"POT-Creation-Date: 2009-06-02 20:32+0200\n" +"PO-Revision-Date: 2008-09-06 19:15+0200\n" +"Last-Translator: Josip Rodin \n" +"Language-Team: Croatian \n" +"Language: hr\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=iso-8859-2\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: select +#. Choices +#: ../xserver-xorg-legacy.templates:2001 +msgid "Root Only" +msgstr "Samo root" + +#. Type: select +#. Choices +#: ../xserver-xorg-legacy.templates:2001 +msgid "Console Users Only" +msgstr "Samo konzolni korisnici" + +#. Type: select +#. Choices +#: ../xserver-xorg-legacy.templates:2001 +msgid "Anybody" +msgstr "Bilo tko" + +#. Type: select +#. Description +#: ../xserver-xorg-legacy.templates:2002 +msgid "Users allowed to start the X server:" +msgstr "Korisnici koji smiju pokrenuti X server:" + +#. Type: select +#. Description +#: ../xserver-xorg-legacy.templates:2002 +msgid "" +"Because the X server runs with superuser privileges, it may be unwise to " +"permit any user to start it, for security reasons. On the other hand, it is " +"even more unwise to run general-purpose X client programs as root, which is " +"what may happen if only root is permitted to start the X server. A good " +"compromise is to permit the X server to be started only by users logged in " +"to one of the virtual consoles." +msgstr "" +"Zbog injenice to X server radi s privilegijama administratorskog " +"korisnika, vjerojatno nije pametno dopustiti svakom korisniku da ga pokree, " +"iz sigurnosnih razloga. S druge strane, jo manje je pametno pokretati X " +"klijentske programe ope namjene kao root, a to se moe dogoditi ako samo " +"root korisniku dopustite pokretanje X servera. Dobar kompromis je dozvoliti " +"pokretanje X servera samo korisnicima koji su ulogirani na jednu od " +"virtualnih konzola." + --- xorg-server-1.18.2.orig/debian/po/hu.po +++ xorg-server-1.18.2/debian/po/hu.po @@ -0,0 +1,56 @@ +msgid "" +msgstr "" +"Project-Id-Version: \n" +"Report-Msgid-Bugs-To: xorg@packages.debian.org\n" +"POT-Creation-Date: 2009-06-02 20:32+0200\n" +"PO-Revision-Date: 2008-06-14 08:43+0100\n" +"Last-Translator: SZERVÁC Attila \n" +"Language-Team: hu\n" +"Language: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Poedit-Country: HUNGARY\n" + +#. Type: select +#. Choices +#: ../xserver-xorg-legacy.templates:2001 +msgid "Root Only" +msgstr "Csak rendszergazda" + +#. Type: select +#. Choices +#: ../xserver-xorg-legacy.templates:2001 +msgid "Console Users Only" +msgstr "Csak konzol felhasználók" + +#. Type: select +#. Choices +#: ../xserver-xorg-legacy.templates:2001 +msgid "Anybody" +msgstr "Bárki" + +#. Type: select +#. Description +#: ../xserver-xorg-legacy.templates:2002 +msgid "Users allowed to start the X server:" +msgstr "Az X kiszolgáló indítására jogosult felhasználók:" + +#. Type: select +#. Description +#: ../xserver-xorg-legacy.templates:2002 +msgid "" +"Because the X server runs with superuser privileges, it may be unwise to " +"permit any user to start it, for security reasons. On the other hand, it is " +"even more unwise to run general-purpose X client programs as root, which is " +"what may happen if only root is permitted to start the X server. A good " +"compromise is to permit the X server to be started only by users logged in " +"to one of the virtual consoles." +msgstr "" +"Mivel az X kiszolgáló rendszergazda kiváltságokkal fut, nem biztonságos " +"bármilyen felhasználónak engedélyezni a futtatását, de szintén nem " +"biztonságos általános-célú X kliens programokat rendszergazdaként futtatni, " +"pedig ez történik, ha csak a rendszergazdának van joga az X kiszolgáló " +"indításához. Megfelelő középút az X kiszolgáló indítását csak konzolról " +"bejelentkezett felhasználóknak engedélyezni." + --- xorg-server-1.18.2.orig/debian/po/id.po +++ xorg-server-1.18.2/debian/po/id.po @@ -0,0 +1,74 @@ +# translation of xorg_po-id.po to Bahasa Indonesia +# Translators, if you are not familiar with the PO format, gettext +# documentation is worth reading, especially sections dedicated to +# this format, e.g. by running: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# +# Some information specific to po-debconf are available at +# /usr/share/doc/po-debconf/README-trans +# or http://www.debian.org/intl/l10n/po-debconf/README-trans +# +# Developers do not need to manually edit POT or PO files. +# +# Arief S Fitrianto , 2008. +msgid "" +msgstr "" +"Project-Id-Version: xorg_po-id\n" +"Report-Msgid-Bugs-To: xorg@packages.debian.org\n" +"POT-Creation-Date: 2009-06-02 20:32+0200\n" +"PO-Revision-Date: 2008-06-11 14:33+0700\n" +"Last-Translator: Arief S Fitrianto \n" +"Language-Team: Bahasa Indonesia \n" +"Language: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplural=1, plural>1\n" +"X-Poedit-Language: Indonesian\n" +"X-Poedit-Country: INDONESIA\n" +"X-Poedit-SourceCharset: utf-8\n" +"X-Generator: KBabel 1.11.4\n" + +#. Type: select +#. Choices +#: ../xserver-xorg-legacy.templates:2001 +msgid "Root Only" +msgstr "Hanya Root" + +#. Type: select +#. Choices +#: ../xserver-xorg-legacy.templates:2001 +msgid "Console Users Only" +msgstr "Hanya pengguna Konsol" + +#. Type: select +#. Choices +#: ../xserver-xorg-legacy.templates:2001 +msgid "Anybody" +msgstr "Siapa saja" + +#. Type: select +#. Description +#: ../xserver-xorg-legacy.templates:2002 +msgid "Users allowed to start the X server:" +msgstr "Pengguna yang boleh menjalankan server X:" + +#. Type: select +#. Description +#: ../xserver-xorg-legacy.templates:2002 +msgid "" +"Because the X server runs with superuser privileges, it may be unwise to " +"permit any user to start it, for security reasons. On the other hand, it is " +"even more unwise to run general-purpose X client programs as root, which is " +"what may happen if only root is permitted to start the X server. A good " +"compromise is to permit the X server to be started only by users logged in " +"to one of the virtual consoles." +msgstr "" +"Oleh karena server X berjalan dengan kewenangan superuser, sangat riskan " +"bila membolehkan siapa saja menjalankannya. Di sisi lain, teramat sangat " +"riskan menjalankan program client X sebagai root, yang akan terjadi bila " +"hanya root yang boleh menjalankan server X. Kompromi yang baik adalah " +"menjalankan server X hanya oleh pengguna yang masuk ke salah satu konsol " +"virtual." + --- xorg-server-1.18.2.orig/debian/po/it.po +++ xorg-server-1.18.2/debian/po/it.po @@ -0,0 +1,85 @@ +# debconf templates for xorg-x11 package +# Italian translation +# +# $Id: it.po 1042 2006-01-09 07:55:08Z ender $ +# +# Copyrights: +# Branden Robinson, 2000-2004 +# Matteo Dell'Amico, 2002 +# Emanuele Aina, 2002 +# Luca Monducci, 2004 +# Danilo Piazzalunga, 2004-2005 +# Stefano Canepa, 2006, 2007 +# Milo Casagrande, 2008 +# +# This file is distributed under the same license as the xorg-x11 package. +# Please see debian/copyright. +# +# Translators, if you are not familiar with the PO format, gettext +# documentation is worth reading, especially sections dedicated to +# this format, e.g. by running: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# +# Some information specific to po-debconf are available at +# /usr/share/doc/po-debconf/README-trans +# or http://www.debian.org/intl/l10n/po-debconf/README-trans +# +# Developers do not need to manually edit POT or PO files. +# +msgid "" +msgstr "" +"Project-Id-Version: xorg-x11 6.8.2.dfsg.1-10\n" +"Report-Msgid-Bugs-To: xorg@packages.debian.org\n" +"POT-Creation-Date: 2009-06-02 20:32+0200\n" +"PO-Revision-Date: 2008-06-17 22:22+0200\n" +"Last-Translator: Milo Casagrande \n" +"Language-Team: debian-l10n-italian \n" +"Language: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: select +#. Choices +#: ../xserver-xorg-legacy.templates:2001 +msgid "Root Only" +msgstr "Solo root" + +#. Type: select +#. Choices +#: ../xserver-xorg-legacy.templates:2001 +msgid "Console Users Only" +msgstr "Solo gli utenti della console" + +#. Type: select +#. Choices +#: ../xserver-xorg-legacy.templates:2001 +msgid "Anybody" +msgstr "Chiunque" + +#. Type: select +#. Description +#: ../xserver-xorg-legacy.templates:2002 +msgid "Users allowed to start the X server:" +msgstr "Utenti con il permesso di avviare il server X:" + +#. Type: select +#. Description +#: ../xserver-xorg-legacy.templates:2002 +msgid "" +"Because the X server runs with superuser privileges, it may be unwise to " +"permit any user to start it, for security reasons. On the other hand, it is " +"even more unwise to run general-purpose X client programs as root, which is " +"what may happen if only root is permitted to start the X server. A good " +"compromise is to permit the X server to be started only by users logged in " +"to one of the virtual consoles." +msgstr "" +"Dato che il server X viene eseguito con i privilegi di super utente, può " +"essere poco consigliabile, per ragioni di sicurezza, permettere a qualsiasi " +"utente di eseguirlo. D'altra parte, se solo a root fosse permesso di avviare " +"il server X, sarebbe necessario eseguire come root i programmi client X (e " +"ciò sarebbe ancora peggio). Un buon compromesso consiste nel permettere che " +"il server X possa essere avviato solo dagli utenti collegati a una delle " +"console virtuali." + --- xorg-server-1.18.2.orig/debian/po/ja.po +++ xorg-server-1.18.2/debian/po/ja.po @@ -0,0 +1,81 @@ +# debconf templates for xorg-x11 package +# Japanese translation +# +# $Id: ja.po 1763M 2004-10-11 07:13:17Z (local) $ +# +# Copyrights: +# Branden Robinson, 2000-2004 +# ISHIKAWA Mutsumi, 2001, 2005, 2006 +# Tomohiro KUBOTA, 2001, 2002 +# Kenshi Muto, 2001-2006 +# Takeo Nakano, 2001, 2003, 2005 +# +# This file is distributed under the same license as the xorg-x11 package. +# Please see debian/copyright. +# +# Translators, if you are not familiar with the PO format, gettext +# documentation is worth reading, especially sections dedicated to +# this format, e.g. by running: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# +# Some information specific to po-debconf are available at +# /usr/share/doc/po-debconf/README-trans +# or http://www.debian.org/intl/l10n/po-debconf/README-trans +# +# Developers do not need to manually edit POT or PO files. +# +msgid "" +msgstr "" +"Project-Id-Version: xorg 7.3\n" +"Report-Msgid-Bugs-To: xorg@packages.debian.org\n" +"POT-Creation-Date: 2009-06-02 20:32+0200\n" +"PO-Revision-Date: 2008-06-15 07:33+0900\n" +"Last-Translator: Kenshi Muto \n" +"Language-Team: Japanese \n" +"Language: ja\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: select +#. Choices +#: ../xserver-xorg-legacy.templates:2001 +msgid "Root Only" +msgstr "Root のみ" + +#. Type: select +#. Choices +#: ../xserver-xorg-legacy.templates:2001 +msgid "Console Users Only" +msgstr "コンソールユーザのみ" + +#. Type: select +#. Choices +#: ../xserver-xorg-legacy.templates:2001 +msgid "Anybody" +msgstr "だれでも" + +#. Type: select +#. Description +#: ../xserver-xorg-legacy.templates:2002 +msgid "Users allowed to start the X server:" +msgstr "X サーバの起動を許可するユーザ:" + +#. Type: select +#. Description +#: ../xserver-xorg-legacy.templates:2002 +msgid "" +"Because the X server runs with superuser privileges, it may be unwise to " +"permit any user to start it, for security reasons. On the other hand, it is " +"even more unwise to run general-purpose X client programs as root, which is " +"what may happen if only root is permitted to start the X server. A good " +"compromise is to permit the X server to be started only by users logged in " +"to one of the virtual consoles." +msgstr "" +"X サーバはスーパーユーザ権限で動作するため、任意のユーザからの実行を許可する" +"のはセキュリティ上好ましくないでしょう。一方 X サーバの起動許可を root に限る" +"と、一般的な用途の X クライアントプログラムを実行する場合でも root が必要とな" +"り、これも好ましくありません。よりよい妥協点は、 仮想コンソールのうちの 1 つ" +"にログインしたユーザにのみ X サーバの起動を許可することでしょう。" + --- xorg-server-1.18.2.orig/debian/po/kk.po +++ xorg-server-1.18.2/debian/po/kk.po @@ -0,0 +1,55 @@ +# Dauren Sarsenov , 2009 +# +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: xorg@packages.debian.org\n" +"POT-Creation-Date: 2009-06-02 20:32+0200\n" +"PO-Revision-Date: 2009-03-24 14:50+0600\n" +"Last-Translator: Dauren Sarsenov \n" +"Language-Team: Kazakh \n" +"Language: kk\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: select +#. Choices +#: ../xserver-xorg-legacy.templates:2001 +msgid "Root Only" +msgstr "Root қана" + +#. Type: select +#. Choices +#: ../xserver-xorg-legacy.templates:2001 +msgid "Console Users Only" +msgstr "Консольдік пайдаланушылар ғана" + +#. Type: select +#. Choices +#: ../xserver-xorg-legacy.templates:2001 +msgid "Anybody" +msgstr "Әркім" + +#. Type: select +#. Description +#: ../xserver-xorg-legacy.templates:2002 +msgid "Users allowed to start the X server:" +msgstr "X серверін бастай алатындар:" + +#. Type: select +#. Description +#: ../xserver-xorg-legacy.templates:2002 +msgid "" +"Because the X server runs with superuser privileges, it may be unwise to " +"permit any user to start it, for security reasons. On the other hand, it is " +"even more unwise to run general-purpose X client programs as root, which is " +"what may happen if only root is permitted to start the X server. A good " +"compromise is to permit the X server to be started only by users logged in " +"to one of the virtual consoles." +msgstr "" +"X Сервер суперпайдаланушы құқықтарымен жұмыс істейтіндіктен, жүйені әркім " +"жүктей алмауы керек. Сонымен қатар жалпы мақсаттардағы X клиент " +"бағдарламасын root атынан жүктеуге де болмайды. Сондықтан X серверін виртуал " +"консольдің біреуіне кірген пайдаланушылар ғана бастай алуы керек." + --- xorg-server-1.18.2.orig/debian/po/km.po +++ xorg-server-1.18.2/debian/po/km.po @@ -0,0 +1,70 @@ +# translation of km.po to +# translation of xserver-xorg_debian_po_km.po to +# +# Translators, if you are not familiar with the PO format, gettext +# documentation is worth reading, especially sections dedicated to +# this format, e.g. by running: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# Some information specific to po-debconf are available at +# /usr/share/doc/po-debconf/README-trans +# or http://www.debian.org/intl/l10n/po-debconf/README-trans# +# Developers do not need to manually edit POT or PO files. +# +# Khoem Sokhem , 2006. +# auk piseth , 2006. +msgid "" +msgstr "" +"Project-Id-Version: km\n" +"Report-Msgid-Bugs-To: xorg@packages.debian.org\n" +"POT-Creation-Date: 2009-06-02 20:32+0200\n" +"PO-Revision-Date: 2006-10-03 08:13+0700\n" +"Last-Translator: Khoem Sokhem \n" +"Language-Team: KhmerOS \n" +"Language: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.11.2\n" + +#. Type: select +#. Choices +#: ../xserver-xorg-legacy.templates:2001 +msgid "Root Only" +msgstr "បាន​តែ Root" + +#. Type: select +#. Choices +#: ../xserver-xorg-legacy.templates:2001 +msgid "Console Users Only" +msgstr "បាន​តែ​អ្នក​ប្រើ​កុងសូល​" + +#. Type: select +#. Choices +#: ../xserver-xorg-legacy.templates:2001 +msgid "Anybody" +msgstr "ផ្សេងទៀត" + +#. Type: select +#. Description +#: ../xserver-xorg-legacy.templates:2002 +msgid "Users allowed to start the X server:" +msgstr "អ្នក​ប្រើ​បាន​អនុញ្ញាត​ឲ្យ​ចាប់​ផ្តើម​ម៉ាស៊ីន​បម្រើ​ X ៖" + +#. Type: select +#. Description +#: ../xserver-xorg-legacy.templates:2002 +msgid "" +"Because the X server runs with superuser privileges, it may be unwise to " +"permit any user to start it, for security reasons. On the other hand, it is " +"even more unwise to run general-purpose X client programs as root, which is " +"what may happen if only root is permitted to start the X server. A good " +"compromise is to permit the X server to be started only by users logged in " +"to one of the virtual consoles." +msgstr "" +"ដោយសារ​ម៉ាស៊ីន​បម្រើ​ X រត់ជាមួយ​​សិទ្ធ​អ្នក​ប្រើ​ជាន់​ខ្ពស់​, ​ចំពោះ​មូលហេតុ​ដែលមាន​សុវត្ថិភាព វា​ប្រហែល​ជា​​មិន​" +"អនុញ្ញាត​ឲ្យ​អ្នក​ប្រើ​ណាមួយ​​ចាប់​ផ្តើម​វា​ទេ ​។ មួយ​វិញ​ទៀត​ គោលបំណង​ទូទៅ​នៃ​កម្មវិធី​ម៉ាស៊ីន​ភ្ញៀវ​ X មាន​សិទ្ធ​ជា " +"root ដែល​នឹង​មាន​អ្វីអាចនឹង​កើត​ឡើង​ ប្រសិនបើ មានតែ​ root ដែល​អាច​អនុញ្ញាត​ឲ្យ​ចាប់ផ្តើ​ម​ម៉ាស៊ីន​បម្រើ​ X " +"បាននោះ ។ ការព្រមព្រៀង​​ល្អ​បានអនុញ្ញាត​ឲ្យ​ម៉ាស៊ីន​បម្រើ X ត្រូវបាន​ចាប់​ផ្តើម​តាម​​អ្នក​ប្រើ​ដែល​បាន​ចូល​ក្នុង​" +"កុងសូល​និម្មិត​មួយ​ ។" + --- xorg-server-1.18.2.orig/debian/po/ko.po +++ xorg-server-1.18.2/debian/po/ko.po @@ -0,0 +1,58 @@ +# Sunjae Park , 2006. +# Changwoo Ryu , 2008. +# +msgid "" +msgstr "" +"Project-Id-Version: xserver-xorg\n" +"Report-Msgid-Bugs-To: xorg@packages.debian.org\n" +"POT-Creation-Date: 2009-06-02 20:32+0200\n" +"PO-Revision-Date: 2008-07-20 12:34+0900\n" +"Last-Translator: Changwoo Ryu \n" +"Language-Team: Korean \n" +"Language: ko\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=1; plural=0;\n" + +#. Type: select +#. Choices +#: ../xserver-xorg-legacy.templates:2001 +msgid "Root Only" +msgstr "루트 사용자만" + +#. Type: select +#. Choices +#: ../xserver-xorg-legacy.templates:2001 +msgid "Console Users Only" +msgstr "콘솔 사용자만" + +#. Type: select +#. Choices +#: ../xserver-xorg-legacy.templates:2001 +msgid "Anybody" +msgstr "아무나" + +#. Type: select +#. Description +#: ../xserver-xorg-legacy.templates:2002 +msgid "Users allowed to start the X server:" +msgstr "X 서버를 띄울 권한이 있는 사용자:" + +#. Type: select +#. Description +#: ../xserver-xorg-legacy.templates:2002 +msgid "" +"Because the X server runs with superuser privileges, it may be unwise to " +"permit any user to start it, for security reasons. On the other hand, it is " +"even more unwise to run general-purpose X client programs as root, which is " +"what may happen if only root is permitted to start the X server. A good " +"compromise is to permit the X server to be started only by users logged in " +"to one of the virtual consoles." +msgstr "" +"X 서버는 수퍼유저 권한을 가진 채로 실행되기 때문에 보안상 아무 사용자나 X 서" +"버를 실행시킬 수 있도록 하는 것이 안 좋을 수 있습니다. 반면, 루트 사용자만 X " +"서버를 실행시킬 수 있을 경우 일반적인 X 클라이언트 프로그램도 루트 사용자로 " +"실행되기 때문에 더 안 좋을 수 있습니다. 버추얼 콘솔로 로그인된 사용자만 X 서" +"버를 실행시킬 수 있도록 하는 것이 적당할 수 있습니다." + --- xorg-server-1.18.2.orig/debian/po/ku.po +++ xorg-server-1.18.2/debian/po/ku.po @@ -0,0 +1,56 @@ +# translation of xorg-ku.po to Kurdish +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Erdal Ronahi , 2008. +msgid "" +msgstr "" +"Project-Id-Version: xorg-ku\n" +"Report-Msgid-Bugs-To: xorg@packages.debian.org\n" +"POT-Creation-Date: 2009-06-02 20:32+0200\n" +"PO-Revision-Date: 2008-04-23 15:49+0200\n" +"Last-Translator: Erdal Ronahi \n" +"Language-Team: Kurdish \n" +"Language: ku\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.11.4\n" +"Plural-Forms: nplurals=2; plural= n != 1;\n" + +#. Type: select +#. Choices +#: ../xserver-xorg-legacy.templates:2001 +msgid "Root Only" +msgstr "Tenê Root" + +#. Type: select +#. Choices +#: ../xserver-xorg-legacy.templates:2001 +msgid "Console Users Only" +msgstr "Tenê Bikarhênerên Konsoleyê" + +#. Type: select +#. Choices +#: ../xserver-xorg-legacy.templates:2001 +msgid "Anybody" +msgstr "Her Kes" + +#. Type: select +#. Description +#: ../xserver-xorg-legacy.templates:2002 +msgid "Users allowed to start the X server:" +msgstr "Bikarhênerên bi destûra destpêkirina pêşkêşkara X:" + +#. Type: select +#. Description +#: ../xserver-xorg-legacy.templates:2002 +msgid "" +"Because the X server runs with superuser privileges, it may be unwise to " +"permit any user to start it, for security reasons. On the other hand, it is " +"even more unwise to run general-purpose X client programs as root, which is " +"what may happen if only root is permitted to start the X server. A good " +"compromise is to permit the X server to be started only by users logged in " +"to one of the virtual consoles." +msgstr "" + --- xorg-server-1.18.2.orig/debian/po/lt.po +++ xorg-server-1.18.2/debian/po/lt.po @@ -0,0 +1,71 @@ +# translation of lt.po to Lithuanian +# +# Translators, if you are not familiar with the PO format, gettext +# documentation is worth reading, especially sections dedicated to +# this format, e.g. by running: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# Some information specific to po-debconf are available at +# /usr/share/doc/po-debconf/README-trans +# or http://www.debian.org/intl/l10n/po-debconf/README-trans# +# Developers do not need to manually edit POT or PO files. +# +# Gintautas Miliauskas , 2006, 2007. +msgid "" +msgstr "" +"Project-Id-Version: lt\n" +"Report-Msgid-Bugs-To: xorg@packages.debian.org\n" +"POT-Creation-Date: 2009-06-02 20:32+0200\n" +"PO-Revision-Date: 2008-08-31 23:09+0300\n" +"Last-Translator: Gintautas Miliauskas \n" +"Language-Team: Lithuanian \n" +"Language: lt\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.11.4\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n" +"%100<10 || n%100>=20) ? 1 : 2);\n" + +#. Type: select +#. Choices +#: ../xserver-xorg-legacy.templates:2001 +msgid "Root Only" +msgstr "Tik administratorius" + +#. Type: select +#. Choices +#: ../xserver-xorg-legacy.templates:2001 +msgid "Console Users Only" +msgstr "Tik konsolės naudotojai" + +#. Type: select +#. Choices +#: ../xserver-xorg-legacy.templates:2001 +msgid "Anybody" +msgstr "Visi" + +#. Type: select +#. Description +#: ../xserver-xorg-legacy.templates:2002 +msgid "Users allowed to start the X server:" +msgstr "Naudotojai, kuriems leidžiama įkrauti X serverį:" + +#. Type: select +#. Description +#: ../xserver-xorg-legacy.templates:2002 +msgid "" +"Because the X server runs with superuser privileges, it may be unwise to " +"permit any user to start it, for security reasons. On the other hand, it is " +"even more unwise to run general-purpose X client programs as root, which is " +"what may happen if only root is permitted to start the X server. A good " +"compromise is to permit the X server to be started only by users logged in " +"to one of the virtual consoles." +msgstr "" +"Kadangi X serveris veikia administratoriaus teisėmis, saugumo sumetimais " +"gali būti neprotinga leisti jį įkrauti bet kuriam naudotojui. Iš kitos " +"pusės, dar blogiau yra vykdyti standartines X programas administratoriaus " +"teisėmis (tai gali atsitikti, jei tik administratoriui leidžiama įkrauti X " +"serverį). Neblogas kompromisas yra leisti įkrauti X serverį tik tiems " +"naudotojams, kurie prisijungę prie vienos iš virtualių konsolių." + --- xorg-server-1.18.2.orig/debian/po/ml.po +++ xorg-server-1.18.2/debian/po/ml.po @@ -0,0 +1,70 @@ +# xserver-xorg translation to Malayalam +# Copyright (c) 2006 xorg package's copyright holder +# Translators, if you are not familiar with the PO format, gettext +# documentation is worth reading, especially sections dedicated to +# this format, e.g. by running: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# Some information specific to po-debconf are available at +# /usr/share/doc/po-debconf/README-trans +# or http://www.debian.org/intl/l10n/po-debconf/README-trans# +# Developers do not need to manually edit POT or PO files. +# +# Praveen|പ്രവീണ്‍ A|എ , 2006. +msgid "" +msgstr "" +"Project-Id-Version: xserver-xorg_ml\n" +"Report-Msgid-Bugs-To: xorg@packages.debian.org\n" +"POT-Creation-Date: 2009-06-02 20:32+0200\n" +"PO-Revision-Date: 2008-06-18 17:59+0530\n" +"Last-Translator: Praveen|പ്രവീണ്‍ A|എ \n" +"Language-Team: Swathanthra|സ്വതന്ത്ര Malayalam|മലയാളം Computing|കമ്പ്യൂട്ടിങ്ങ് \n" +"Language: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.11.4\n" + +#. Type: select +#. Choices +#: ../xserver-xorg-legacy.templates:2001 +msgid "Root Only" +msgstr "റൂട്ട് മാത്രം" + +#. Type: select +#. Choices +#: ../xserver-xorg-legacy.templates:2001 +msgid "Console Users Only" +msgstr "കണ്‍സോള്‍ ഉപയോക്താക്കള്‍ മാത്രം" + +#. Type: select +#. Choices +#: ../xserver-xorg-legacy.templates:2001 +msgid "Anybody" +msgstr "ആരും" + +#. Type: select +#. Description +#: ../xserver-xorg-legacy.templates:2002 +msgid "Users allowed to start the X server:" +msgstr "എക്സ് സേവകന്‍ തുടങ്ങാന്‍ അനുമതിയുള്ള ഉപയോക്താക്കള്‍:" + +#. Type: select +#. Description +#: ../xserver-xorg-legacy.templates:2002 +msgid "" +"Because the X server runs with superuser privileges, it may be unwise to " +"permit any user to start it, for security reasons. On the other hand, it is " +"even more unwise to run general-purpose X client programs as root, which is " +"what may happen if only root is permitted to start the X server. A good " +"compromise is to permit the X server to be started only by users logged in " +"to one of the virtual consoles." +msgstr "" +"എക്സ് സേവകന്‍ സൂപര്‍ ഉപയോക്താവിന്റെ പദവികളോടെയാണ് ഓടുന്നത് എന്നതിനാല്‍ സുരക്ഷാ കാരണങ്ങളാല്‍ ഏത് " +"ഉപയോക്താവിനും ഇത് തുടങ്ങാന്‍ അനുമതി നല്കുന്നത് ബുദ്ധിശുന്യമായേക്കാം. എന്നാല്‍ പൊതുവായുള്ള-" +"കാര്യങ്ങള്‍ക്കുള്ള എക്സ് ക്ലയന്റ് പ്രോഗ്രാമുകള്‍ റൂട്ടായി ഓടിക്കുന്നത് ഇതിലധികം ബുദ്ധിശുന്യമാണ്, അതാണ് " +"റൂട്ടിന് മാത്രം എക്സ് സേവകന്‍ തുടങ്ങാന്‍ അനുമതി നല്കിയാല്‍ സംഭവിക്കാന്‍ പോകുന്നത്. ഒരു നല്ല വിട്ടുവീഴ്ച " +"വിര്‍ച്വല്‍ കണ്‍സോളിലേതെങ്കിലുമൊന്നില്‍ ലോഗിന്‍ ചെയ്തിട്ടുള്ള ഉപയോക്താക്കള്‍ക്ക് മാത്രം എക്സ് സേവകന്‍ " +"തുടങ്ങാന്‍ അനുമതി നല്കുക എന്നത്." + --- xorg-server-1.18.2.orig/debian/po/mr.po +++ xorg-server-1.18.2/debian/po/mr.po @@ -0,0 +1,60 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +msgid "" +msgstr "" +"Project-Id-Version: xorg\n" +"Report-Msgid-Bugs-To: xorg@packages.debian.org\n" +"POT-Creation-Date: 2009-06-02 20:32+0200\n" +"PO-Revision-Date: 2006-08-14 11:05+0200\n" +"Last-Translator: Priti Patil \n" +"Language-Team: Marathi \n" +"Language: mr\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: select +#. Choices +#: ../xserver-xorg-legacy.templates:2001 +msgid "Root Only" +msgstr "फक्त मूल" + +#. Type: select +#. Choices +#: ../xserver-xorg-legacy.templates:2001 +msgid "Console Users Only" +msgstr "फक्त कन्सोल वापरकर्ते" + +#. Type: select +#. Choices +#: ../xserver-xorg-legacy.templates:2001 +msgid "Anybody" +msgstr "कोणीही" + +#. Type: select +#. Description +#: ../xserver-xorg-legacy.templates:2002 +msgid "Users allowed to start the X server:" +msgstr "वापरकर्त्यांना एक्स परिसेवक सुरू करता येईल:" + +#. Type: select +#. Description +#: ../xserver-xorg-legacy.templates:2002 +msgid "" +"Because the X server runs with superuser privileges, it may be unwise to " +"permit any user to start it, for security reasons. On the other hand, it is " +"even more unwise to run general-purpose X client programs as root, which is " +"what may happen if only root is permitted to start the X server. A good " +"compromise is to permit the X server to be started only by users logged in " +"to one of the virtual consoles." +msgstr "" +"एक्स परिसेवक सुपरयुझरचे हक्क असणारा कोणीही सुरू करू शकत असल्याने, सर्वच वापरकर्त्यांना तो " +"सुरू करण्याची अनुमती देणे सुरक्षिततेच्या दृष्टीकोनातून उचित होणार नाही. तथापी, सामान्य " +"वापराचे एक्स अशील प्रोग्राम मूल असताना चालवणे अधिकच अनुचित होईल, जे एक्स परिसेवक सुरू " +"करण्याची परवानगी फक्त मूल लाच दिल्यास घडू शकेल. अाभासी कन्सोलांपैकी एकावर सत्रारंभ " +"केलेल्या वापरकर्त्यांनाच एक्स परिसेवक सुरू करण्याची अनुमती देणे ही यातील चांगली तडजोड ठरू " +"शकेल." + --- xorg-server-1.18.2.orig/debian/po/nb.po +++ xorg-server-1.18.2/debian/po/nb.po @@ -0,0 +1,63 @@ +# translation of xserver-xorg_debian.po to Norwegian Bokmål +# +# This file is distributed under the same license as the package. +# +# Bjørn Steensrud , 2006. +# Hans Fredrik Nordhaug , 2008. +# +msgid "" +msgstr "" +"Project-Id-Version: xserver-xorg_debian_nb\n" +"Report-Msgid-Bugs-To: xorg@packages.debian.org\n" +"POT-Creation-Date: 2009-06-02 20:32+0200\n" +"PO-Revision-Date: 2008-08-31 22:50+0200\n" +"Last-Translator: Hans Fredrik Nordhaug \n" +"Language-Team: Norwegian Bokmål \n" +"Language: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.11.2\n" + +#. Type: select +#. Choices +#: ../xserver-xorg-legacy.templates:2001 +msgid "Root Only" +msgstr "Bare root" + +#. Type: select +#. Choices +#: ../xserver-xorg-legacy.templates:2001 +msgid "Console Users Only" +msgstr "Bare konsoll-brukere" + +#. Type: select +#. Choices +#: ../xserver-xorg-legacy.templates:2001 +msgid "Anybody" +msgstr "Alle" + +#. Type: select +#. Description +#: ../xserver-xorg-legacy.templates:2002 +msgid "Users allowed to start the X server:" +msgstr "Brukere som har lov til å starte X-tjeneren:" + +#. Type: select +#. Description +#: ../xserver-xorg-legacy.templates:2002 +msgid "" +"Because the X server runs with superuser privileges, it may be unwise to " +"permit any user to start it, for security reasons. On the other hand, it is " +"even more unwise to run general-purpose X client programs as root, which is " +"what may happen if only root is permitted to start the X server. A good " +"compromise is to permit the X server to be started only by users logged in " +"to one of the virtual consoles." +msgstr "" +"Fordi X-tjeneren kjører med priviliegier som superbruker, er det kanskje " +"uklokt av sikkerhetsgrunner å la alle starte den. På den annen side er det " +"enda mer uklokt å kjøre alminnelige X klientprogrammer som root, og det kan " +"skje dersom bare root får lov til å starte X-tjeneren. En god middelvei er å " +"tillate bare brukere som er logget inn på et av de virtuelle konsollene å " +"starte X-tjeneren." + --- xorg-server-1.18.2.orig/debian/po/ne.po +++ xorg-server-1.18.2/debian/po/ne.po @@ -0,0 +1,63 @@ +# translation of ne.po to Nepali +# This file is distributed under the same license as the PACKAGE package. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER. +# +# Mahesh subedi , 2006. +# Shiva Prasad Pokharel , 2006. +# Shiva Pokharel , 2007. +msgid "" +msgstr "" +"Project-Id-Version: ne\n" +"Report-Msgid-Bugs-To: xorg@packages.debian.org\n" +"POT-Creation-Date: 2009-06-02 20:32+0200\n" +"PO-Revision-Date: 2007-04-06 05:41+0545\n" +"Last-Translator: Shiva Pokharel \n" +"Language-Team: Nepali \n" +"Language: ne\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.11.4\n" +"Plural-Forms: nplurals=2; nplural(n!=1)\n" + +#. Type: select +#. Choices +#: ../xserver-xorg-legacy.templates:2001 +msgid "Root Only" +msgstr "मूल मात्र" + +#. Type: select +#. Choices +#: ../xserver-xorg-legacy.templates:2001 +msgid "Console Users Only" +msgstr "कन्सोल प्रयोगकर्ता मात्र" + +#. Type: select +#. Choices +#: ../xserver-xorg-legacy.templates:2001 +msgid "Anybody" +msgstr "कोहि" + +#. Type: select +#. Description +#: ../xserver-xorg-legacy.templates:2002 +msgid "Users allowed to start the X server:" +msgstr "प्रयोगकर्तालाई एक्स सर्भर सुरू गर्न अनुमति दिइयो:" + +#. Type: select +#. Description +#: ../xserver-xorg-legacy.templates:2002 +msgid "" +"Because the X server runs with superuser privileges, it may be unwise to " +"permit any user to start it, for security reasons. On the other hand, it is " +"even more unwise to run general-purpose X client programs as root, which is " +"what may happen if only root is permitted to start the X server. A good " +"compromise is to permit the X server to be started only by users logged in " +"to one of the virtual consoles." +msgstr "" +"किनभने एक्स सर्भर सुपर प्रयोगकर्ताको बिशेषाधिकारमा चल्दछ, यदि यसलाई कुनै प्रयोगकर्ताले सुरू " +"गर्न अनुमति दिन नचाहेमा, सुरक्षाको कारणले । अर्को तर्फ, अझ यो एक्स ग्राहक कार्यक्रमको " +"रुपमा साधारण-उद्देश्य चलाउन अनिच्छुक छ, यदि मूललाई मात्र एक्स सर्भर सुरू गर्न अनुमति दिइयो " +"भने के होला जुन चाहि । एउटा राम्रो सम्झौता चाहि एक्स सर्भर केबल अवास्तविक कन्सोलहरुमा " +"एक प्रयोगकर्ता लगइन द्धारा सुरू हुने हुन्छ ।" + --- xorg-server-1.18.2.orig/debian/po/nl.po +++ xorg-server-1.18.2/debian/po/nl.po @@ -0,0 +1,82 @@ +# debconf templates for xorg-x11 package +# Dutch translation +# +# $Id$ +# +# Copyrights: +# Branden Robinson, 2000-2004 +# Wouter Verhelst, 2002 +# Bart Cornelis, 2003 +# +# This file is distributed under the same license as the xorg-x11 package. +# Please see debian/copyright. +# +# Translators, if you are not familiar with the PO format, gettext +# documentation is worth reading, especially sections dedicated to +# this format, e.g. by running: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# +# Some information specific to po-debconf are available at +# /usr/share/doc/po-debconf/README-trans +# or http://www.debian.org/intl/l10n/po-debconf/README-trans +# +# Developers do not need to manually edit POT or PO files. +# +msgid "" +msgstr "" +"Project-Id-Version: xorg\n" +"Report-Msgid-Bugs-To: xorg@packages.debian.org\n" +"POT-Creation-Date: 2009-06-02 20:32+0200\n" +"PO-Revision-Date: 2008-06-16 10:58+0100\n" +"Last-Translator: Bart Cornelis \n" +"Language-Team: debian-l10n-dutch \n" +"Language: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Poedit-Language: Dutch\n" + +#. Type: select +#. Choices +#: ../xserver-xorg-legacy.templates:2001 +msgid "Root Only" +msgstr "Enkel root" + +#. Type: select +#. Choices +#: ../xserver-xorg-legacy.templates:2001 +msgid "Console Users Only" +msgstr "Enkel console-gebruikers" + +#. Type: select +#. Choices +#: ../xserver-xorg-legacy.templates:2001 +msgid "Anybody" +msgstr "Iedereen" + +#. Type: select +#. Description +#: ../xserver-xorg-legacy.templates:2002 +msgid "Users allowed to start the X server:" +msgstr "Gebruikers die de X-server mogen starten:" + +#. Type: select +#. Description +#: ../xserver-xorg-legacy.templates:2002 +msgid "" +"Because the X server runs with superuser privileges, it may be unwise to " +"permit any user to start it, for security reasons. On the other hand, it is " +"even more unwise to run general-purpose X client programs as root, which is " +"what may happen if only root is permitted to start the X server. A good " +"compromise is to permit the X server to be started only by users logged in " +"to one of the virtual consoles." +msgstr "" +"Omdat de X-server met de rechten van de supergebruiker draait is het, voor " +"beveiligingsredenen, dikwijls onverstandig om deze te laten opstarten door " +"eender welke gebruiker. Daar staat tegenover dat het nog onverstandiger is " +"om de algemene grafische programma's te gebruiken als root, wat mogelijk het " +"gevolg is wanneer enkel de root gebruiker de X-server kan opstarten. Een " +"goed compromis is om de X-server alleen te laten opstarten door gebruikers " +"die aangemeld zijn via één van de virtuele consoles." + --- xorg-server-1.18.2.orig/debian/po/nn.po +++ xorg-server-1.18.2/debian/po/nn.po @@ -0,0 +1,70 @@ +# translation of xserver-xorg_nn.po to Norwegian nynorsk +# +# Translators, if you are not familiar with the PO format, gettext +# documentation is worth reading, especially sections dedicated to +# this format, e.g. by running: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# Some information specific to po-debconf are available at +# /usr/share/doc/po-debconf/README-trans +# or http://www.debian.org/intl/l10n/po-debconf/README-trans# +# Developers do not need to manually edit POT or PO files. +# +# Håvard Korsvoll , 2006, 2007. +msgid "" +msgstr "" +"Project-Id-Version: xserver-xorg_nn\n" +"Report-Msgid-Bugs-To: xorg@packages.debian.org\n" +"POT-Creation-Date: 2009-06-02 20:32+0200\n" +"PO-Revision-Date: 2007-03-11 10:07+0100\n" +"Last-Translator: Håvard Korsvoll \n" +"Language-Team: Norwegian nynorsk \n" +"Language: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.11.4\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#. Type: select +#. Choices +#: ../xserver-xorg-legacy.templates:2001 +msgid "Root Only" +msgstr "Berre root" + +#. Type: select +#. Choices +#: ../xserver-xorg-legacy.templates:2001 +msgid "Console Users Only" +msgstr "Berre konsollbrukarar" + +#. Type: select +#. Choices +#: ../xserver-xorg-legacy.templates:2001 +msgid "Anybody" +msgstr "Alle" + +#. Type: select +#. Description +#: ../xserver-xorg-legacy.templates:2002 +msgid "Users allowed to start the X server:" +msgstr "Brukarar som har lov til å starte X-tenaren:" + +#. Type: select +#. Description +#: ../xserver-xorg-legacy.templates:2002 +msgid "" +"Because the X server runs with superuser privileges, it may be unwise to " +"permit any user to start it, for security reasons. On the other hand, it is " +"even more unwise to run general-purpose X client programs as root, which is " +"what may happen if only root is permitted to start the X server. A good " +"compromise is to permit the X server to be started only by users logged in " +"to one of the virtual consoles." +msgstr "" +"Sidan X-tenaren køyrer med priviliegiar som superbrukar, er det kanskje " +"uklokt av tryggingsgrunner å la alle starte han. På den andre sida er det " +"endå meir uklokt å køyre alminnelege X klientprogram som root, og det kan " +"skje dersom berre root får lov til å starte X-tenaren. Ein god middelveg er " +"å tillate berre brukarar som er logga inn på eit av dei virituelle konsolla " +"å starte X-tenaren." + --- xorg-server-1.18.2.orig/debian/po/pl.po +++ xorg-server-1.18.2/debian/po/pl.po @@ -0,0 +1,66 @@ +# debconf templates for xorg-x11 package +# +# $Id: xorg.po,v 1.26 2006/02/15 09:47:09 arteek Exp $ +# +# Copyright: +# 2006 Bartosz Feski +# 2006 Artur Szymaski +# +# This file is distributed under the same license as the xorg-x11 package. +# Please see debian/copyright. +msgid "" +msgstr "" +"Project-Id-Version: 6.9.0.dfsg.1-2+SVN\n" +"Report-Msgid-Bugs-To: xorg@packages.debian.org\n" +"POT-Creation-Date: 2009-06-02 20:32+0200\n" +"PO-Revision-Date: 2008-08-31 22:49+0200\n" +"Last-Translator: Bartosz Fenski \n" +"Language-Team: Polish \n" +"Language: pl\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=iso-8859-2\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: select +#. Choices +#: ../xserver-xorg-legacy.templates:2001 +msgid "Root Only" +msgstr "Tylko root" + +#. Type: select +#. Choices +#: ../xserver-xorg-legacy.templates:2001 +msgid "Console Users Only" +msgstr "Tylko uytkownicy konsoli" + +#. Type: select +#. Choices +#: ../xserver-xorg-legacy.templates:2001 +msgid "Anybody" +msgstr "Kady uytkownik" + +#. Type: select +#. Description +#: ../xserver-xorg-legacy.templates:2002 +msgid "Users allowed to start the X server:" +msgstr "Uytkownicy mogcy uruchamia serwer X:" + +#. Type: select +#. Description +#: ../xserver-xorg-legacy.templates:2002 +msgid "" +"Because the X server runs with superuser privileges, it may be unwise to " +"permit any user to start it, for security reasons. On the other hand, it is " +"even more unwise to run general-purpose X client programs as root, which is " +"what may happen if only root is permitted to start the X server. A good " +"compromise is to permit the X server to be started only by users logged in " +"to one of the virtual consoles." +msgstr "" +"Poniewa serwer X dziaa z przywilejami speruytkownika, ze wzgldu na " +"bezpieczestwo systemu nierozsdnie jest dawa prawa jego uruchamiania " +"kademu uytkownikowi. Z drugiej za strony, jeszcze mniej rozsdnie jest " +"uruchamianie programw klienckich X oglnego przeznaczenia jako uytkownik " +"root, co moe si zdarzy jeli tylko root bdzie mg uruchomi serwer X. " +"Dobrym kompromisem jest zezwolenie na uruchamianie serwera X tylko " +"uytkownikom zalogowanym na jednej z wirtualnych konsol (uytkownik konsoli)." + --- xorg-server-1.18.2.orig/debian/po/pothead.in +++ xorg-server-1.18.2/debian/po/pothead.in @@ -0,0 +1,30 @@ +# debconf templates for xfree86 package +# +# $Id: pothead.in 1695 2004-07-29 07:22:25Z branden $ +# +# Copyright: +# Branden Robinson, 2000--2004 +# +# This file is distributed under the same license as the xfree86 package. +# Please see debian/copyright. +# +# Translators, if you are not familiar with the PO format, gettext +# documentation is worth reading, especially sections dedicated to +# this format, e.g. by running: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# +# Some information specific to po-debconf is available at +# /usr/share/doc/po-debconf/README-trans +# or http://www.debian.org/intl/l10n/po-debconf/README-trans +# +# Developers do not need to manually edit POT or PO files. +# +msgid "" +msgstr "" +"Project-Id-Version: SOURCE_VERSION\n" +"Report-Msgid-Bugs-To: debian-x@lists.debian.org\n" +"POT-Creation-Date: DATE\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" --- xorg-server-1.18.2.orig/debian/po/pt.po +++ xorg-server-1.18.2/debian/po/pt.po @@ -0,0 +1,67 @@ +# debconf templates for xorg-x11 package +# Portuguese translation +# +# $Id: pt.po 1042 2006-01-09 07:55:08Z ender $ +# +# Copyright: +# Branden Robinson, 2000-2004 +# Eduardo Silva , 2005 +# Miguel Figueiredo , 2006-2008 +# +msgid "" +msgstr "" +"Project-Id-Version: xserver-xorg_debian_po\n" +"Report-Msgid-Bugs-To: xorg@packages.debian.org\n" +"POT-Creation-Date: 2009-06-02 20:32+0200\n" +"PO-Revision-Date: 2008-06-09 21:23+0100\n" +"Last-Translator: Miguel Figueiredo \n" +"Language-Team: Portuguese \n" +"Language: pt\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#. Type: select +#. Choices +#: ../xserver-xorg-legacy.templates:2001 +msgid "Root Only" +msgstr "Apenas Root" + +#. Type: select +#. Choices +#: ../xserver-xorg-legacy.templates:2001 +msgid "Console Users Only" +msgstr "Apenas Utilizadores de Consola" + +#. Type: select +#. Choices +#: ../xserver-xorg-legacy.templates:2001 +msgid "Anybody" +msgstr "Todos" + +#. Type: select +#. Description +#: ../xserver-xorg-legacy.templates:2002 +msgid "Users allowed to start the X server:" +msgstr "Utilizadores autorizados a iniciar o servidor X:" + +#. Type: select +#. Description +#: ../xserver-xorg-legacy.templates:2002 +msgid "" +"Because the X server runs with superuser privileges, it may be unwise to " +"permit any user to start it, for security reasons. On the other hand, it is " +"even more unwise to run general-purpose X client programs as root, which is " +"what may happen if only root is permitted to start the X server. A good " +"compromise is to permit the X server to be started only by users logged in " +"to one of the virtual consoles." +msgstr "" +"Como o servidor X corre com privilégios de super-utilizador, por razões de " +"segurança, pode ser imprudente permitir que qualquer utilizador o inicie. " +"Por outro lado, é ainda mais imprudente correr programas clientes de X de " +"carácter geral como root, que é o que poderá acontecer se apenas o root " +"tiver permissões para iniciar o servidor X. Um bom compromisso é permitir " +"que o servidor X seja iniciado apenas por utilizadores que tenham iniciado " +"uma sessão numa das consolas virtuais." + --- xorg-server-1.18.2.orig/debian/po/pt_BR.po +++ xorg-server-1.18.2/debian/po/pt_BR.po @@ -0,0 +1,85 @@ +# debconf templates for xorg-x11 package +# Portuguese (Brazil) translation +# +# $Id: pt_BR.po 1042 2006-01-09 07:55:08Z ender $ +# +# Copyrights: +# Branden Robinson, 2000-2004 +# Gustavo Noronha Silva, 2001 +# Henrique de Moraes Holschuh, 2001 +# André Luís Lopes , 2001-2005 +# Felipe Augusto van de Wiel (faw) , 2007-2008. +# +# This file is distributed under the same license as the xorg-x11 package. +# Please see debian/copyright. +# +# Translators, if you are not familiar with the PO format, gettext +# documentation is worth reading, especially sections dedicated to +# this format, e.g. by running: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# +# Some information specific to po-debconf are available at +# /usr/share/doc/po-debconf/README-trans +# or http://www.debian.org/intl/l10n/po-debconf/README-trans +# +# Developers do not need to manually edit POT or PO files. +# +msgid "" +msgstr "" +"Project-Id-Version: xorg-x11\n" +"Report-Msgid-Bugs-To: xorg@packages.debian.org\n" +"POT-Creation-Date: 2009-06-02 20:32+0200\n" +"PO-Revision-Date: 2008-06-14 21:44-0300\n" +"Last-Translator: Felipe Augusto van de Wiel (faw) \n" +"Language-Team: Brazilian Portuguese \n" +"Language: pt_BR\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"pt_BR utf-8\n" + +#. Type: select +#. Choices +#: ../xserver-xorg-legacy.templates:2001 +msgid "Root Only" +msgstr "Somente Root" + +#. Type: select +#. Choices +#: ../xserver-xorg-legacy.templates:2001 +msgid "Console Users Only" +msgstr "Somente Usuários de Console" + +#. Type: select +#. Choices +#: ../xserver-xorg-legacy.templates:2001 +msgid "Anybody" +msgstr "Qualquer Um" + +#. Type: select +#. Description +#: ../xserver-xorg-legacy.templates:2002 +msgid "Users allowed to start the X server:" +msgstr "Usuários que podem iniciar o servidor X:" + +#. Type: select +#. Description +#: ../xserver-xorg-legacy.templates:2002 +msgid "" +"Because the X server runs with superuser privileges, it may be unwise to " +"permit any user to start it, for security reasons. On the other hand, it is " +"even more unwise to run general-purpose X client programs as root, which is " +"what may happen if only root is permitted to start the X server. A good " +"compromise is to permit the X server to be started only by users logged in " +"to one of the virtual consoles." +msgstr "" +"Devido ao servidor X ser executado com privilégios de superusuário, pode não " +"ser muito sábio permitir que qualquer usuário o inicie, por questões de " +"segurança. Por outro lado, é menos sábio ainda executar programas clientes X " +"de propósito geral como root, que é o que pode acontecer se somente o root " +"tiver permissão de iniciar o servidor X. Um bom compromisso é permitir o " +"servidor X ser iniciado somente por usuários logados em um dos consoles " +"virtuais." + --- xorg-server-1.18.2.orig/debian/po/ro.po +++ xorg-server-1.18.2/debian/po/ro.po @@ -0,0 +1,84 @@ +# translation of ro.po to Română +# Romanian translation +# debconf templates for xorg-x11 package +# +# $Id: pothead.in 189 2005-06-11 00:04:27Z branden $ +# +# Copyright: +# +# This file is distributed under the same license as the xorg-x11 package. +# Please see debian/copyright. +# +# Translators, if you are not familiar with the PO format, gettext +# documentation is worth reading, especially sections dedicated to +# this format, e.g. by running: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# +# Some information specific to po-debconf is available at +# /usr/share/doc/po-debconf/README-trans +# or http://www.debian.org/intl/l10n/po-debconf/README-trans +# +# Developers do not need to manually edit POT or PO files. +# +# Branden Robinson, 2000--2004. +# Ruset Zeno , 2005. +# Eddy Petrișor , 2005,2006,2008. +msgid "" +msgstr "" +"Project-Id-Version: ro\n" +"Report-Msgid-Bugs-To: xorg@packages.debian.org\n" +"POT-Creation-Date: 2009-06-02 20:32+0200\n" +"PO-Revision-Date: 2008-06-17 14:03+0300\n" +"Last-Translator: Eddy Petrișor \n" +"Language-Team: Română \n" +"Language: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.11.4\n" +"Plural-Forms: nplurals=3;plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?" +"2:1))\n" + +#. Type: select +#. Choices +#: ../xserver-xorg-legacy.templates:2001 +msgid "Root Only" +msgstr "Doar root" + +#. Type: select +#. Choices +#: ../xserver-xorg-legacy.templates:2001 +msgid "Console Users Only" +msgstr "Doar utilizatorii de consolă" + +#. Type: select +#. Choices +#: ../xserver-xorg-legacy.templates:2001 +msgid "Anybody" +msgstr "Oricine" + +#. Type: select +#. Description +#: ../xserver-xorg-legacy.templates:2002 +msgid "Users allowed to start the X server:" +msgstr "Utilizatori cărora le este permis să pornească serverul X:" + +#. Type: select +#. Description +#: ../xserver-xorg-legacy.templates:2002 +msgid "" +"Because the X server runs with superuser privileges, it may be unwise to " +"permit any user to start it, for security reasons. On the other hand, it is " +"even more unwise to run general-purpose X client programs as root, which is " +"what may happen if only root is permitted to start the X server. A good " +"compromise is to permit the X server to be started only by users logged in " +"to one of the virtual consoles." +msgstr "" +"Deoarece serverul X rulează cu privilegii de superutilizator, nu este " +"probabil înțelept să i se permită oricărui utilizator să-l pornească, din " +"motive de securitate. Pe de altă parte, este și mai puțin înțelept să se " +"ruleze clienții X de uz general ca și root, lucru probabil dacă se permite " +"doar ca root să pornească serverul X. Un bun compromis este permiterea " +"pornirii pentru utilizatorii autentificați la una din consolele virtuale." + --- xorg-server-1.18.2.orig/debian/po/ru.po +++ xorg-server-1.18.2/debian/po/ru.po @@ -0,0 +1,87 @@ +# translation of xorg-debconf-ru.po to Russian +# debconf templates for xorg-x11 package +# Russian translation +# +# $Id: ru.po 1042 2006-01-09 07:55:08Z ender $ +# +# Copyrights: +# +# This file is distributed under the same license as the xorg-x11 package. +# Please see debian/copyright. +# +# Translators, if you are not familiar with the PO format, gettext +# documentation is worth reading, especially sections dedicated to +# this format, e.g. by running: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# +# Some information specific to po-debconf are available at +# /usr/share/doc/po-debconf/README-trans +# or http://www.debian.org/intl/l10n/po-debconf/README-trans +# +# Developers do not need to manually edit POT or PO files. +# +# Branden Robinson, 2000-2004. +# Ilgiz Kalmetev, 2002, 2003. +# Serge Winitzki, 2003. +# Yuri Kozlov , 2005, 2006. +# Sergey Alyoshin , 2007, 2008. +msgid "" +msgstr "" +"Project-Id-Version: xserver-xorg-1:7.1.0-15_debian_po_ru\n" +"Report-Msgid-Bugs-To: xorg@packages.debian.org\n" +"POT-Creation-Date: 2009-06-02 20:32+0200\n" +"PO-Revision-Date: 2008-06-12 22:32+0400\n" +"Last-Translator: Sergey Alyoshin \n" +"Language-Team: Russian \n" +"Language: ru\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.11.2\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" +"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" + +#. Type: select +#. Choices +#: ../xserver-xorg-legacy.templates:2001 +msgid "Root Only" +msgstr "Только суперпользователь" + +#. Type: select +#. Choices +#: ../xserver-xorg-legacy.templates:2001 +msgid "Console Users Only" +msgstr "Только пользователи из консоли" + +#. Type: select +#. Choices +#: ../xserver-xorg-legacy.templates:2001 +msgid "Anybody" +msgstr "Кто угодно" + +#. Type: select +#. Description +#: ../xserver-xorg-legacy.templates:2002 +msgid "Users allowed to start the X server:" +msgstr "Пользователи, которым разрешено запускать X сервер:" + +#. Type: select +#. Description +#: ../xserver-xorg-legacy.templates:2002 +msgid "" +"Because the X server runs with superuser privileges, it may be unwise to " +"permit any user to start it, for security reasons. On the other hand, it is " +"even more unwise to run general-purpose X client programs as root, which is " +"what may happen if only root is permitted to start the X server. A good " +"compromise is to permit the X server to be started only by users logged in " +"to one of the virtual consoles." +msgstr "" +"Поскольку X сервер запускается с привилегиями суперпользователя, то из " +"соображений безопасности, вероятно, не очень хорошо позволять любым " +"пользователям запускать его. С другой стороны, ещё хуже запускать клиентские " +"X-программы общего назначения от имени суперпользователя; это может " +"случиться, если право запускать сервер X имеет только суперпользователь. " +"Наилучшее решение заключается в том, чтобы позволять запускать сервер X " +"только пользователям, зарегистрированным на одной из виртуальных консолей." + --- xorg-server-1.18.2.orig/debian/po/sk.po +++ xorg-server-1.18.2/debian/po/sk.po @@ -0,0 +1,65 @@ +# debconf templates for xorg-x11 package +# Slovak translation +# $Id: sk.po 1042 2006-01-09 07:55:08Z ender $ +# +# Copyrights: +# Branden Robinson, 2000-2004 +# Miroslav Kure , 2004. +# Peter Mann , 2005, 2008. +# Ivan Masár , 2009. +# +msgid "" +msgstr "" +"Project-Id-Version: xorg-x11\n" +"Report-Msgid-Bugs-To: xorg@packages.debian.org\n" +"POT-Creation-Date: 2009-06-02 20:32+0200\n" +"PO-Revision-Date: 2009-04-10 12:53+0100\n" +"Last-Translator: Ivan Masár \n" +"Language-Team: Slovak \n" +"Language: sk\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: select +#. Choices +#: ../xserver-xorg-legacy.templates:2001 +msgid "Root Only" +msgstr "Len root" + +#. Type: select +#. Choices +#: ../xserver-xorg-legacy.templates:2001 +msgid "Console Users Only" +msgstr "Len konzoloví používatelia" + +#. Type: select +#. Choices +#: ../xserver-xorg-legacy.templates:2001 +msgid "Anybody" +msgstr "Ktokoľvek" + +#. Type: select +#. Description +#: ../xserver-xorg-legacy.templates:2002 +msgid "Users allowed to start the X server:" +msgstr "Používatelia,ktorí môžu spustiť X server:" + +#. Type: select +#. Description +#: ../xserver-xorg-legacy.templates:2002 +msgid "" +"Because the X server runs with superuser privileges, it may be unwise to " +"permit any user to start it, for security reasons. On the other hand, it is " +"even more unwise to run general-purpose X client programs as root, which is " +"what may happen if only root is permitted to start the X server. A good " +"compromise is to permit the X server to be started only by users logged in " +"to one of the virtual consoles." +msgstr "" +"Pretože X server je spustený s právami superpoužívateľa, nie je z hľadiska " +"bezpečnosti veľmi rozumné dať možnosť jeho spustenia používateľom. Na druhej " +"strane ešte horšie je spustenie všeobecného X klienta ako používateľ root, " +"čo sa stane vtedy, ak povolíte spustenie X servera iba používateľovi root. " +"Rozumným kompromisom je teda povolenie spustenia X servera iba používateľom " +"prihláseným na virtuálnej konzole." + --- xorg-server-1.18.2.orig/debian/po/sq.po +++ xorg-server-1.18.2/debian/po/sq.po @@ -0,0 +1,66 @@ +# Translators, if you are not familiar with the PO format, gettext +# documentation is worth reading, especially sections dedicated to +# this format, e.g. by running: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# Some information specific to po-debconf are available at +# /usr/share/doc/po-debconf/README-trans +# or http://www.debian.org/intl/l10n/po-debconf/README-trans +# Developers do not need to manually edit POT or PO files. +# +# +msgid "" +msgstr "" +"Project-Id-Version: xorg\n" +"Report-Msgid-Bugs-To: xorg@packages.debian.org\n" +"POT-Creation-Date: 2009-06-02 20:32+0200\n" +"PO-Revision-Date: 2007-04-09 23:45+0200\n" +"Last-Translator: Elian Myftiu \n" +"Language-Team: Albanian\n" +"Language: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: select +#. Choices +#: ../xserver-xorg-legacy.templates:2001 +msgid "Root Only" +msgstr "Vetëm Root" + +#. Type: select +#. Choices +#: ../xserver-xorg-legacy.templates:2001 +msgid "Console Users Only" +msgstr "Vetëm Përdorues Konsoli" + +#. Type: select +#. Choices +#: ../xserver-xorg-legacy.templates:2001 +msgid "Anybody" +msgstr "Çdokush" + +#. Type: select +#. Description +#: ../xserver-xorg-legacy.templates:2002 +msgid "Users allowed to start the X server:" +msgstr "Përdorues të lejuar të nisin shërbyesin X:" + +#. Type: select +#. Description +#: ../xserver-xorg-legacy.templates:2002 +msgid "" +"Because the X server runs with superuser privileges, it may be unwise to " +"permit any user to start it, for security reasons. On the other hand, it is " +"even more unwise to run general-purpose X client programs as root, which is " +"what may happen if only root is permitted to start the X server. A good " +"compromise is to permit the X server to be started only by users logged in " +"to one of the virtual consoles." +msgstr "" +"Meqë shërbyesi X xhiron me pronësi administruesi, mund të jetë mendjelehtësi " +"të lejosh çdo përdorues ta nisë atë, për arsye sigurie. Nga ana tjetër, " +"është ende më mendjelehtësi të xhirosh programe klientë nën X si root, gjë " +"që ndodh nëse vetëm root lejohet të nisë shërbyesin X. Një marrëveshje e " +"mirë është të lejosh shërbyesin X të niset vetëm nga përdorues të kyçur në " +"një nga konsolet virtuale." + --- xorg-server-1.18.2.orig/debian/po/sr.po +++ xorg-server-1.18.2/debian/po/sr.po @@ -0,0 +1,60 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) 2011 +# This file is distributed under the same license as the xorg package. +# Zlatan Todoric , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: xorg@packages.debian.org\n" +"POT-Creation-Date: 2009-06-02 20:32+0200\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: Zlatan Todoric \n" +"Language-Team: LANGUAGE \n" +"Language: Serbian cyrillic\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: select +#. Choices +#: ../xserver-xorg-legacy.templates:2001 +msgid "Root Only" +msgstr "Само главни корисник" + +#. Type: select +#. Choices +#: ../xserver-xorg-legacy.templates:2001 +msgid "Console Users Only" +msgstr "Само за кориснике конзоле" + +#. Type: select +#. Choices +#: ../xserver-xorg-legacy.templates:2001 +msgid "Anybody" +msgstr "Свако" + +#. Type: select +#. Description +#: ../xserver-xorg-legacy.templates:2002 +msgid "Users allowed to start the X server:" +msgstr "Корисници којима је дозвољено покретање Х сервера:" + +#. Type: select +#. Description +#: ../xserver-xorg-legacy.templates:2002 +msgid "" +"Because the X server runs with superuser privileges, it may be unwise to " +"permit any user to start it, for security reasons. On the other hand, it is " +"even more unwise to run general-purpose X client programs as root, which is " +"what may happen if only root is permitted to start the X server. A good " +"compromise is to permit the X server to be started only by users logged in " +"to one of the virtual consoles." +msgstr "" +"Због покретања Х сервера са суперкорисничким привилегијам, није " +"препоручљиводозволити корисницима да га покрену, из сигурносних разлога. С " +"друге стране, јошмање је препоручљиво покренути Х клијента опште намјене као " +"главни корисник, што се може десити ако је само главном кориснику дозвољено " +"да покрене Х сервер.Компромис би био дозволити покретање Х сервера од стране " +"корисника који су самоулоговани на једну од виртуелних конзола." --- xorg-server-1.18.2.orig/debian/po/sr@latin.po +++ xorg-server-1.18.2/debian/po/sr@latin.po @@ -0,0 +1,61 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) 2011 +# This file is distributed under the same license as the PACKAGE package. +# Zlatan Todoric , 2011. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: xorg@packages.debian.org\n" +"POT-Creation-Date: 2009-06-02 20:32+0200\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: Zlatan Todoric \n" +"Language-Team: LANGUAGE \n" +"Language: Serbian latin\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: select +#. Choices +#: ../xserver-xorg-legacy.templates:2001 +msgid "Root Only" +msgstr "Samo glavni korisnik" + +#. Type: select +#. Choices +#: ../xserver-xorg-legacy.templates:2001 +msgid "Console Users Only" +msgstr "Samo za korisnike konzole" + +#. Type: select +#. Choices +#: ../xserver-xorg-legacy.templates:2001 +msgid "Anybody" +msgstr "Svako" + +#. Type: select +#. Description +#: ../xserver-xorg-legacy.templates:2002 +msgid "Users allowed to start the X server:" +msgstr "Korisnici kojima je dozvoljeno pokretanje X servera:" + +#. Type: select +#. Description +#: ../xserver-xorg-legacy.templates:2002 +msgid "" +"Because the X server runs with superuser privileges, it may be unwise to " +"permit any user to start it, for security reasons. On the other hand, it is " +"even more unwise to run general-purpose X client programs as root, which is " +"what may happen if only root is permitted to start the X server. A good " +"compromise is to permit the X server to be started only by users logged in " +"to one of the virtual consoles." +msgstr "" +"Zbog pokretanja X servera sa superkorisničkim privilegijam, nije " +"preporučljivodozvoliti korisnicima da ga pokrenu, iz sigurnosnih razloga. S " +"druge strane, jošmanje je preporučljivo pokrenuti X klijenta opšte namjene " +"kao glavni korisnik, štose može desiti ako je samo glavnom korisniku " +"dozvoljeno da pokrene X server.Kompromis bi bio dozvoliti pokretanje X " +"servera od strane korisnika koji su samoulogovani na jednu od virtuelnih " +"konzola." --- xorg-server-1.18.2.orig/debian/po/sv.po +++ xorg-server-1.18.2/debian/po/sv.po @@ -0,0 +1,88 @@ +# translation of xorg_po_sv.po to swedish +# debconf templates for xorg-x11 package +# Swedish translation +# +# $Id: sv.po 1042 2006-01-09 07:55:08Z ender $ +# +# Copyrights: +# +# This file is distributed under the same license as the xorg-x11 package. +# Please see debian/copyright. +# +# Translators, if you are not familiar with the PO format, gettext +# documentation is worth reading, especially sections dedicated to +# this format, e.g. by running: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# +# Some information specific to po-debconf are available at +# /usr/share/doc/po-debconf/README-trans +# or http://www.debian.org/intl/l10n/po-debconf/README-trans +# +# Developers do not need to manually edit POT or PO files. +# +# Branden Robinson, 2000-2004. +# Andr Dahlqvist, 2001. +# Peter Toneby, 2002. +# Mikael Hedin, 2002. +# Daniel Nylander, 2006. +# Martin Bagge , 2008. +msgid "" +msgstr "" +"Project-Id-Version: xorg_po_sv\n" +"Report-Msgid-Bugs-To: xorg@packages.debian.org\n" +"POT-Creation-Date: 2009-06-02 20:32+0200\n" +"PO-Revision-Date: 2008-06-29 15:56+0200\n" +"Last-Translator: Martin Bagge \n" +"Language-Team: swedish \n" +"Language: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=ISO-8859-1\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Poedit-Language: Swedish\n" +"X-Poedit-Country: SWEDEN\n" +"X-Poedit-SourceCharset: iso-8859-1\n" +"X-Generator: KBabel 1.11.4\n" + +#. Type: select +#. Choices +#: ../xserver-xorg-legacy.templates:2001 +msgid "Root Only" +msgstr "Endast root" + +#. Type: select +#. Choices +#: ../xserver-xorg-legacy.templates:2001 +msgid "Console Users Only" +msgstr "Endast konsollanvndare" + +#. Type: select +#. Choices +#: ../xserver-xorg-legacy.templates:2001 +msgid "Anybody" +msgstr "Alla" + +#. Type: select +#. Description +#: ../xserver-xorg-legacy.templates:2002 +msgid "Users allowed to start the X server:" +msgstr "Anvndare som r behriga att starta X-servern:" + +#. Type: select +#. Description +#: ../xserver-xorg-legacy.templates:2002 +msgid "" +"Because the X server runs with superuser privileges, it may be unwise to " +"permit any user to start it, for security reasons. On the other hand, it is " +"even more unwise to run general-purpose X client programs as root, which is " +"what may happen if only root is permitted to start the X server. A good " +"compromise is to permit the X server to be started only by users logged in " +"to one of the virtual consoles." +msgstr "" +"D X-servern krs med superanvndarens rttigheter kan det vara otillbrligt " +"att, ur skerhetssynpunkt, lta vilken anvndare som helst starta den. " +"andra sidan r det nnu vrre att kra de flesta X-program som root, vilket " +"r det som kan hnda om endast root tillts starta X-servern. A bra " +"kompromiss r att endast tillta anvndare som r inloggade p en av de " +"virtuella konsollerna." + --- xorg-server-1.18.2.orig/debian/po/ta.po +++ xorg-server-1.18.2/debian/po/ta.po @@ -0,0 +1,70 @@ +# translation of ta.po to TAMIL +# +# Translators, if you are not familiar with the PO format, gettext +# documentation is worth reading, especially sections dedicated to +# this format, e.g. by running: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# Some information specific to po-debconf are available at +# /usr/share/doc/po-debconf/README-trans +# or http://www.debian.org/intl/l10n/po-debconf/README-trans# +# Developers do not need to manually edit POT or PO files. +# +# drtvasudevan , 2006, 2007. +# Dr.T.Vasudevan , 2007. +# Dr.T.Vasudevan , 2008. +msgid "" +msgstr "" +"Project-Id-Version: ta\n" +"Report-Msgid-Bugs-To: xorg@packages.debian.org\n" +"POT-Creation-Date: 2009-06-02 20:32+0200\n" +"PO-Revision-Date: 2007-04-06 15:48+0530\n" +"Last-Translator: Dr.T.Vasudevan \n" +"Language-Team: TAMIL \n" +"Language: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.11.4\n" + +#. Type: select +#. Choices +#: ../xserver-xorg-legacy.templates:2001 +msgid "Root Only" +msgstr "மூலம் (ரூட்) மட்டும்" + +#. Type: select +#. Choices +#: ../xserver-xorg-legacy.templates:2001 +msgid "Console Users Only" +msgstr "முனைய பயனாளர்களுக்கு மட்டும்" + +#. Type: select +#. Choices +#: ../xserver-xorg-legacy.templates:2001 +msgid "Anybody" +msgstr "எல்லாருக்கும்" + +#. Type: select +#. Description +#: ../xserver-xorg-legacy.templates:2002 +msgid "Users allowed to start the X server:" +msgstr "எக்ஸ் சேவையகத்தை துவக்க அனுமதியுள்ள பயனாளர்கள்:" + +#. Type: select +#. Description +#: ../xserver-xorg-legacy.templates:2002 +msgid "" +"Because the X server runs with superuser privileges, it may be unwise to " +"permit any user to start it, for security reasons. On the other hand, it is " +"even more unwise to run general-purpose X client programs as root, which is " +"what may happen if only root is permitted to start the X server. A good " +"compromise is to permit the X server to be started only by users logged in " +"to one of the virtual consoles." +msgstr "" +"எக்ஸ் சேவையகம் சூப்பர் பயனர் அனுமதிகளுடன் இயங்குவதால் பாதுகாப்பு கருதி எல்லா பயனர்களையும் " +"அதை இயக்க அனுமதிப்பது உசிதமில்லை. அதே சமயம் பொதுவான எக்ஸ் கிளையன் நிரல்களை ரூட்டாக " +"இயக்குவது அதை விட உசிதமில்லாதது. ரூட்டை மட்டும் எக்ஸ் சேவையகத்தை இயக்க அனுமதித்தால் " +"அப்படித்தான் நடக்கும். ஆகவே ஒரு நல்ல வழி பயனர்களால் துவக்கப் பட்ட மெய்நிகர் முனையங்களில் " +"ஒன்றில் எக்ஸ் சேவையகத்தை துவக்க அனுமதிப்பதுதான்." + --- xorg-server-1.18.2.orig/debian/po/templates.pot +++ xorg-server-1.18.2/debian/po/templates.pot @@ -0,0 +1,53 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: xorg@packages.debian.org\n" +"POT-Creation-Date: 2009-06-02 20:32+0200\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: select +#. Choices +#: ../xserver-xorg-legacy.templates:2001 +msgid "Root Only" +msgstr "" + +#. Type: select +#. Choices +#: ../xserver-xorg-legacy.templates:2001 +msgid "Console Users Only" +msgstr "" + +#. Type: select +#. Choices +#: ../xserver-xorg-legacy.templates:2001 +msgid "Anybody" +msgstr "" + +#. Type: select +#. Description +#: ../xserver-xorg-legacy.templates:2002 +msgid "Users allowed to start the X server:" +msgstr "" + +#. Type: select +#. Description +#: ../xserver-xorg-legacy.templates:2002 +msgid "" +"Because the X server runs with superuser privileges, it may be unwise to " +"permit any user to start it, for security reasons. On the other hand, it is " +"even more unwise to run general-purpose X client programs as root, which is " +"what may happen if only root is permitted to start the X server. A good " +"compromise is to permit the X server to be started only by users logged in " +"to one of the virtual consoles." +msgstr "" --- xorg-server-1.18.2.orig/debian/po/th.po +++ xorg-server-1.18.2/debian/po/th.po @@ -0,0 +1,59 @@ +# Thai translation of xserver-xorg. +# Copyright (C) 2006-2008 Software in the Public Interest, Inc. +# This file is distributed under the same license as the xserver-xorg package. +# Theppitak Karoonboonyanan , 2006-2008. +# +msgid "" +msgstr "" +"Project-Id-Version: xserver-xorg\n" +"Report-Msgid-Bugs-To: xorg@packages.debian.org\n" +"POT-Creation-Date: 2009-06-02 20:32+0200\n" +"PO-Revision-Date: 2008-06-09 12:09+0700\n" +"Last-Translator: Theppitak Karoonboonyanan \n" +"Language-Team: Thai \n" +"Language: th\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: select +#. Choices +#: ../xserver-xorg-legacy.templates:2001 +msgid "Root Only" +msgstr "root เท่านั้น" + +#. Type: select +#. Choices +#: ../xserver-xorg-legacy.templates:2001 +msgid "Console Users Only" +msgstr "ผู้ใช้คอนโซลเท่านั้น" + +#. Type: select +#. Choices +#: ../xserver-xorg-legacy.templates:2001 +msgid "Anybody" +msgstr "ใครก็ได้" + +#. Type: select +#. Description +#: ../xserver-xorg-legacy.templates:2002 +msgid "Users allowed to start the X server:" +msgstr "ผู้ใช้ที่อนุญาตให้เรียกเซิร์ฟเวอร์เอ็กซ์ขึ้นมาทำงานได้:" + +#. Type: select +#. Description +#: ../xserver-xorg-legacy.templates:2002 +msgid "" +"Because the X server runs with superuser privileges, it may be unwise to " +"permit any user to start it, for security reasons. On the other hand, it is " +"even more unwise to run general-purpose X client programs as root, which is " +"what may happen if only root is permitted to start the X server. A good " +"compromise is to permit the X server to be started only by users logged in " +"to one of the virtual consoles." +msgstr "" +"เนื่องจากเซิร์ฟเวอร์เอ็กซ์ทำงานด้วยอภิสิทธิ์ผู้ดูแลระบบ จึงอาจไม่ฉลาดนักที่จะให้ใครก็ได้เรียกใช้งาน " +"ด้วยเหตุผลเรื่องการรักษาความปลอดภัย แต่ในทางกลับกัน อาจจะไม่ฉลาดยิ่งกว่า " +"ที่จะเรียกโปรแกรมไคลเอนต์ของเอ็กซ์วินโดว์ด้วยผู้ใช้ root ซึ่งเป็นสิ่งที่อาจเกิดขึ้นถ้าอนุญาตให้ root " +"เท่านั้นที่เรียกเซิร์ฟเวอร์เอ็กซ์ได้ การประนีประนอมที่ดีที่สุด " +"คืออนุญาตให้เฉพาะผู้ใช้ที่เข้าระบบที่คอนโซลเท่านั้นเรียกเซิร์ฟเวอร์เอ็กซ์ได้" + --- xorg-server-1.18.2.orig/debian/po/tr.po +++ xorg-server-1.18.2/debian/po/tr.po @@ -0,0 +1,83 @@ +# translation of xorg-tr.po to Turkish +# debconf templates for xorg-x11 package +# Turkish translation +# +# $Id: tr.po 1061 2006-01-11 10:19:43Z ender $ +# +# Copyrights: +# +# This file is distributed under the same license as the xorg-x11 package. +# Please see debian/copyright. +# +# Translators, if you are not familiar with the PO format, gettext +# documentation is worth reading, especially sections dedicated to +# this format, e.g. by running: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# +# Some information specific to po-debconf are available at +# /usr/share/doc/po-debconf/README-trans +# or http://www.debian.org/intl/l10n/po-debconf/README-trans +# +# Developers do not need to manually edit POT or PO files. +# +# Branden Robinson, 2000-2004. +# Osman Yüksel , 2004, 2006. +# Recai Oktaş , 2004. +# Mert Dirik , 2008. +msgid "" +msgstr "" +"Project-Id-Version: xorg-x11\n" +"Report-Msgid-Bugs-To: xorg@packages.debian.org\n" +"POT-Creation-Date: 2009-06-02 20:32+0200\n" +"PO-Revision-Date: 2008-06-15 18:21+0200\n" +"Last-Translator: Mert Dirik \n" +"Language-Team: Debian L10n Turkish \n" +"Language: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.11.4\n" +"X-Poedit-Language: Turkish\n" + +#. Type: select +#. Choices +#: ../xserver-xorg-legacy.templates:2001 +msgid "Root Only" +msgstr "Sadece Root" + +#. Type: select +#. Choices +#: ../xserver-xorg-legacy.templates:2001 +msgid "Console Users Only" +msgstr "Sadece Konsol Kullanıcıları" + +#. Type: select +#. Choices +#: ../xserver-xorg-legacy.templates:2001 +msgid "Anybody" +msgstr "Herhangi Birisi" + +#. Type: select +#. Description +#: ../xserver-xorg-legacy.templates:2002 +msgid "Users allowed to start the X server:" +msgstr "X sunucuyu çalıştırabilecek kullanıcılar:" + +#. Type: select +#. Description +#: ../xserver-xorg-legacy.templates:2002 +msgid "" +"Because the X server runs with superuser privileges, it may be unwise to " +"permit any user to start it, for security reasons. On the other hand, it is " +"even more unwise to run general-purpose X client programs as root, which is " +"what may happen if only root is permitted to start the X server. A good " +"compromise is to permit the X server to be started only by users logged in " +"to one of the virtual consoles." +msgstr "" +"X sunucusu süper-kullanıcı haklarıyla çalıştırıldığından herhangi bir " +"kullanıcının sunucuyu başlatmasına izin vermek güvenlik gerekçeleriyle " +"tavsiye edilmez. Öte yandan X uygulamalarını root olarak çalıştırmak daha " +"da yanlış olacaktır. Makul bir seçim, X sunucusunu sadece sanal konsollara " +"giriş yapmış kullanıcılar tarafından kullanılacak şekilde ayarlamaktır." + --- xorg-server-1.18.2.orig/debian/po/vi.po +++ xorg-server-1.18.2/debian/po/vi.po @@ -0,0 +1,62 @@ +# Vietnamese translation for Xorg. +# Copyright © Branden Robinson, 2000-2004 +# Clytie Siddall , 2005-2008. +# +msgid "" +msgstr "" +"Project-Id-Version: xorg 1:7.3+12\n" +"Report-Msgid-Bugs-To: xorg@packages.debian.org\n" +"POT-Creation-Date: 2009-06-02 20:32+0200\n" +"PO-Revision-Date: 2008-06-09 18:47+0930\n" +"Last-Translator: Clytie Siddall \n" +"Language-Team: Vietnamese \n" +"Language: vi\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=1; plural=0;\n" +"X-Generator: LocFactoryEditor 1.7b3\n" + +#. Type: select +#. Choices +#: ../xserver-xorg-legacy.templates:2001 +msgid "Root Only" +msgstr "Chỉ người chủ" + +#. Type: select +#. Choices +#: ../xserver-xorg-legacy.templates:2001 +msgid "Console Users Only" +msgstr "Chỉ người dùng bàn giáo tiếp" + +#. Type: select +#. Choices +#: ../xserver-xorg-legacy.templates:2001 +msgid "Anybody" +msgstr "Bất kỳ ai" + +#. Type: select +#. Description +#: ../xserver-xorg-legacy.templates:2002 +msgid "Users allowed to start the X server:" +msgstr "Người dùng có quyền khởi chạy trình phục vụ X:" + +#. Type: select +#. Description +#: ../xserver-xorg-legacy.templates:2002 +msgid "" +"Because the X server runs with superuser privileges, it may be unwise to " +"permit any user to start it, for security reasons. On the other hand, it is " +"even more unwise to run general-purpose X client programs as root, which is " +"what may happen if only root is permitted to start the X server. A good " +"compromise is to permit the X server to be started only by users logged in " +"to one of the virtual consoles." +msgstr "" +"Vì trình phục vụ X chạy với quyền của người siêu dùng (superuser), có thể " +"không phải là ý kiến tốt nếu bạn cho phép bất cứ người dùng nào khởi chạy " +"nó, vì lý do bảo mật. Mặt khác, cũng là nguy hiểm khi chạy chương trình " +"khách X thường dụng dưới người chủ — kết quả nếu chỉ người chủ có quyền khởi " +"chạy trình phục vụ X. Một sự nhân nhượng hợp lý là cho phép trình phục vụ X " +"được khởi chạy chỉ bởi người dùng đã đăng nhập vào một của những bàn giao " +"tiếp ảo." + --- xorg-server-1.18.2.orig/debian/po/wo.po +++ xorg-server-1.18.2/debian/po/wo.po @@ -0,0 +1,61 @@ +# translation of xorg_po_wo.po to Wolof +# This file is distributed under the same license as the PACKAGE package. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER. +# +# Mouhamadou Mamoune Mbacke , 2006, 2008. +msgid "" +msgstr "" +"Project-Id-Version: xorg_po_wo\n" +"Report-Msgid-Bugs-To: xorg@packages.debian.org\n" +"POT-Creation-Date: 2009-06-02 20:32+0200\n" +"PO-Revision-Date: 2008-09-30 13:25+0200\n" +"Last-Translator: Mouhamadou Mamoune Mbacke \n" +"Language-Team: Wolof \n" +"Language: wo\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.11.4\n" + +#. Type: select +#. Choices +#: ../xserver-xorg-legacy.templates:2001 +msgid "Root Only" +msgstr "Root Rekk" + +#. Type: select +#. Choices +#: ../xserver-xorg-legacy.templates:2001 +msgid "Console Users Only" +msgstr "Jëfandikukat yu Konsol Rekk" + +#. Type: select +#. Choices +#: ../xserver-xorg-legacy.templates:2001 +msgid "Anybody" +msgstr "Kumu mana doon" + +#. Type: select +#. Description +#: ../xserver-xorg-legacy.templates:2002 +msgid "Users allowed to start the X server:" +msgstr "Jëfandikukat yiñu may ñu tambule serwóor X:" + +#. Type: select +#. Description +#: ../xserver-xorg-legacy.templates:2002 +msgid "" +"Because the X server runs with superuser privileges, it may be unwise to " +"permit any user to start it, for security reasons. On the other hand, it is " +"even more unwise to run general-purpose X client programs as root, which is " +"what may happen if only root is permitted to start the X server. A good " +"compromise is to permit the X server to be started only by users logged in " +"to one of the virtual consoles." +msgstr "" +"Binga xamee ne serwóor X dafay dox ak sañsañu superuser, doonul lu xellu di " +"may ñéppu ñukoy mana tambule, ngir kaaraangey sistem bi. Ba tay doonul yit " +"lu xellu rugge root ba noppi di doxal prograam kiliyaŋ yu X, ta loolu mooy " +"am bu fekkee dangaa def ne root rekk mooy mana tambule serwóor X. Jubna lool " +"nak nga def ne serwóor X kikoy mana tambule day doon ku duggee ci benn ci " +"konsol wirtuwel yi." + --- xorg-server-1.18.2.orig/debian/po/zh_CN.po +++ xorg-server-1.18.2/debian/po/zh_CN.po @@ -0,0 +1,81 @@ +# debconf templates for xorg-x11 package +# Simplified Chinese translation +# +# $Id: zh_CN.po 490 2005-08-03 09:59:07Z ender $ +# +# Copyrights: +# Branden Robinson, 2000-2004 +# Kov Chai , 2008 +# Carlos Z.F. Liu , 2005, 2006 +# Haifeng Chen , 2006 +# Ming Hua , 2005 +# +# This file is distributed under the same license as the xorg-x11 package. +# Please see debian/copyright. +# +# Translators, if you are not familiar with the PO format, gettext +# documentation is worth reading, especially sections dedicated to +# this format, e.g. by running: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# +# Some information specific to po-debconf are available at +# /usr/share/doc/po-debconf/README-trans +# or http://www.debian.org/intl/l10n/po-debconf/README-trans +# +# Developers do not need to manually edit POT or PO files. +# +msgid "" +msgstr "" +"Project-Id-Version: 6.8.2.dfsg.1-4+SVN\n" +"Report-Msgid-Bugs-To: xorg@packages.debian.org\n" +"POT-Creation-Date: 2009-06-02 20:32+0200\n" +"PO-Revision-Date: 2008-06-09 13:20+0800\n" +"Last-Translator: Kov Chai \n" +"Language-Team: Debian Chinese [GB] \n" +"Language: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=1; plural=0;\n" + +#. Type: select +#. Choices +#: ../xserver-xorg-legacy.templates:2001 +msgid "Root Only" +msgstr "仅根(root)用户" + +#. Type: select +#. Choices +#: ../xserver-xorg-legacy.templates:2001 +msgid "Console Users Only" +msgstr "仅控制台(console)用户" + +#. Type: select +#. Choices +#: ../xserver-xorg-legacy.templates:2001 +msgid "Anybody" +msgstr "任何用户" + +#. Type: select +#. Description +#: ../xserver-xorg-legacy.templates:2002 +msgid "Users allowed to start the X server:" +msgstr "允许启动 X 服务器的用户：" + +#. Type: select +#. Description +#: ../xserver-xorg-legacy.templates:2002 +msgid "" +"Because the X server runs with superuser privileges, it may be unwise to " +"permit any user to start it, for security reasons. On the other hand, it is " +"even more unwise to run general-purpose X client programs as root, which is " +"what may happen if only root is permitted to start the X server. A good " +"compromise is to permit the X server to be started only by users logged in " +"to one of the virtual consoles." +msgstr "" +"因为 X 服务器是以超级用户权限运行，所以从安全角度来说，允许任何用户启动它不是" +"一个明智的选择。在另一方面，以根(root)用户身份运行一般用途的 X 客户端程序则是" +"更加愚蠢的做法，这在仅允许根(root)用户启动 X 服务器时可能会发生。较好的解决办" +"法是允许那些能登录到虚拟控制台的用户启动 X 服务器。" + --- xorg-server-1.18.2.orig/debian/po/zh_TW.po +++ xorg-server-1.18.2/debian/po/zh_TW.po @@ -0,0 +1,74 @@ +# debconf templates for xorg-x11 package +# Traditional Chinese translation +# +# This file is distributed under the same license as the xorg-x11 package. +# Please see debian/copyright. +# +# Translators, if you are not familiar with the PO format, gettext +# documentation is worth reading, especially sections dedicated to +# this format, e.g. by running: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# +# Some information specific to po-debconf are available at +# /usr/share/doc/po-debconf/README-trans +# or http://www.debian.org/intl/l10n/po-debconf/README-trans +# +# Developers do not need to manually edit POT or PO files. +# +msgid "" +msgstr "" +"Project-Id-Version: 6.8.2.dfsg.1-4+SVN\n" +"Report-Msgid-Bugs-To: xorg@packages.debian.org\n" +"POT-Creation-Date: 2009-06-02 20:32+0200\n" +"PO-Revision-Date: 2006-09-20 22:54+0800\n" +"Last-Translator: Tetralet \n" +"Language-Team: Debian-user in Chinese [Big5] \n" +"Language: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=1; plural=0;\n" + +#. Type: select +#. Choices +#: ../xserver-xorg-legacy.templates:2001 +msgid "Root Only" +msgstr "僅限 Root" + +#. Type: select +#. Choices +#: ../xserver-xorg-legacy.templates:2001 +msgid "Console Users Only" +msgstr "僅限 Console 使用者" + +#. Type: select +#. Choices +#: ../xserver-xorg-legacy.templates:2001 +msgid "Anybody" +msgstr "無限制" + +#. Type: select +#. Description +#: ../xserver-xorg-legacy.templates:2002 +msgid "Users allowed to start the X server:" +msgstr "可以啟動 X Server 的使用者：" + +#. Type: select +#. Description +#: ../xserver-xorg-legacy.templates:2002 +msgid "" +"Because the X server runs with superuser privileges, it may be unwise to " +"permit any user to start it, for security reasons. On the other hand, it is " +"even more unwise to run general-purpose X client programs as root, which is " +"what may happen if only root is permitted to start the X server. A good " +"compromise is to permit the X server to be started only by users logged in " +"to one of the virtual consoles." +msgstr "" +"因為 X Server 是以管理者的權限在運行的，所以從安全角度而言，允許任何使用者啟" +"動它並非明智之舉。但從另一角度而言，若在此設定為只有 root 才能啟動 X Server，" +"那麼將會導致所有一般用途的 X 用戶端程式都會是以 root 身份執行，而這可是更為不" +"智的做法。折衷的方案是只允許那些能登入到虛擬主控台 (Virtual console) 的使用者" +"才能啟動 X Server。" + --- xorg-server-1.18.2.orig/debian/rules +++ xorg-server-1.18.2/debian/rules @@ -0,0 +1,417 @@ +#!/usr/bin/make -f +# debian/rules for the Debian xorg-server package. +# Copyright © 2004 Scott James Remnant +# Copyright © 2005 Daniel Stone +# Copyright © 2005 David Nusinow + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +# Set up the $(STAMP_DIR) directory, and use it for quilt' stamp: +STAMP_DIR := stampdir +QUILT_STAMPFN := $(STAMP_DIR)/patch +$(STAMP_DIR)/stampdir: + mkdir $(STAMP_DIR) + >$@ + +include /usr/share/quilt/quilt.make + +ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) + NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) + MAKEFLAGS += -j$(NUMJOBS) +endif + +DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH) +DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) +DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) +DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS) +ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE)) + confflags += --build=$(DEB_HOST_GNU_TYPE) +else + confflags += --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE) +endif + +# udeb is arch-dependent... +ifneq (, $(filter %-udeb, $(shell dh_listpackages -s))) + udeb = yes +endif + +# ...but let's support disabling it to speed up debug builds: +ifneq (,$(filter noudeb,$(DEB_BUILD_OPTIONS))) + udeb = + DH_INSTALL_OPTIONS = -Nxserver-xorg-core-udeb +endif + + +ifeq ($(DEB_HOST_ARCH_OS), linux) + selinux = --enable-xselinux + wayland = --enable-xwayland + logind = --enable-systemd-logind + systemd-daemon = --with-systemd-daemon +else + selinux = --disable-xselinux + wayland = --disable-xwayland + logind = --disable-systemd-logind + systemd-daemon = --without-systemd-daemon +endif + +ifeq ($(DEB_HOST_ARCH_OS), hurd) + dri = --disable-dri --disable-dri2 + xshmfence = --disable-xshmfence +else + dri = --enable-dri --enable-dri2 + dri += --enable-glamor + xshmfence = --enable-xshmfence +endif + +ifeq ($(DEB_HOST_ARCH_OS), linux) + dri += --enable-dri3 +else + dri += --disable-dri3 +endif + +config_backend = --disable-config-hal +ifeq ($(DEB_HOST_ARCH_OS), linux) + config_backend += --enable-config-udev +else ifeq ($(DEB_HOST_ARCH_OS), kfreebsd) + config_backend += --disable-config-udev --enable-config-devd + libs = $(shell pkg-config --libs libbsd-overlay) + cppflags = $(shell pkg-config --cflags libbsd-overlay) +else # hurd + config_backend += --disable-config-udev +endif + +# linux: libdrm needed for kms (hw/xfree86/os-support/linux/lnx_platform.c) +# even in udeb +# kfreebsd: libdrm for dri in main build +# hurd: no libdrm +ifeq ($(DEB_HOST_ARCH_OS), linux) + libdrm_main = --enable-libdrm + libdrm_udeb = --enable-libdrm +else ifeq ($(DEB_HOST_ARCH_OS), kfreebsd) + libdrm_main = --enable-libdrm + libdrm_udeb = --disable-libdrm +else # hurd + libdrm_main = --disable-libdrm + libdrm_udeb = --disable-libdrm +endif + +vars = $(shell DEB_BUILD_MAINT_OPTIONS="hardening=+pie" DEB_LDFLAGS_MAINT_APPEND="-Wl,-Bsymbolic" DEB_CPPFLAGS_MAINT_APPEND="-DPRE_RELEASE=0 $(cppflags)" dpkg-buildflags --export=configure) LIBS="$(libs)" + +ifneq (,$(filter nocheck, $(DEB_BUILD_OPTIONS))) + config_tests = --disable-unit-tests +else + config_tests = --enable-unit-tests +endif + +INSTALL=/usr/bin/install + +VENDOR = $(shell lsb_release -i -s) +SUPPORT = http://www.debian.org/support + +SOURCE_NAME := xorg-server +SOURCE_VERSION := $(shell dpkg-parsechangelog | awk -F': ' '/^Version: / {print $$2}') + +# disable-static is so we don't get libfoo.a for modules. now if only we could +# kill the .las. +confflags += \ + --disable-silent-rules \ + --disable-static \ + --without-dtrace \ + --disable-strict-compilation \ + --disable-debug \ + $(config_tests) \ + --with-int10=x86emu \ + --with-os-vendor="$(VENDOR)" \ + --with-builderstring="$(SOURCE_NAME) $(SOURCE_VERSION) ($(SUPPORT))" \ + --with-xkb-path=/usr/share/X11/xkb \ + --with-xkb-output=/var/lib/xkb \ + --with-shared-memory-dir=/dev/shm \ + --enable-mitshm \ + --enable-xres \ + --disable-xcsecurity \ + --disable-tslib \ + --enable-dbe \ + --disable-xf86bigfont \ + --enable-dpms \ + $(xshmfence) \ + $(config_backend) \ + --enable-xorg \ + --disable-linux-acpi \ + --disable-linux-apm \ + --disable-xquartz \ + --disable-xwin \ + --disable-xfake \ + --disable-xfbdev \ + --disable-install-setuid + +confflags_main = \ + --with-default-font-path="/usr/share/fonts/X11/misc,/usr/share/fonts/X11/cyrillic,/usr/share/fonts/X11/100dpi/:unscaled,/usr/share/fonts/X11/75dpi/:unscaled,/usr/share/fonts/X11/Type1,/usr/share/fonts/X11/100dpi,/usr/share/fonts/X11/75dpi,built-ins" \ + --enable-aiglx \ + --enable-composite \ + --enable-record \ + --enable-xv \ + --enable-xvmc \ + --enable-dga \ + --enable-screensaver \ + --enable-xdmcp \ + --enable-xdm-auth-1 \ + --enable-glx \ + $(dri) \ + $(libdrm_main) \ + --enable-present \ + --enable-xinerama \ + --enable-xf86vidmode \ + --enable-xace \ + $(selinux) \ + --enable-xfree86-utils \ + $(wayland) \ + $(logind) \ + $(systemd-daemon) \ + --enable-suid-wrapper \ + --enable-dmx \ + --enable-xvfb \ + --enable-xnest \ + --enable-kdrive \ + --enable-xephyr \ + --with-sha1=libgcrypt \ + --enable-xcsecurity \ + $(config_backend_main) \ + $(void) + +confflags_udeb = \ + --with-default-font-path="built-ins" \ + --disable-aiglx \ + --disable-composite \ + --disable-record \ + --disable-xv \ + --disable-xvmc \ + --enable-dga \ + --disable-screensaver \ + --disable-xdmcp \ + --disable-xdm-auth-1 \ + --disable-glx \ + --disable-dri \ + --disable-dri2 \ + $(libdrm_udeb) \ + --disable-xinerama \ + --disable-xf86vidmode \ + --disable-xace \ + --disable-xselinux \ + --disable-xfree86-utils \ + --disable-xwayland \ + --disable-systemd-logind \ + --without-systemd-daemon \ + --disable-suid-wrapper \ + --disable-dmx \ + --disable-xvfb \ + --disable-xnest \ + --disable-kdrive \ + --disable-xephyr \ + --with-sha1=libnettle \ + $(config_backend_udeb) \ + $(void) + +$(QUILT_STAMPFN): $(STAMP_DIR)/stampdir + +$(STAMP_DIR)/autoreconf: $(STAMP_DIR)/stampdir $(QUILT_STAMPFN) + dh_testdir + autoreconf -vfi + >$@ + +$(STAMP_DIR)/build-source: $(STAMP_DIR)/autoreconf + mkdir -p build-source + tar \ + --owner=0 --group=0 \ + --transform 's,^,xorg-server/,' \ + --exclude=stampdir --exclude=debian \ + --exclude=build-* --exclude=autom4te.cache \ + -cf - * | xz > build-source/xorg-server.tar.xz + >$@ + +$(STAMP_DIR)/configure-%: $(STAMP_DIR)/autoreconf + dh_testdir + mkdir -p build-$* + cd build-$* && \ + ../configure \ + --prefix=/usr \ + --libdir=\$${exec_prefix}/lib \ + --mandir=\$${prefix}/share/man \ + --infodir=\$${prefix}/share/info \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --libexecdir=\$${libdir}/xorg \ + $(confflags) \ + $(confflags_$*) \ + $(vars) + >$@ + +$(STAMP_DIR)/build-%: $(STAMP_DIR)/configure-% + dh_testdir + cd build-$* && $(MAKE) + >$@ + +$(STAMP_DIR)/tests-%: $(STAMP_DIR)/build-% + cd build-$* && $(MAKE) -j1 check VERBOSE=1 + >$@ + +build: abibumpcheck +build: $(STAMP_DIR)/build-main +build: $(STAMP_DIR)/tests-main +ifeq ($(udeb), yes) +build: $(STAMP_DIR)/build-udeb +build: $(STAMP_DIR)/tests-udeb +endif +build-arch: build +build-indep: $(STAMP_DIR)/build-source build + +clean: unpatch + dh_testdir + rm -rf $(STAMP_DIR) + rm -f config.cache config.log config.status + rm -f */config.cache */config.log */config.status + rm -f conftest* */conftest* + rm -rf autom4te.cache */autom4te.cache + rm -rf build-* + rm -f compile config.guess config.sub configure depcomp install-sh + rm -f ltmain.sh missing INSTALL aclocal.m4 ylwrap + rm -f include/do-not-use-config.h.in + rm -f m4/lt*.m4 m4/libtool.m4 + find -name Makefile.in -delete + rm -f test-driver + dh_clean + +install: build + dh_testdir + dh_testroot + dh_prep + dh_installdirs + + cd build-main && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp/main install +ifeq ($(udeb), yes) + cd build-udeb && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp/udeb install +endif + + # oh, yuck. + find debian/tmp/*/usr/lib/xorg -type f -name '*.la' | \ + xargs rm -f + + # remove modules not needed in d-i + rm -rf debian/tmp/udeb/usr/lib/xorg/modules/multimedia + rm -f debian/tmp/udeb/usr/lib/xorg/modules/libxaa.so + rm -f debian/tmp/udeb/usr/lib/xorg/modules/libexa.so + rm -f debian/tmp/udeb/usr/lib/xorg/modules/libwfb.so + rm -f debian/tmp/udeb/usr/lib/xorg/modules/libxf8_16bpp.so + + # we don't ship these from the udeb build, reduce noise from dh_install + # --list-missing + rm -rf debian/tmp/udeb/usr/include + rm -rf debian/tmp/udeb/usr/share/aclocal + rm -rf debian/tmp/udeb/usr/share/man + rm -rf debian/tmp/udeb/usr/lib/pkgconfig + + install -m 755 debian/local/xvfb-run debian/tmp/main/usr/bin + install debian/local/xvfb-run.1 debian/tmp/main/usr/share/man/man1 +ifneq ($(DEB_HOST_ARCH_OS), linux) + install -d debian/tmp/main/usr/share/X11/xorg.conf.d + install -m 644 debian/local/10-*.conf debian/tmp/main/usr/share/X11/xorg.conf.d +ifeq ($(udeb), yes) + install -d debian/tmp/udeb/usr/share/X11/xorg.conf.d + install -m 644 debian/local/10-*.conf debian/tmp/udeb/usr/share/X11/xorg.conf.d +endif +endif + +# stub to start building deb files, used by binary-indep and binary-arch +binary-initial: + dh_testdir + dh_testroot + +# stub to build deb files, used by binary-indep and binary-arch +binary-deb: + dh_lintian + dh_compress + dh_fixperms + -chown root:root $(CURDIR)/debian/xserver-xorg-legacy/usr/lib/xorg/Xorg.wrap + -chmod ug+s $(CURDIR)/debian/xserver-xorg-legacy/usr/lib/xorg/Xorg.wrap + dh_installdeb + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb + +# Only read the first line, the rest of the file is used to determine +# when the minimal version as to be bumped: +SERVERMINVER = debian/serverminver +serverminver = $(shell head -1 $(SERVERMINVER)) + +.PHONY: abibumpcheck +abibumpcheck: debian/serverminver $(QUILT_STAMPFN) + @echo Checking for the need of an ABI bump + # Build an updated version of the file: + head -1 $(SERVERMINVER) > $(SERVERMINVER).new + perl -ne 'print "$$1:$$2.$$3\n" if /^#define\s+(ABI_(?:VIDEODRV|XINPUT)_VERSION)\s+SET_ABI_VERSION\(\s*(\d+)\s*,\s*(\d+)\s*\)/' hw/xfree86/common/xf86Module.h|sort >> $(SERVERMINVER).new + # Compare both files: + @if ! cmp --quiet $(SERVERMINVER) $(SERVERMINVER).new; then \ + echo "serverminver bump required, ABI changed!";\ + echo "When bumping major or minor, always bump required xorg-server minimum";\ + echo "version too, the newly built drivers are not backwards compatible!";\ + diff -u $(SERVERMINVER) $(SERVERMINVER).new; \ + exit 1; \ + else \ + echo "ABI unchanged"; \ + rm -f $(SERVERMINVER).new; \ + fi + +# Build architecture-dependent files here. +binary-arch: build install + $(MAKE) -f debian/rules DH_OPTIONS=-s binary-initial + + dh_installdocs -s + dh_installchangelogs -s + dh_install $(DH_INSTALL_OPTIONS) -s --list-missing + $(INSTALL) -d $(CURDIR)/debian/xserver-xorg-dev/usr/share/xserver-xorg + # Extract only the major ABI version: + abi_videodrv=`PKG_CONFIG_PATH=debian/tmp/main/usr/lib/pkgconfig pkg-config --variable=abi_videodrv xorg-server|cut -d . -f 1`; \ + echo videoabi=xorg-video-abi-$$abi_videodrv > debian/xserver-xorg-core.substvars && \ + echo "xorg-video-abi-$$abi_videodrv, xserver-xorg-core (>= $(serverminver))" > debian/xserver-xorg-dev/usr/share/xserver-xorg/videodrvdep + abi_xinput=`PKG_CONFIG_PATH=debian/tmp/main/usr/lib/pkgconfig pkg-config --variable=abi_xinput xorg-server|cut -d . -f 1`; \ + echo inputabi=xorg-input-abi-$$abi_xinput >> debian/xserver-xorg-core.substvars && \ + echo "xorg-input-abi-$$abi_xinput, xserver-xorg-core (>= $(serverminver))" > debian/xserver-xorg-dev/usr/share/xserver-xorg/xinputdep + + # The udeb uses the same substvars: + cp debian/xserver-xorg-core.substvars debian/xserver-xorg-core-udeb.substvars + + # save the configure flags so that packages like vnc, tightvnc, tigervnc + # know how the package was built. + echo 'xserver_confflags = $(confflags) $(confflags_main)' \ + > debian/xserver-xorg-dev/usr/share/xserver-xorg/configure_flags.mk + + $(INSTALL) -m 755 -d debian/xserver-xorg-core/usr/share/bug/xserver-xorg-core + $(INSTALL) -m 755 debian/xserver-xorg-core.bug.script debian/xserver-xorg-core/usr/share/bug/xserver-xorg-core/script +ifeq ($(DEB_HOST_ARCH_OS), linux) + install -d debian/xserver-xorg-core/lib/udev/rules.d + install -m 644 debian/local/64-xorg-xkb.rules debian/xserver-xorg-core/lib/udev/rules.d +ifeq ($(udeb), yes) + install -d debian/xserver-xorg-core-udeb/lib/udev/rules.d + install -m 644 debian/local/64-xorg-xkb.rules debian/xserver-xorg-core-udeb/lib/udev/rules.d +endif +endif + dh_installdebconf -s + dh_installman -s + dh_link -s + dh_strip -pxserver-xorg-core --dbg-package=xserver-xorg-core-dbg + dh_strip -s -Nxserver-xorg-core -Nxserver-xorg-core-dbg + $(MAKE) -f debian/rules DH_OPTIONS=-s binary-deb + + +# Build architecture-independent files here +binary-indep: build-indep install + $(MAKE) -f debian/rules DH_OPTIONS=-i binary-initial + dh_install -i + dh_installdocs -i + dh_installchangelogs -i ChangeLog + + $(MAKE) -f debian/rules DH_OPTIONS=-i binary-deb + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install --- xorg-server-1.18.2.orig/debian/serverminver +++ xorg-server-1.18.2/debian/serverminver @@ -0,0 +1,3 @@ +2:1.17.99.902 +ABI_VIDEODRV_VERSION:20.0 +ABI_XINPUT_VERSION:22.1 --- xorg-server-1.18.2.orig/debian/upstream/signing-key.asc +++ xorg-server-1.18.2/debian/upstream/signing-key.asc @@ -0,0 +1,322 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v1 + +mQINBE9iNskBEAC4ZlqFgnzmpGeN2MOk6dvxs3UQFEHycoNVxCb+KPF3R0q4ZTt/ +Qdmjg5ut3I6D+LshJoPPIajOp3Csm8Jjue8xWNY0HVN7/d+Nhok+6FAtD+H22hUz +rGxWfUTCmga1oLwxRjptSZeAUb/EFRzvaALB9JUt///VerzDUuuMttJ6gPNMo7+f +EOknT8fmRuxTT8Fa9o8/XJ0nDVKnEZfXMq+kaxFwRl7D/PfFSxzjOVvLDZYJ5gNT +qW/2e4YJCTAQWhWAOWYpUjuG+UsYc2m1xyt8Xoe1JOz0uD9sVypQgNt6iRKGG4QZ +R43SlKvJnp5LJVemiQAJydxb3Yh3aU64GT5p/nV9lU26+iycFVwpxWEpH4z/3lUj +HaaI2dM9JvTrcjeBmsLRUC32SwI2MjFiLwKa22Kzfp02w02s2XSw9m8jYkwUzHln +UAesFIwYXivckAf6ULSaMe8x22XtvXRmHdOy/q/uTC7i2JR33VEm0zNxSZRWTsX/ +sv0BETjNE525iz9sLAGmt60vThkO6zt8ke0A6lCekLUsi3rzok21oFqSnasJNXUY +eVOAW3LisGRrPBXHUPoztyB9n7OpC2xbBep2ce/Y4zBjHZZUngBZXxXj92X2CRSo +qezlP2cZfnXk0C7exUr4aTC44IjkZYEsFwQSNiJhzIoN5blVn1QU45J4RQARAQAB +tCFLZWl0aCBQYWNrYXJkIDxrZWl0aHBAZGViaWFuLm9yZz6JAjgEEwEIACIFAlBT +0bwCGy8GCwkIBwMCBhUIAgkKCwQWAgMBAh4BAheAAAoJENsiGmkAAAARyYMP/jC3 +uOmE25bvnTKmyYPDGk7wyCgkLNlFzsAYGuesiOnyw4T1FGM+ogIX2G7gYj9J/hdT +nX/WwEU8zfVkVRxNd9kb/BbJ+zcS28saSLG/6IsYcdtuBBw/1tvB7sR5cRZgEBij +NGoa8VvIY6cJozmw6zgXQqqS4el1jKZTtdQNpmwK95EV6TvmdAjmMqj4s5n742ou +bdD+lx5HQlGC+a20vosoX9kxrCtw3utQngXcgr6k75ZB22Uc15zQIQc9P78NnXnI +GyliT3z5SEYVoThpmAkexHUr9uK/rP3bBeMTTk88wzq7CYqMoxpTz4HzM+RdKLUA +pFZ7f181s/JP7PTksHVxTJtWQx+l09VAWLg1Gj2/F8j20xjEHSkywklPL0gg4g9o +dTPVbaSHJDS7xlNAhwHw4/7vupORU16Xiwt9wgAWvJ4k4dTrcXkd+HJ6FLJlAKBl +sQU+/G5e8oxTnmksfJcpbHaWT2quW+oDe3qadsXjKDGfZn0b1ocvGUjg5mTzN95B +PlGZ6pBmZgrgv3wWeFgjXScVnhQQeKHCF+G76c5c52H8jjOWFAv+RkpXD/J5N3I9 +QWR7DVVfvwPqLgwZ+SaAXPR4hQ0b3kanyaNHJgDNZWAG7hHA3EbnaVyVyyRmR+1M +2jXuzKVlbJp8/+ts3hrBeZ17bgu+xw6FydKN+ODJtCFLZWl0aCBQYWNrYXJkIDxr +ZWl0aHBAa2VpdGhwLmNvbT6JAjsEEwEIACUCGy8GCwkIBwMCBhUIAgkKCwQWAgMB +Ah4BAheABQJQU9N6AhkBAAoJENsiGmkAAAARpFsQALbybdFI85DE/NDfzNxGroru +pO96ecH7bLK1o4VjjIsBbybvlcF89FVHI4o+5w9SQRF+a+4Da9YWVXsrFAeRRVMV +iDRgW/GdXHYV+vRSVHzFeJGpsGV/IYApctwcS8y/aWzEJXjp5ARGK7lpBG4zZVOk +jjphTPFHF7Y8W2Yu5HoEjqG1t4PzcNN7sOrt6Nxkv5DWKjnzN+fB63SgfBsIk7NG +/ufWncrxa/eQl6zKu42LHlDnDgLm9HI9y/iPBwEStfoIM9tNyDuvtsxU6RXIBeuB +JgGMjkht6f97aK9Zv8vOXlk3mhaF4SbIXKHvyQDNJ4ZoZmzlZSsWBTLH/+eYNI6n +jUQHK5X4bscmUobFDbU2JNqaKA8gVtLAmE/nPOIuSk0Y7je5nVx4+HsQ+FC9ntFe +1aYKmn1S04QSS/bvmH52qSx7U+nnLnwGvtDhomQ5Q63ZIXwLsT+PBUb7XkECpJNI +B8lXWmCLxABrUTuEsUa1k6yGnYWCAWI/LX5MW1VZOg51rgKWNNsSQ2O1QI+7VG1S +85K3/HU70jUEDdWvr6ZCkr8VORLXehkbP0Mr4iOQCHUgljpul9wTINQw6FIO57H4 +85vwXiP4NdC5HKHy/BoUzcbg6HzX6ji+UlatiqOgxbrdWhpS3pQgzVUcwV90UWpe +o74gEp0cDIja3cCrDJDJtCZLZWl0aCBQYWNrYXJkIDxrZWl0aHBAZnJlZWRlc2t0 +b3Aub3JnPokCOAQTAQgAIgUCUFPRlgIbLwYLCQgHAwIGFQgCCQoLBBYCAwECHgEC +F4AACgkQ2yIaaQAAABHGNQ/9FoQfqNvPsyj/CII5y7Fyi6cSPDeTVBdxkB++2gJ9 +kDKsjL5ylr0MhNly37uu38cVGkgiEf5WJEbJqQGuLlvU6dbo75RIGUsDi+FLee7X +uwtEwY+WuMQTbxGyqEFbbOL3EuylqqD+7+Mh3iEMdleJfJhKUGScyDz4VwAvIzgS +LwKk1tyOl5io9f3QA0tKnohScV0X6ruVnS5/X7FG3boFxuN9d1W10uG1LOHDQMsC +a1rA2euBbYsDATM0DWCR4TOCz7RcBn6BnRV5U/UNmMgkgX6ZKrJRLk1oIZZYnBZF +5J2f+g3BhQ0t5lOkvFO1H2tWK38Ch1DzieKFjLodB4vW1XMV0C3Bjx3jGMYBMclR +jseyDvgt9G1QLA+O4/gGCZW/+AHorSDKJwJeR/5YpbfHPIQi/6W21gaqbJwAdoHO +xynzprPCUAPiTXJqv0tOUs5trteoj83+7Jn9hGFiFkr6uluILPeFurKvxuP63EaS +RNrYKjk3qAQq5EdJm9W+o2vBw5naN8M9I65I5uaXs3sz+MY/+fTJGHEsG3bQokTa +XppoE7rG+7GJwMX+s88ALU8lz4FzY3ZTWXxqnRFbDSzpxPq7eOMx7ovHjTXbyEE8 +v4STT6wWHllaYUMeR/0BqYDGoH03vm4vMJoBNdFPeM92skcdbZFITl9MaLriHlvk +qKO0J0tlaXRoIFBhY2thcmQgPGtlaXRoLnBhY2thcmRAaW50ZWwuY29tPokCOAQT +AQgAIgIbLwYLCQgHAwIGFQgCCQoLBBYCAwECHgECF4AFAlBT03oACgkQ2yIaaQAA +ABGQshAAoi3ek8jWeD97QIOyr4JfCCL5ajZPxfCtjp0j2tWNy0QHZCesCXIZ0eOF +7cCGsBrAdCExlqlRWvjB7FiCTCg/0vS1MLjhT6GuxiyfeF/qfTdxswcXKs/BafBP +XdTfTdVVUX7IsECxihWlL8XO56T24mEUlcERDNcmB0rdsCLUy5+hUw2w5tTkI4bX +NNHcg727NhqbfMRKNbk5pdsmCJBwwPkKIJNKCy4LfO1UhvTYQNPAkiBY/1HXoiR3 +ZF+n5sYHkH8sR7AGoUJxiLINsCAcs2D6kf4zL2MXRbCrgE08/0ABNriqe7My6Ocn +hZWq76POx8ETyEZj1ZVIWpbrEw/TwDVlI0oI/1WMqclVC9TasmW9vtXG+FLzEMM/ +5cXHpFS4Ffr2twWADaGKA+kzpyvn3LFvMzxLtZXV0U7lzGvanHfEvJ7Wp/r3ZZM2 +IzhNn2yM2wmm6yDm0rt8ilBIkzGbIwWC+GYXgUE9jatkIDBS3rzDqrUOQbfNOutZ +ARdVeUJTj0xpLj1WbTrA16AvTzXk7UraE2JmveCyLUk5LY2jG6CZM9Ez2D4uIcpM +mSfXlPqRv3eKYBdTXRINmaIUAFXNxuNa7EaCiZJ7uyo8Kbo1KBOkyqNuCWj4Z/66 +UrYA/aV1zxe3nkDdiRq9GYH4bVyjJl/H8goLblcIkgeLhDczwS3R1NnU1wEQAAEB +AAAAAAAAAAAAAAAA/9j/4AAQSkZJRgABAQEASABIAAD/2wBDAAYEBQYFBAYGBQYH +BwYIChAKCgkJChQODwwQFxQYGBcUFhYaHSUfGhsjHBYWICwgIyYnKSopGR8tMC0o +MCUoKSj/2wBDAQcHBwoIChMKChMoGhYaKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgo +KCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCj/wAARCADgAJYDASIAAhEBAxEB/8QA +HAAAAQUBAQEAAAAAAAAAAAAABQACAwQGBwEI/8QANRAAAQQBBAAFAgQGAgIDAAAA +AQACAxEEBRIhMRMiQVFhBnEUMoGRByNCUqGxFcHR4TND8f/EABkBAAIDAQAAAAAA +AAAAAAAAAAECAAMEBf/EACIRAAICAwEAAgMBAQAAAAAAAAABAhEDEiExBEETIlEy +Yf/aAAwDAQACEQMRAD8A+eMPEja3cDud7q3bg3hxA+ENjkdE/wAh4+VdikEgHNKq +SdmiLRM1zuye0r3hwNpg/KCD0pI2l916lIPYMzMFpJewfsqTIHtINkc8gLUeDYDa +BJ9lPi6WZHElpr7VasUq9K3BN8M7DFI+6a4Ec/dSmCRoJp4IPC1sGmO4DABXHSv/ +APDPc3kc/ZTYdQaMjj5shb4WUXEA+V47arrcmSxucRzw6+HIhmaNI0WI91eyFnGL +CQbZR5a8f6VUoRZdHJKPGXY8p7R5Sa+6smfxGdkOBQokxO2u8zPQ+qnY6nAuHHpQ +WbJiRpjOwnHkFzfCyCXA+riqksB8R/hvto65XglobSSD71StY0TgHPYS410Vnr8f +UXL9ge2AxuL2k2ikAmYwAyO74IKfiujmIbIQTV/IKhmmjxXECqPSSWRzetdJVEeW +S8B/iG+rKr083TzY/ZP/ABDJHiwOTRT4Ggizz7BP2C6KRHKezyuc5zR0kopzbzZ2 +v9QkrVBNWHZozAaHE2aPzyvLc1x7Xt0TxaimlDbs89LpnHbVFqGYk+Y99Uj+lYT5 +Ghxbwer4QT6fx3ZWQHPFsZyQV0fScIcGqA/KEsnRZjjfSrhaW0UXDzjnjpHsXTLa +LoDrgIhjY7Qbr4RbEx+twr1VZbQMw9LayiBRV0YTB6ItFAD6KYQg38fCg6Rn5NNZ +ZNX8INqOiQzN5YAR0QtyYBzwqs+P2Nt/KgGjlGfo/gk8bggOSx+E4+UmI+nsus6j +gB4JDeVj9X0xsjXNLRZBpD3jF7HqMljZDDdmz2Cr8eQWt8p9OVnM2OXT8nZIDXoT +0ienzeK0Oa674pV5cKqy7Dm2dP0vusS72ki/UKfJImiO4N3VVHj/ACrcGMyXHFNo +jilTzYXRMO4mv7VgU4uSX2aq4C4wN4YODfCLQO8MEm9w4CpwwCRwIB3ehVvwnMAM +oJo1dK3LJPjBGLRXkY6XkmPv1CS9mYS/m0kU+BoxmQ/aTVqvtLvT16VtkLprLBYH +Nq7p2nPnlhJadrjyf1XV8OEk5M1f0Rp1Yhkc024Lf6dj7Y22OaVHQsVkGMxjQBwA +VoYWgN/wqZdNkeLg6KKwOObRTHiscg2VXhbZFBFIWkVQCFliHxxfHCnjg475TmNp +vJU8bWgXzZ9lCMrGNzXUK5VfIiPwipbuBIB+FTyG0LN+3KjIBMiDu0A1PD3AnatV +LXNg2hWYwO3AcIBa4cu+qdJGRjOJHmAJBCx2kSHFmeyYcejvZdd1TH3B3HNLm+t6 +c2PJLmgVZ3AJlUlqyiVxlsg1pWS17SDRs8Ef1K5qEBewAgjj9lhMLUZMKYsBtl9e +y1+LnNy8Uujfvrkn1H/lcr5Px5Y57x8N2LNGaKM8fgXsJIvs+iIafI18dOG6+Sqz +sd0ryXeXcLBCVmBhB4d8eqE0pxr7LlzpNlthD/LyElF45cTxX60kjFOKoIA0aCJ2 +I9rnbZHGhfoi+lzMdkMw8dpLGnlyxzZXy5BDSQxx9ult/pSNsLBLtPJoH3XakcOB +0HDYGRtr0CvwPDnCzwSqWI64wOORyrEXGQylUzVEOYrTdi+UTiBH+1Tw2+QV3SIx +N59kpYTws6sq0xrWmgLUEbSRyVNVVZ5UI+j3NAIIA/RRzsDmGmq3FTgBVFJ7WuBH +RpMRGczWbbIaUKm2vceq/wBLR50Ng10gkmPtebFX2kYzQDzYA4O9/RYXWYTE6R4a +CWHdXwuj5UVAk30sZrbKdI6uCKNoxfSnIuHJs5rPxLzH+UmwPZLDzJ8R+6J7vZLV +mGPKe5grm1Vjka888H1VzVrplUqfDa6bqcORA0WWv/qBRMwtma2QPa4erR6Bc7je +6N4cw7XWtDpWrE+Vx2uPRPS52b4jT2xnQw/I2/WQWzIWiSxe3ocJKeGVkzaeOe0l +n3ceM1GE02IPnBcQGe63Ohyglm1vlY7hYmNxY0Brfi1p/phzjOxrtwPa7UvDjYzp +OIAI7PPHoiMQ/mRm+UOw7MYHpXCvQmgHONEC1Uaoo0WGRwOuETY+McFwv7rEza9D +CPDEgMh491JiZeblmsZjtx5BeKQDsjoUBY6hYP3KsBkfbquvdc/fh/UA8zpWxi/6 +TaK6W/UITWXKXiu6pEGzs1uxt2BaZK4BvBFqnj5DtgJ7P+FDPI4l3JKg6JJHBxNu ++6FZuRjRPIdKwEelr3Oe4x7YybKzc/02/Jl3y5Ja098pRW39F/IzcWS2tlYXH0BW +Q12MHxQORRIRHN+mcbEbvxcmQTD1c7/2svk5WXBlCHN2ua7hrwUUVtvw55qjS58n +HmY4hApLD76NrV5+I7/kcpmwkGyPj5Qz8JFK000X6EK7ZJdM+jb4DI5b4caKma6q +o0ocvFfju5oju1DHIWmijx+C24+h/B1V0LS2XcR6EdpISx4SVMsUG7aNEfkTSo3O +rfR2ZpeWI2uZNjEkb/6gPkKvgzDF1cCZoiaKbbbcAup6rp02RhzugO7zFoH9vKwm +Dgvx9Qd47CCXc2O06d+glFKXDY6W9ksFscHD3BUucJXMMMXbuLCqQaTC9pkg8THl +r/5ITt/ceq806PXMTInklkjzscMdsFbXNcOrVd9Le0SYmPj6bJtlY6bId1Ys/wDp +X59ckxYWmB0eORe4kbkInfkOi3htTPFuPpZ/6S0zT5akdO7xi/jkdIxabpkknXCx +L9R52QAGahOGnhp8GgT60rOHrupR8STxzezXsq/sQvYsPIihxxJJJLj47t0cTvyt +s8pTw/j9SdOaiceC1jeCpNJeAxbP/SNfomrxZrKkb4cja3Ncf9KfVMzGgiLjKwNP +Fk8LF5xx49UwW5LHhriWNcDTevX4Wry4YJcAsMbCK4BA7SfRaA8zWPAYJI2lxedr +B/2gepZOVmh5/EuuNu5zXzeHf2HZTcGXGy9Vmw3slDsZnFniyfRFJ4oCwiSMiQdO +74Tw1XpTOMpeMzGU0YmLFlZMA8OT+sPLq+6o5WIzKY6aFx2NAePMtLnYjZ4dji6R +tcNA6Qj8AdPxZGi2tcOj6ISavgaaXQA6IQznMkcwtmhexu8d0P8AayuBE5rbce/l +anWsrxdOw8V/LI97uuRfys5iNa2OyWqSlwCj0c+DxW7XAEIJqGmuiO5nLfhaHdxw +R7JslOFOopYzaDOCkZAOLCf9eySM5mnxyPLo+LKS0KSZleOS4fTen4Lqmd2GvcK/ +VZL6wwX4mRjZBcCJHGwOKHotpiZbYnZTSfL4hduHVE/5WZ+u5BkQCRjtwa5vXsqj +XP8ApBgva2Ln2CvwSMfbXNtjvL+iB4EodA0e4HKL41EjnsJWh0SNgi3uYG+QcBSn +Eha7y7m/ZTsaDTgCa7RGCBszbb38KUMkDW42O5tPke4eylix4m8RMAb/AJKJDADX +hzxQSklx8cHa0Egd2pQ1JAPL0x2TmwZBADIegT2UXA/k0CSQFVly3yABrAG3xQV7 +FbbDVX62FGFRMnLhNdqpnj8srG7aHqEVaJCxpczcKUeqxPx8pk7O754RfBMeRjtc +W2HD05UAooGMjslzGNH3CF/UGKH47yALpaqRjI++fXpCdTb4sTmtaSK9UUgSXDif +1ATFDk1dDgGkCwslgaGyj7Faz65kihxZYS0eI99NI9AFh49rGDslPSaMbk1LgbBj +obf3SIZ2BQr3Qxk9NptppmfaT8Y/5VQS8u4+aikhpcUkyiRzOufw8+o26xo7MTIe +fx+P5TZ/OFrvqeJmRocgaypWsv70vnnTs+bRNWZkYrtsrDdej/j7LrmifWumavgS +fj5248pbtMcjq9PT4TSV9BGeypjNNePw4I9OEfxJP5YJ/wDxZfSHtcwhhDm2QPml +oYGu8IlnN+irZZFmhwSQR3yjuM2Lg0P0NLN4pcAAQiQySGGiVLLk1Rb1HIqwHEgf +KrtwzkYby78xHCqNk8SUukNNHoiLMsPYAzgAILodkCGSjHIZMxwkb2AOES0rUMR5 +ka9oJI4vhNkIkBsWfVUcjCbK8u5a7+9vFo0Daz36jy4XbIcdu6Rx6HNKxpkckGGw +O/N3QQhkBxXEjlx7JPKmGpmANDjz6BRol11miMttomzXsg+ryARv+ykwnSZtuB2i +lR1hhbG7cSSlTA5cOLfxGeW5bD6EnhY/xfZh/dbL+JTSMqADskrF7ZG/0Eq+Pisw +T/0yRsrweGL0ySE3TR+qiuQHhiR8XrwympC2yRzpb7ASUNzf2pKUSwt9Q44jle9t +Dm+EJhmLHAEXf+FrNWx25QftsOtZR8Do5SHggBJjdqhsiqVnSvpbIqNjS7ggELf6 +a5rgCe1zD6efePA8f2roGjZLAWgnkpJLpogzUsi20QOFciAI8zfuq+NI18Y5FKwX +FjTRq1WxrKU0DpJZDG8No8D0Q+WXNxJCJI3OF/mai7Xhji339U5gDgQ/sdKJtFkQ +ZBrO7h0LweuipHayG2HwuvvootGyON24saD30EsqZkhNsBr2Cf0baK+jLZeoTyuJ +jgdbvjpe6biunmL8sbnDpvoEZymNI8oDSe6CqNuIk2BaVv6I2mFsOoIXhtDjhCdQ +t556FqVmVuidyeOAg2v6hHhafNK9wbtaT36oJFEpUcq/iFlNn10RtIIYOa91nXgG +v+1FlZT83UJsh/b3EqS7IPYWiqKIuzw0TwF67zELwjnhNBoHnlGg39DzXskvAOTw +kiSzXS7It57FmkHyRFM51tFjhFMokzBvlFlB3XE97XDkc/dTBjWuzKM+RqWqND9P +R1hRV0CWlaXGeYi1w7B90B+jv5+FKAOGuWohiB7ApVz4zRHxBvSs/e0AlHhJvZYL +bHSxMe6CTc29rjyFo8LLGxvIvvlVyQ6Zeeey49J0Mx4t3PaqzP3kkVRPSTCL54NJ +aHjLoSGRuHJH2TXNJ6dQI5UMbA5ocSA8n9lfi28Cwb7TU6LNgRNK+MkHn9EOzcgl +t8rQ57IgzjseyxutztYTzV+iFdFlPhaxckbeXGu1zb+JmveNJ+Bhf8vr/SOazq7d +N06RwP8ANo0FyXIlfkZD5JXbnudZKthH7MuSd8H445Br/wBK2T2U2GMBl+6lDQbA +TtkimkMuknAHpeub+6btP6/dQj/guvhJOdfokiSjSzu8TJPmvaeFX1DHfK1j4Ruk +JqlYoNeTXN+6UUmyYA1X3WlQ1jqjC57T2Df0DjvgjljlBBJv7rath8/YKAfThDpN +zXEn1H/hbOOBrgCDzSwz4+nSg04qgVPCaIpQRSOgdRJrpaE4wI65KH5uBYJA8yFg +aPGZN9kFq9/FOaDVGukNdHLC6qLrHKZ4rxwevshQUwu3UQ38/STtapp27gP8oOJi +eXBeGYi6dR+yNAsuZmtvIO0O6WZzsh75HSSnzE8Ac0rmSZJHEBVhh8ufIRfdI0K2 +2Yj6vlk8Jm7cd5/ZZrFxnzfl/S1staiZmmdrhYYaH3QWBjYjQYGkd2r9JVwz7x26 +DAXwO2yA0FPG8dojPGydha9rb+DyhORjSY5JbbmIOMvtDqav9WPlkpxCZv55I/RR +2JeSaJTpYnR+t3yhQW2+npLvcJKHlvYSRFs2koBe8j3Ub28cqaQFrnHg8/uoyQbD +uPZbDDZc0bUX4eQ145o8ivRdW0HNg1CBr4nDrkHsLjFbTYq0U0LWJtNy2yQvo+x6 +Kpy4lNc9NGLNpx+HbWRbqJSkxmkFDPp/6gw9VY1viNjyBW6Nxok/C0DWXyDuBFig +sLi48ZvjJS6gNPgh4uuVTdgRk3t5+y0zowe6UEkAq+FAsAf8TG70Fpn/ABELLujw +jhaWXRVaW3X6ogM/PjMaaY0WhOqDwYXf3VwtRNGGgn1WZ1anSnf+VvJ/RFeiy4jE +ZEW1+QCKc4WhWTECPEA5rlFnTePkTuIqyaHwqFeZzD10FuiuI5zlcmUQN1OHf2U1 +xllSCr+LUfMb69ipQGuB6tNQLBuVpgsuhNKH8NLtpxaSOuUW5jPHmavZIw8bm1fd +JHjTHWRrgBfG5ppzaSRQx7jy02kk/H/0tWVfYTxshrvK93IPBKfI0g+YX7KpJFtc +Sw8WnRZTo6bIA4D0ctFsy1/CQ2DVhwUbw67BrhWgGSxmSO+Oxf5V4IyOQ2/hQF0N +iyZoq2uO4dEcUulfSn1qWMih1ZxLTVTVz+q5uISewB8K0wbPypZ41NdGhlcOo+hc +XIiyIRJFI2WNw4c02CnSAHgf6XDdK1jP0lwdg5D4wf8A6zy0/p0tv9O/xCgyiY9X +DYHAcSt/K5ZJ4JR8N2P5MZcfDZSRlx4AUBh5O6yptP1DC1Bu7CyIZvXyFWXNa323 +dqpqi+0+oCZ8RZEeK46XP/qScY++z5ncNC6DrmW3GA8UENNkuA4C49rOoN1HUpng +kMaaarcMNmZ889VSKIpzw4HkcFV5C05BAJLe1JM4RNc57trQLPyUI/5Bs0j244N+ +rulsboxJNk+RsdJbDx68KPlp4TmjyhKh2gEfe7teRu2O2kgBNH+elKGhza9UQMlL +Gnkn9klC0vaD7JKWCh9EONn1qk4xhw5rlJzvMSffuk9rq+/omBZ5jbsaS2Cwe2/C +mOW2PlsDueyeUwH59KTqHYq1KJ6M/GMJoRSNv2UoyWDzBshPtSjdE03Y5KcGBtjk +j7KE4eyzPlFEVGe2jsqN8jRCWMh8xPEgKfsLa2Hn/C86/M2/shREx2lapnaVmx5G +LI5kjT+hHz7rqegfX+LqLBFntbjzkUHD8p/VcnaLJFAjtPfGCLI57FJJY1JdLcea +UDp38QNWbFpzMaJwMk1En2C5jFt3H55tSPyJp2N8aR8ha2huVLPlMUDy38xFEqQj +ogTl+SQM1zM8V/gRn+W3s+6i0pt7nfPCoOs2T2jGmRDwGk1buVXH9pWWP9Yl2htb +7lNLeeSp3M4HHXSQaLsq+iiyHZzYNqWMcX0nhtEUvXd16qURs92js0kldjsgJKAP +/9mJAjgEEwEIACIFAlBT0lYCGy8GCwkIBwMCBhUIAgkKCwQWAgMBAh4BAheAAAoJ +ENsiGmkAAAARySEQAKsOl4Si5Ud2dev330FSp7n0Xoe6ac6c2s7mdsfVzRabddlp ++8sbo0r5nM4IgyAcTbizyA1u6a18ESKBWszbwUAe/sm2EDL7zwsDm8HUZLEHbUX6 +tgd/bPjkAnFaskJhYKDFnYsW+0D8toz4/aquuQN98a7RUnbbWjwe8c9miEuctn3/ +I8cBCbgMtA9T8HDzP38dlb5tGMAdkCWcAqBn6fxMVy7NXFsgKerd6dnkVlZbJcRo +TRFRCn1cbWW3sTpKFtN3GB4x8/0dbaaG/UbaAxZhVEcfdy++PLud2qXf1Hyi1/kD +kIMctegHljRJPou5BHOSPdDlgtjcOSJxR9VP6oIQrGiNkZY/gMTJHurO/etEznfq +87nshweR3P+WP8I/S5QnE+w4aSL2sQpgYt1/ErVHlir/7ZpAd15uWcEqTHA1Q3Ad +jGCB9Ny1PmCIzStdj2NjMd98cKLVj3xxUnUG6V4Mjc0OIMErseRDMv0FndcHcyZZ +u/84qqIujhQCmnoH3Mdhi80+Hn7b5Xuw6G4Skbk9Ko5wVXyAfTmATirfe64odZEb +tqgJX2dkQBHzpMqrL8Tr5S6UY/ofBxqVcZZvP6UlnuuzJ67nfllIZEhcvlUOT8rb +i4PUo/XWKqb43SFis50slwzKd9xEnV7j0o6wxkhkT3KR7GXzz7TeQuAygluruQIN +BFBT04gBEACyRYUzdRvlCkr2WrB7kYIQr9xUwUboTJhHnqtUgzgny2rfHThmc/bl +GpuiRXrLtnarjbrxBnsfyYnBHCrX1oRU1pfI8eGXLkrLF698PzuGvnuVn11ZMlFo +gHpx+pw3aTtExpDhzWDsxaYCPNMgkEMGrkZQGEQ6XzFkvgcMfVTT1uQj1CGj419s +rASZ+m0BXG3S7nFL9mVcKSABnSAPVptFxZUr9UPnQ7X17LLkVNmCpstP1Gri4LOh +V53AT61sWPUtdUj4jKm1hYBKF5EmJrf6IF50qlUt5ehreMJ7TvHDKpu43t/8zOtQ +jElEJL5fEBbpGJX9YVYH+pYxDWJsNVmSkLNYosrJTRDruPUKlYm/naPDqFvR035o +tkTPrFiVkkqvDUvLgZl4it+DTRir9cuBfTwb8NYa2jJFesrXm2xYbrzmKaVg4AXc +u43kQg/Rk1lW3OQYt0/a5AdfMFYGk+Qa1lIvbibONYkASgeSxkDHQ6CfK5vxjp1j +eweEphoT193SCCx3nK7ip6WhX9dzPs0JKmCa1tMkTnYxe/xPRRsezd93S4E2vTOP +bN2uKPEUbctZFX1apRwWDoxRFuNDRSjqikzyEsVEiLRJ0jp99vcX3dpVVGqeZK68 +QYGFF/UK8nXn1S2QZxB/i9YksZNx6Px95ZIFL2SgmnaosqScm9qUewARAQABiQIf +BBgBCAAJBQJQU9OIAhsMAAoJENsiGmkAAAAR2uAP/RQilUyBaiFUvOjV0t6pzLgZ +8xuWLqK+51SHRfH92xxV53hOcPchFbl4aM5t6uM7INo8tV6fBDSQGxbpL7/HtZzS +JyHVLX24L3dOs0ryseZSI0uKlWHfODTF/Wu0IUYe0sSe4QtkT2bnJHGfa02O1yfU +gX+jMTAyrt/hcbExJZ0ykeXPbLHtp7ms+eRjnHTY3DiZMNPqK4xPlWEc+DvrKyq3 +yKnH2wKgrMUL+dKr9lLv7/Es24sxsnAhwRwJUsP5WYmD0Be/r8AmSibI7FkO0OI3 +DjUUKDE35Omm+mwEgXuaoK+5hStM213XNzSrEEt5wAw21Adppin+38VVLYALNosF +tCdDIh6WHlmA2iSFhYH8oUnrESxsF2Nni60MMfWvpKAWLOhnTMSCjwxFUjnqltwD +hgHktnxi6GUJT+mhits0OqKP/zJtiUM15bLF2mlWVxiCj9R/o+h4/pO2WcImNKAU +OgMQfsLPOH1oasEEzRHlxCPXiaD8KocyFxdRxuz7CZqA9XfC8lGFyld43lKIOSzJ +j+9rmqBB8XuDu+eX4WbObGSbGUCv9LfBeKbjfXyg94stLxxsZvPysv2gOR7dclzt +iF4iAeqQsCgsHVxWnPP5TO8tysNWZi818nu7irxldNL6VoionLQ4YDtm5QS/Eh7b +gZp+x8Yi4yc+nrIcmbB1 +=SX54 +-----END PGP PUBLIC KEY BLOCK----- +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v1 + +mQINBEoIZDEBEAD5MrFJC9Hi4mXZ97HlFotHIrkMURIFkvl17XEuJ8Jh3hlzJD/q +K1ByzQGHozzVcfbg4lP4lzqfdps6WCbusqtVYcTF61jjFhYo398lBgpKHUBbsEPC +SfYp5WkoICa824zcmWO9qYizGqkpd1C6gdQtK6ZaGjLx3xt08M9oVZqj+E2SsPHz +WaYLugCwCKhlbVTaP28OGy7tBRY6hcLtiZc2CNpr0YjZ53B7Ubs0BVYQutYxho7l +u0ChE9zNesy4KaIOumXZjTUrMCLpxF/01M1tfzXArMMLAqx3F1M6QIuy18F1zJ2W +LlkRwJi47NTiJ6jwLUYKBTN9T3nmy0oNAvv5v4B8nWgZAOjjDC2pFoVJa1O3K8Ab +vSRA3L/N+80MxM9VK5bw451pDqNhxn5q0yeS+RBagmOb2PZSMIuw9adooMurAfDJ +hsxqp3KaCTdYX5p+mCczNkoKMRUQiVUi250426o69IAmtpVi1q+MV0qWLl2tSvx4 +I4iph9XAhho7ycb4jziWf46ZljnhoGn54EU5GEqH0huakYcXK7XoNxU0XzS/eQuD +qVy2NH2C945h3LAtMo4zr49VZXjNnFn++zZqCUHASDX6Y3h8uMpzIY6Eslu2S85W +gpb+V4M5RvKPeuEJTuzxJOOW/B3nyoWFQfN6SXWGVW618dLEmFmQnyLBwwARAQAB +tCxKdWxpZW4gQ3Jpc3RhdSA8anVsaWVuLmNyaXN0YXVAZW5zLWx5b24ub3JnPokC +PAQTAQgAJgIbAwIeAQIXgAYLCQgHAwIGFQoJCAsCBRYCAwEABQJK4Fj7AhkBAAoJ +EDEBgAUJBeQMu/wP/jmGDVXrXZXtNJ7Ov94iDBwcEBlLoNHUyH4FWQG05eW3CqT0 +w9ZOvZEQ/kKlSjpdZzPiYMjgunl7D78aoL4Il2qKyirlT+trt+v79rl5VkD2xJx/ +gi7iN34VJQ50iGBxyxPicUjkXUO17kpJ2/uw/7/pNG0buBDbLGPwYPQFyV3UVOv7 +R8chvmAqtujck1961gRffKPihiv6sj4zjGs8ukmLCO3EgLzpz3shBfJyq6GNMNmy +aVX7hAcwhErKCrPeGVlzFpCLbtqIxpq6uPfxrDI20LhQkQ9NPD/4t1qkvenRCY77 +wqoiUBSYlpsKND2I2mywOE2FVMj34aBKvn96YsZWlj3Rkc++JvzdZQy09WQIUXt5 +fqEoQI6J+3l4gaQaFHCt0EWZhSCN/uNDP4sEXmX+MQP6sybU7UU18cEDFy/Op0z0 +2+2Csf3ewVPPcP8Dw6JZJjbiFH6+rQmHgBdz2kValcWwoEgD2oESyibGxI08XrJL +nonfZSDdhrfJ31q7F+qUnX+ukxVGo8Z+VdlZCyqacNrFbKPWSeM82vXucvgxeWIK +kjMiJsLVtitK117u3p5FkStKkzwqjmg6DM7NTyNExA/AyPmeFeGZU1iWwcIsT/UI +Sn7A8IWQk7lPJ5aJs7c+FCTl169FOkyhK4Xu8dWcXdyXg8ReeWt5qsynnukRtCRK +dWxpZW4gQ3Jpc3RhdSA8amNyaXN0YXVAZGViaWFuLm9yZz6JAjYEEwEIACAFAkos +Iv4CGwMGCwkIBwMCBBUCCAMEFgIDAQIeAQIXgAAKCRAxAYAFCQXkDIxHEACa0xs8 +cH59Q8MpHuWu+c2CVksTDw0O4t88inhtc9Ut66eN8uSEf/DZM/VgCyj5kYbGHIdA +cSAQHOWXa9GLeI/ZJ+LuQ53I4xw5xT5fAf8vIPbYJ+4fsHouTVY4pp59HQPs87d3 +VdGcOcPsTw3p5mypZfNX8tq6DD9i3pZpK7t2wzvSgQkJs0f4IliUsurxG2aiDNwS +Og1pUBQWdcuriLZRV7aBWJaLO7lCWEpxMiTFRODsMzjI28kRxU7MLlSwL0PlhhJc +XMTxQJVRJnLMW92btoRL5LBn8FHCFCj3yFj1GX1yZVgmzCUOrHu4xpRBR/cRtxgQ +Znh/aG9EttjQsB5byvSuzC2vZ9O+/l6mLi9zmhtIxxRGRn+ATYpXr/kddff9k8AH +WPE3N/jrXnIEC9+2HKolyRdK6mxfwOrq5Je3C+C+0vFtbZFxpP76LI7O9p+t4T77 +KuufxDNMix9LvPxQpAuUJkbWwiIO8T4ygYMzlIDZswi5Tyl7BMQ4IheJtKEyzuFp +DN6FvLpwh5gj6RM+i/IvCIExStcW+ySUZcuMItIELTsQlSycatO0OQi+3rXbBTsC +QidP/uL6cmxxTvBAs/XPK7XYdhl7P/9LvBSSNb1ZhHN2D3qfDXTwYWt8sZe3G7cj +2IrPvxBROvaoJCF1OriG4cXUTbsCWwe28rAbUbkCDQRKCGXUEAgAvfSSNQmYedmB +2KL6LqTHmt98Vs2fC6cJQ+uZtRf9lfQWYm5ssSTHN53czQNqMTlEL1vRILJb+uDk +B1nAFT5zy6JX/JmD6QXpUonx+YzTvL9ZI0qIF91hb4qPcNt4Nh+6bRfA7KLT7lWE +Rudr2MzkD3lb0Nubkq4+QmYhog8UhvUxfWUA/ubwktakKiYgveVKRb/ONTOIpZa+ +TAeZOsfMeDggTFMqOaFTxISV63O8p8mi8a7O/qM+rsPqlTjEVf/0Y3tILhEIoEfC +n2L4mU4vhVrXG6/lZ7sM+O8WoqlhQH5gVpjPFR66G0mQdGbvY0jdWS+wtVDGImkO +MIExpGAlkwADBggAioH1Z7OjuZNBb2Pf/ik3l68ouYqMu3qaxZhp2wYJGR6ndxKh +/0oTJbMrnYuHMc10PBiniqG6l/m/m2/ULyHl4yixZAHaG5tilfG6k1BgUMEfNvof +v9mHTm+iHrwU58PiZYaKlIfqPcnLc7oxsCiO/7oAn/NCUkB8EfFXqvsrgF6/DWF1 +LgIAvO9CvGuoBDGo7VU8w2YoB3ach5+nljdoQPb23K4TyE1zbpFQ8niEd8ULv4Gn +gQGrYWHS5O5RNsT8/Z2Rgk6I6lTssX8eizmVH9nRK/MlU3ulHG+uCd1JSZWVM6cD +E6NlTBMTZ9dA39c8GCQmctMKm1vmgIXm8OVI/4kCHwQYAQgACQUCSghl1AIbDAAK +CRAxAYAFCQXkDIA9D/9VLt9q9k71Z+mtpuVJUpVAnxWTuHjUmQ54dl7PFMeAU9KP +qAdBgoeE0NsZEC7aq/xZ17IH+fjbvLi40mMjqlv35fFjf9hlSHfPT6G4iOZqBCzn +egU1uqkrTj7Pm2STCgSWyM9jnRlfueQFSr7QdbJwklXlnhPY2XpBs0Wzbqp9dbTS +R47hR3CkjS3AUbsULb/ea+gP3mzCAytGExcGKghFipLQR5QLUDaJqxHDQBZK9K7N ++hccUdWArFycsoczS8IkrQ9+0qErjT8CdGm/laiaWvINYetlrRVrogI4YyuqUHyy +HjppPl6ypPX/zZdX32jFXvM4UmjlUlCojyIWh/WVNaZwSm6CC5M28w7iq5RzRw5f +0rdXGr8pQHgXKOTQgFOFs73SkmnQFK4sFNsTgTkSvyLlHsqAiXOXFhqYw1w4ozGT +sEcIdFCQuzEDHn57VRxWQhRd1npwUzlyFBszOGnbDLgXey1gMqzbpnupSU39FeWZ +Lka+Fmt9fn79alEg9K3xaCMfiIrQRSLqVlhr57S1OdJOy1z4jRbT2hjt5LKXTAUJ +gksZFyWOfV82jHBeu+O0xJNU/9xvZsJF4TORrRWRO1o1gkF7x/oBk7yilh+mSq1P +DNOWZJQhmuWMtbOUL2WMkKRPDwJrcbwpt3bc6aZCeAH1SSRLEe9Y+2uLeneTMA== +=+xMJ +-----END PGP PUBLIC KEY BLOCK----- +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v1 + +mQGiBEDLnMIRBACNlsJkPRfH7RMOn7nirvYN5StKVvwdJa2MFUM3sjoaA11nW+Zw +Yxion4GkbIOtz25R29TcwuAaK1UWhy1Rz6aIOOMOzBeUNGGCvRXF76rKHBHOdSJw +AXEvNa/9rKOIaPL7PBN7Lb4CmrjEbA9gKYtZQD9qQSKcAwyyxszkW1e7TwCg7MbV +Bq5MWlATjOAzXLoSpgyENwMD/jPz53KmwUobbqri2pFhozacl5N93cy7b3pwpTZY +fM50cXVSSshYpqdCr5AoWG/DXNGRixv1DnBKOI2Cv6YAQLntcATHxR8ssemOZHRv +7D0hvWwC3o6GSKdg0rSOtRHfDhEL4IFVmPLZaXIRDZ0/ancrCuQPdZ9mzCi/LQmV +noTeA/kB73zJMYH7Z0TSKv490AMWQHbKVvos8+tXxATlq0Otib+s55LXQocSPjgp +GR5qKzqTn9elg2dyo4GYeAYvGBmhQtBdeYo1rVq2pC6HCzMG79zozL9O25SnDLpj +WoqJB6qHBAd9tlTHzkRxv1Fqr4jfIupNborXbhR25tiYOm72irQcQWRhbSBKYWNr +c29uIDxhamF4QG53bmsubmV0PohhBBMRAgAhAhsDBgsJCAcDAgMVAgMDFgIBAh4B +AheABQJEZNYGAhkBAAoJEFuKLVCg7NDTlj8AoL9RgTs++HaD5w5lYARcE+OB+0Jg +AKDZBhJhVgOsEjeg7atMglFR7s36mrQeQWRhbSBKYWNrc29uIDxhamF4QHJlZGhh +dC5jb20+iGAEExECACAFAkfENSICGwMGCwkIBwMCBBUCCAMEFgIDAQIeAQIXgAAK +CRBbii1QoOzQ0x6CAJ0fevUkaaBcTzKa0lTgfNFQ0E+JwgCfaWy44eNKttn4WWEZ +CTGF+e+zraS0IEFkYW0gSmFja3NvbiA8YWpheEBlbmdyLnNnaS5jb20+iF4EExEC +AB4FAkHB1gECGwMGCwkIBwMCAxUCAwMWAgECHgECF4AACgkQW4otUKDs0NNTOgCg +lu1MOCbysvn68WReXz+v02+y2VkAoL12gktA0TFZnPBk3cweEAwCkUlXtCZBZGFt +IEphY2tzb24gPGFqYXhAd2lsZG9wZW5zb3VyY2UuY29tPoheBBMRAgAeBQJBriSn +AhsDBgsJCAcDAgMVAgMDFgIBAh4BAheAAAoJEFuKLVCg7NDTOe4AnRUJ6FqQLaoY +XWCToQdl/Gry4UNZAJ97YYHMt1FIo1TLCWWozSiG+VtTq7QnQWRhbSBKYWNrc29u +IDxhamF4QGJlbnplZHJpbmUubnduay5uZXQ+iF4EExECAB4FAkRk1eACGwMGCwkI +BwMCAxUCAwMWAgECHgECF4AACgkQW4otUKDs0NN+fwCg2cPLDbAb07gMWBETKTRm +sj34FsAAn0SQ4kuqs9Ms0ZRKDqNQ1YTMwyEHuQINBEDLnNAQCACrbu13VZsigsM6 +8MzfdGQ4x/acO4Vd+Dg/aFj3EhPfXZHRauuJ7gQtWc9Mk2ghTjbqEXj0JILbif95 +IyShdC/fxEYiFybRODR6FHlXj6BFCxZFfqi4mOuaGQ4BeB57g/gW+FSoIPzYU4IY +85KD62qeS37zQEBAAK+mCEboUGfPT0wHrkFtkTObjOg7UTjpBp5/HknUREYo8mLo +WBv7CDlApicmXoqnKfAcFaNY2YLMjklwFHh2i2+6dPbkdWSEpuZhkxIQ/8JlYS6A +2g5DMKcNdmqr4Z6xjk8Fj1SO7ILc9EtR+ACqkqkmlU3m4AUHjdR/4kk7tEJ5DytP +c95JcuJnAAMFB/9KWUqJbdeHs47LJBksZ6tnHArcSG653e9uejtNt5xquJIz2wxb +exMV9Bkzwu9v/A8Vo7px7Bkhh++sBrgpGD4z5Jr+PaWOsw5qrO9OVVgzXkUf2QoD +gw4Hh8m9jpx1s6tNasPsy12OGMJ4a5a1GCGg8F7sPlWLBd491viavDyOWYkKozLH +hXwKlGOec0sCRGeHTiqPinxs29PXaTE7Dl/f2dYgiNzTSWetSx7Sv1H9EX4qxPgc +smdRuGV7k7dIw/J02rcI/Ol4OUORRMY2cgJnb5mNxIxTgTGJysm+MjfPrZnOeDVK +TroAYtas/uirqiNzk7fdIdUdgbOhsAl9n3QZiEYEGBECAAYFAkDLnNAACgkQW4ot +UKDs0NP3CACfS1DKwgN/rB7Ib+RJiuK0F/BQoEYAoOhr0VXCT5dP0Yr1kIad7njC +GBF1 +=bYOv +-----END PGP PUBLIC KEY BLOCK----- --- xorg-server-1.18.2.orig/debian/watch +++ xorg-server-1.18.2/debian/watch @@ -0,0 +1,4 @@ +#git=git://anongit.freedesktop.org/xorg/xserver +version=3 +opts="pgpsigurlmangle=s/$/.sig/" \ +http://xorg.freedesktop.org/releases/individual/xserver/ xorg-server-(.*)\.tar\.gz --- xorg-server-1.18.2.orig/debian/xdmx-tools.install +++ xorg-server-1.18.2/debian/xdmx-tools.install @@ -0,0 +1,6 @@ +main/usr/bin/dmx* usr/bin +main/usr/bin/vdltodmx usr/bin +main/usr/bin/xdmxconfig usr/bin +main/usr/share/man/man1/vdltodmx.1 usr/share/man/man1 +main/usr/share/man/man1/dmxtodmx.1 usr/share/man/man1 +main/usr/share/man/man1/xdmxconfig.1 usr/share/man/man1 --- xorg-server-1.18.2.orig/debian/xdmx.install +++ xorg-server-1.18.2/debian/xdmx.install @@ -0,0 +1,2 @@ +main/usr/bin/Xdmx usr/bin +main/usr/share/man/man1/Xdmx.1 usr/share/man/man1 --- xorg-server-1.18.2.orig/debian/xnest.install +++ xorg-server-1.18.2/debian/xnest.install @@ -0,0 +1,2 @@ +main/usr/bin/Xnest usr/bin +main/usr/share/man/man1/Xnest.1 usr/share/man/man1 --- xorg-server-1.18.2.orig/debian/xorg-server-source.install +++ xorg-server-1.18.2/debian/xorg-server-source.install @@ -0,0 +1 @@ +build-source/xorg-server.tar.* usr/src --- xorg-server-1.18.2.orig/debian/xserver-common.install +++ xorg-server-1.18.2/debian/xserver-common.install @@ -0,0 +1,3 @@ +main/usr/lib/xorg/protocol.txt usr/lib/xorg +main/usr/share/man/man1/Xserver.1 usr/share/man/man1 +main/var/lib/xkb/README.compiled var/lib/xkb --- xorg-server-1.18.2.orig/debian/xserver-xephyr.docs +++ xorg-server-1.18.2/debian/xserver-xephyr.docs @@ -0,0 +1 @@ +hw/kdrive/ephyr/README --- xorg-server-1.18.2.orig/debian/xserver-xephyr.install +++ xorg-server-1.18.2/debian/xserver-xephyr.install @@ -0,0 +1,2 @@ +main/usr/bin/Xephyr usr/bin +main/usr/share/man/man1/Xephyr.1 usr/share/man/man1 --- xorg-server-1.18.2.orig/debian/xserver-xorg-core-udeb.install +++ xorg-server-1.18.2/debian/xserver-xorg-core-udeb.install @@ -0,0 +1,7 @@ +# from xserver-common: +udeb/usr/lib/xorg/protocol.txt usr/lib/xorg + +# from xserver-xorg-core: +udeb/usr/lib/xorg/modules usr/lib/xorg +udeb/usr/bin/Xorg usr/bin +udeb/usr/share/X11/xorg.conf.d usr/share/X11/ --- xorg-server-1.18.2.orig/debian/xserver-xorg-core.NEWS +++ xorg-server-1.18.2/debian/xserver-xorg-core.NEWS @@ -0,0 +1,17 @@ +xorg-server (2:1.17.3-1) unstable; urgency=medium + + The Xorg server is no longer setuid root by default. This change reduces the + risk of privilege escalation due to X server bugs, but has some side effects: + + * it relies on logind and libpam-systemd + * it relies on a kernel video driver (so the userspace component doesn't + touch the hardware directly) + * it needs X to run on the virtual console (VT) it was started from + * it changes the location for storing the Xorg log from /var/log/ to + ~/.local/share/xorg/ + + On systems where those are not available, the new xserver-xorg-legacy package + is needed to allow X to run with elevated privileges. See the + Xwrapper.config(5) manual page for configuration details. + + -- Julien Cristau Tue, 27 Oct 2015 22:54:11 +0000 --- xorg-server-1.18.2.orig/debian/xserver-xorg-core.bug.script +++ xorg-server-1.18.2/debian/xserver-xorg-core.bug.script @@ -0,0 +1,146 @@ +#!/bin/sh + +PATH="/sbin:$PATH" +CONFIG_DIR=/etc/X11 +SERVER_BINARY=/usr/bin/Xorg +SERVER_SYMLINK="$CONFIG_DIR/X" +XORGCONFIG="$CONFIG_DIR/xorg.conf" +XORGCONFIG_DIR="$CONFIG_DIR/xorg.conf.d" +CONFIG_AUX_DIR=/var/lib/x11 +X11R6_LIBS=/usr/X11R6/lib +LOCAL_LIBS=/usr/local/lib + +# Pretty echo, underline the specified string: +pecho() { + echo "$@" + echo "$@"|sed 's/./-/g' +} + +exec >&3 + +if [ -e "$SERVER_SYMLINK" ]; then + pecho "X server symlink status:" + ls -dl "$SERVER_SYMLINK" + ls -dl "$(readlink "$SERVER_SYMLINK")" +else + echo "$SERVER_SYMLINK does not exist." +fi + +if ! [ -L "$SERVER_SYMLINK" ]; then + echo "$SERVER_SYMLINK is not a symlink." +fi + +if ! [ -x "$SERVER_SYMLINK" ]; then + echo "$SERVER_SYMLINK is not executable." +fi + +echo + +if ldd "$SERVER_BINARY" | grep -qs "$LOCAL_LIBS"; then + pecho "The server is using local libraries!" + ldd "$SERVER_BINARY" | grep "$LOCAL_LIBS" + echo +fi + +if ldd "$SERVER_BINARY" | grep -qs "$X11R6_LIBS"; then + pecho "The server is using obsolete libraries!" + ldd "$SERVER_BINARY" | grep "$X11R6_LIBS" + echo +fi + +if dpkg-divert --list | grep -qs -i libgl; then + pecho "Diversions concerning libGL are in place" + dpkg-divert --list | grep -i libgl + echo +fi + +if which lspci > /dev/null 2>&1; then + pecho "VGA-compatible devices on PCI bus:" + LC_ALL=C lspci -nn | grep 'VGA compatible controller' +else + echo "The lspci command was not found; not including PCI data." +fi + +echo + +if [ -e "$XORGCONFIG" ]; then + pecho "Xorg X server configuration file status:" + ls -dl "$XORGCONFIG" + echo + pecho "Contents of $XORGCONFIG:" + iconv -c -t ascii "$XORGCONFIG" +else + echo "$XORGCONFIG does not exist." +fi + +echo + +if [ -d "$XORGCONFIG_DIR" ]; then + pecho "Contents of $XORGCONFIG_DIR:" + ls -l "$XORGCONFIG_DIR" +else + echo "$XORGCONFIG_DIR does not exist." +fi + +echo + +KMS_CONFS_DIR=/etc/modprobe.d +KMS_CONFS=$(ls $KMS_CONFS_DIR/*-kms.conf 2>/dev/null) + +if [ -n "$KMS_CONFS" ]; then + pecho "KMS configuration files:" + for CONF in $KMS_CONFS; do + echo "$CONF:" + # Indent, and get rid of empty lines: + sed 's/^/ /' < "$CONF"|egrep -v '^\s*$' + done +else + echo "$KMS_CONFS_DIR contains no KMS configuration files." +fi + +echo + +KERNEL_VERSION=/proc/version + +if [ -e "$KERNEL_VERSION" ]; then + pecho "Kernel version ($KERNEL_VERSION):" + cat /proc/version +else + echo "No kernel version found (missing $KERNEL_VERSION)." +fi + +echo + +XORG_LOGS=$(ls -dt /var/log/Xorg.*.log 2>/dev/null) + +if [ -n "$XORG_LOGS" ]; then + pecho "Xorg X server log files on system:" + ls -dlrt /var/log/Xorg.*.log 2>/dev/null + echo + for LOG in $XORG_LOGS; do + if [ -f "$LOG" ]; then + pecho "Contents of most recent Xorg X server log file ($LOG):" + cat "$LOG" + # the log files are large; only show the most recent + break + fi + done +else + echo "No Xorg X server log files found." +fi + +echo + +if [ -x /sbin/udevadm ]; then + pecho "udev information:" + /sbin/udevadm info --export-db | awk -F '\n' -v RS='\n\n' '/E: ID_INPUT/ { print; print "" }' + echo +fi + +if [ -x /bin/dmesg ]; then + pecho "DRM Information from dmesg:" + dmesg | egrep -i 'drm|agp' + echo +fi + +# vim:set ai et sts=4 sw=4 tw=0: --- xorg-server-1.18.2.orig/debian/xserver-xorg-core.install +++ xorg-server-1.18.2/debian/xserver-xorg-core.install @@ -0,0 +1,13 @@ +main/usr/lib/xorg/modules usr/lib/xorg +main/usr/bin/Xorg usr/bin +main/usr/bin/X usr/bin +main/usr/share/man/man1/Xorg.1 usr/share/man/man1 +main/usr/share/man/man4 usr/share/man/ +main/usr/share/man/man5/xorg.conf.5 usr/share/man/man5 +main/usr/share/man/man5/xorg.conf.d.5 usr/share/man/man5 +main/usr/bin/cvt usr/bin +main/usr/bin/gtf usr/bin +main/usr/share/man/man1/cvt.1 usr/share/man/man1 +main/usr/share/man/man1/gtf.1 usr/share/man/man1 +main/usr/share/X11/xorg.conf.d usr/share/X11/ +main/usr/lib/xorg/Xorg usr/lib/xorg --- xorg-server-1.18.2.orig/debian/xserver-xorg-core.lintian-overrides +++ xorg-server-1.18.2/debian/xserver-xorg-core.lintian-overrides @@ -0,0 +1,3 @@ +# That's OK, they were virtual packages: +breaks-without-version xserver-xorg-input-7 +breaks-without-version xserver-xorg-video-6 --- xorg-server-1.18.2.orig/debian/xserver-xorg-core.postrm +++ xorg-server-1.18.2/debian/xserver-xorg-core.postrm @@ -0,0 +1,14 @@ +#!/bin/sh + +set -e + +case "$1" in +purge) + rm /var/log/Xorg.*.log || true + rm /var/log/Xorg.*.log.old || true + ;; +esac + +#DEBHELPER# + +# vim:set ai et sts=2 sw=2 tw=0: --- xorg-server-1.18.2.orig/debian/xserver-xorg-dev.install +++ xorg-server-1.18.2/debian/xserver-xorg-dev.install @@ -0,0 +1,6 @@ +main/usr/include/xorg usr/include +main/usr/lib/pkgconfig/xorg-server.pc usr/lib/pkgconfig +main/usr/share/aclocal usr/share + +../../debian/local/dh_xsf_substvars usr/bin +../../debian/local/xsf.pm /usr/share/perl5/Debian/Debhelper/Sequence/ --- xorg-server-1.18.2.orig/debian/xserver-xorg-legacy.config +++ xorg-server-1.18.2/debian/xserver-xorg-legacy.config @@ -0,0 +1,87 @@ +#!/bin/sh +# Debian x11-common package configuration script +# Copyright 2000--2003 Branden Robinson. +# Licensed under the GNU General Public License, version 2. See the file +# /usr/share/common-licenses/GPL or . + +set -e + +# source debconf library +. /usr/share/debconf/confmodule + +THIS_PACKAGE=xserver-xorg-legacy +THIS_SCRIPT=config + +CONFIG_DIR=/etc/X11 +XWRAPPER_CONFIG="$CONFIG_DIR/Xwrapper.config" + +allowed_users_english_to_actual () { + case "$1" in + "Root Only") + echo "rootonly" + ;; + "Console Users Only") + echo "console" + ;; + "Anybody") + echo "anybody" + ;; + *) + # garbage input; return default + echo "allowed_users_english_to_actual(): unrecognized input \"$1\";" \ + "using default" >&2 + echo "console" + ;; + esac +} + +allowed_users_actual_to_english () { + case "$1" in + "rootonly") + echo "Root Only" + ;; + "console") + echo "Console Users Only" + ;; + "anybody") + echo "Anybody" + ;; + *) + # garbage input; return default + echo "allowed_users_actual_to_english(): unrecognized input \"$1\";" \ + "using default" >&2 + echo "Console Users Only" + ;; + esac +} + +CURRENT_ALLOWED_USERS= + +# scan the X wrapper config file for existing settings, if it exists +if [ -e "$XWRAPPER_CONFIG" ]; then + if MATCHES=$(grep "^allowed_users=.\+" "$XWRAPPER_CONFIG"); then + CURRENT_ALLOWED_USERS=$(echo "${MATCHES##*=}" | head -n 1) + fi +fi + +if [ -n "$CURRENT_ALLOWED_USERS" ]; then + echo "setting xserver-xorg-legacy/xwrapper/allowed_users from configuration" \ + "file" >&2 + db_set xserver-xorg-legacy/xwrapper/allowed_users \ + $(allowed_users_actual_to_english \ + "$CURRENT_ALLOWED_USERS") +fi + +db_input low xserver-xorg-legacy/xwrapper/allowed_users || test $? = 30 +db_go + +RET= +if db_get xserver-xorg-legacy/xwrapper/allowed_users; then + if [ -n "$RET" ]; then + db_set xserver-xorg-legacy/xwrapper/actual_allowed_users \ + $(allowed_users_english_to_actual "$RET") + fi +fi +exit 0 + +# vim:set ai et sts=2 sw=2 tw=0: --- xorg-server-1.18.2.orig/debian/xserver-xorg-legacy.install +++ xorg-server-1.18.2/debian/xserver-xorg-legacy.install @@ -0,0 +1,3 @@ +main/usr/lib/xorg/Xorg.wrap usr/lib/xorg +main/usr/share/man/man1/Xorg.wrap.1 usr/share/man/man1 +main/usr/share/man/man5/Xwrapper.config.5 usr/share/man/man5 --- xorg-server-1.18.2.orig/debian/xserver-xorg-legacy.postinst +++ xorg-server-1.18.2/debian/xserver-xorg-legacy.postinst @@ -0,0 +1,77 @@ +#!/bin/sh +# Debian xserver-xorg-legacy package post-installation script +# Copyright 1998--2001, 2003 Branden Robinson. +# Licensed under the GNU General Public License, version 2. See the file +# /usr/share/common-licenses/GPL or . +# Acknowlegements to Stephen Early, Mark Eichin, and Manoj Srivastava. + +set -e + +. /usr/share/debconf/confmodule + +THIS_PACKAGE=xserver-xorg-legacy +THIS_SCRIPT=postinst +CONFIG_DIR=/etc/X11 +XWRAPPER_CONFIG="$CONFIG_DIR/Xwrapper.config" +CONFIG_AUX_DIR=/var/lib/x11 +XWRAPPER_CONFIG_CHECKSUM_BASE="${XWRAPPER_CONFIG##*/}.md5sum" +XWRAPPER_CONFIG_CHECKSUM="$CONFIG_AUX_DIR/$XWRAPPER_CONFIG_CHECKSUM_BASE" +XWRAPPER_CONFIG_ROSTER_BASE="${XWRAPPER_CONFIG##*/}.roster" +XWRAPPER_CONFIG_ROSTER="$CONFIG_AUX_DIR/$XWRAPPER_CONFIG_ROSTER_BASE" + +# only mess with config file it exists; otherwise, assume that's the way the +# user wants it, but only if upgrading +if [ -e "$XWRAPPER_CONFIG" ] || [ -z "$UPGRADE" ]; then + ALLOWED_USERS= + if db_get xserver-xorg-legacy/xwrapper/actual_allowed_users; then + ALLOWED_USERS="$RET" + fi + if [ -n "$ALLOWED_USERS" ]; then + NEW_XWRAPPER_CONFIG=$(tempfile -m 644) + if ! [ -e "$XWRAPPER_CONFIG" ]; then + cat >>"$NEW_XWRAPPER_CONFIG" << EOF +# Xwrapper.config (Debian X Window System server wrapper configuration file) +# +# This file was generated by the post-installation script of the +# xserver-xorg-legacy package using values from the debconf database. +# +# See the Xwrapper.config(5) manual page for more information. +# +# This file is automatically updated on upgrades of the xserver-xorg-legacy +# package *only* if it has not been modified since the last upgrade of that +# package. +# +# If you have edited this file but would like it to be automatically updated +# again, run the following command as root: +# dpkg-reconfigure xserver-xorg-legacy +allowed_users=$ALLOWED_USERS +EOF + else + sed -e '/^allowed_users.*/d' < "$XWRAPPER_CONFIG" > "$NEW_XWRAPPER_CONFIG" + echo "allowed_users=$ALLOWED_USERS" >> "$NEW_XWRAPPER_CONFIG" + fi + if ! cmp -s "$XWRAPPER_CONFIG" "$NEW_XWRAPPER_CONFIG"; then + cp "$NEW_XWRAPPER_CONFIG" "$XWRAPPER_CONFIG.dpkg-new" + mv "$XWRAPPER_CONFIG.dpkg-new" "$XWRAPPER_CONFIG" + fi + rm -f "$NEW_XWRAPPER_CONFIG" + else + echo "not updating $XWRAPPER_CONFIG; problems communicating" \ + "with debconf database" >&2 + fi +else + echo "not updating $XWRAPPER_CONFIG; file does not exist" >&2 +fi + +# get rid of obsolete X server wrapper config roster and checksum +if dpkg --compare-versions "$2" lt-nl 1:7.6~3; then + rm -f "$XWRAPPER_CONFIG_ROSTER" + rm -f "$XWRAPPER_CONFIG_CHECKSUM" + rmdir "$CONFIG_AUX_DIR" 2>/dev/null || : +fi + +#DEBHELPER# + +exit 0 + +# vim:set ai et sts=2 sw=2 tw=80: --- xorg-server-1.18.2.orig/debian/xserver-xorg-legacy.postrm +++ xorg-server-1.18.2/debian/xserver-xorg-legacy.postrm @@ -0,0 +1,36 @@ +#!/bin/sh +# Debian xserver-xorg-legacy package post-removal script +# Copyright 1998--2001, 2003 Branden Robinson. +# Licensed under the GNU General Public License, version 2. See the file +# /usr/share/common-licenses/GPL or . +# Acknowlegements to Stephen Early, Mark Eichin, and Manoj Srivastava. + + +set -e + +THIS_PACKAGE=xserver-xorg-legacy +THIS_SCRIPT=postrm +CONFIG_DIR=/etc/X11 +XWRAPPER_CONFIG="$CONFIG_DIR/Xwrapper.config" +CONFIG_AUX_DIR=/var/lib/x11 +XWRAPPER_CONFIG_CHECKSUM="$CONFIG_AUX_DIR/${XWRAPPER_CONFIG##*/}.md5sum" +XWRAPPER_CONFIG_ROSTER="$CONFIG_AUX_DIR/${XWRAPPER_CONFIG##*/}.roster" + +#INCLUDE_SHELL_LIB# + +# clean up non-conffile configuration files and related materials on purge +if [ "$1" = "purge" ]; then + rm -f "$XWRAPPER_CONFIG_ROSTER" + rm -f "$XWRAPPER_CONFIG" + rm -f "$XWRAPPER_CONFIG_CHECKSUM" + + for DIR in "$CONFIG_DIR" "$CONFIG_AUX_DIR"; do + rmdir "$DIR" 2> /dev/null || true + done +fi + +#DEBHELPER# + +exit 0 + +# vim:set ai et sts=2 sw=2 tw=80: --- xorg-server-1.18.2.orig/debian/xserver-xorg-legacy.templates +++ xorg-server-1.18.2/debian/xserver-xorg-legacy.templates @@ -0,0 +1,22 @@ +# These debconf templates have been proofread by the debian-l10n-english +# team. +# +# Please consider interacting with the team if you intend +# to modify the templates or add new templates + +Template: xserver-xorg-legacy/xwrapper/allowed_users +Type: select +__Choices: Root Only, Console Users Only, Anybody +Default: Console Users Only +_Description: Users allowed to start the X server: + Because the X server runs with superuser privileges, it may be unwise to + permit any user to start it, for security reasons. On the other hand, it is + even more unwise to run general-purpose X client programs as root, which is + what may happen if only root is permitted to start the X server. A good + compromise is to permit the X server to be started only by users logged in to + one of the virtual consoles. + +Template: xserver-xorg-legacy/xwrapper/actual_allowed_users +Type: string +Description: for internal use + This template is never shown to the user and does not require translation. --- xorg-server-1.18.2.orig/debian/xvfb.install +++ xorg-server-1.18.2/debian/xvfb.install @@ -0,0 +1,4 @@ +main/usr/bin/Xvfb usr/bin +main/usr/bin/xvfb-run usr/bin +main/usr/share/man/man1/xvfb-run.1 usr/share/man/man1 +main/usr/share/man/man1/Xvfb.1 usr/share/man/man1 --- xorg-server-1.18.2.orig/debian/xwayland.install +++ xorg-server-1.18.2/debian/xwayland.install @@ -0,0 +1 @@ +main/usr/bin/Xwayland usr/bin --- xorg-server-1.18.2.orig/doc/c-extensions +++ xorg-server-1.18.2/doc/c-extensions @@ -0,0 +1,68 @@ +First of all: C89 or better. If you don't have that, port gcc first. + +Use of C language extensions throughout the X server tree +--------------------------------------------------------- + +Optional extensions: +The server will still build if your toolchain does not support these +extensions, although the results may not be optimal. + + * _X_SENTINEL(x): member x of the passed structure must be NULL, e.g.: + void parseOptions(Option *options _X_SENTINEL(0)); + parseOptions("foo", "bar", NULL); /* this is OK */ + parseOptions("foo", "bar", "baz"); /* this is not */ + This definition comes from Xfuncproto.h in the core + protocol headers. + * _X_ATTRIBUTE_PRINTF(x, y): This function has printf-like semantics; + check the format string when built with + -Wformat (gcc) or similar. + * _X_EXPORT: this function should appear in symbol tables. + * _X_HIDDEN: this function should not appear in the _dynamic_ symbol + table. + * _X_INTERNAL: like _X_HIDDEN, but attempt to ensure that this function + is never called from another module. + * _X_INLINE: inline this function if possible (generally obeyed unless + disabling optimisations). + * _X_DEPRECATED: warn on use of this function. + +Mandatory extensions: +The server will not build if your toolchain does not support these extensions. + + * named initialisers: explicitly initialising structure members, e.g.: + struct foo bar = { .baz = quux, .brian = "dog" }; + * variadic macros: macros with a variable number of arguments, e.g.: + #define DebugF(x, ...) /**/ + * interleaved code and declarations: { foo = TRUE; int bar; do_stuff(); } + + +Use of library facilities throughout the X server tree +------------------------------------------------------------- + +Non-OS-dependent code can assume facilities at least as good as +the non-OS-facility parts of POSIX-1.2001. Ideally this would +be C99, but even gcc+glibc doesn't implement that yet. + +Unix-like systems are assumed to be at least as good as UNIX03. + +Note that there are two Windows ports, Cygwin and MinGW: +- Cygwin is more or less like Linux. +- MinGW is more restrictive. Windows does not provide the required +POSIX facilities, so some non-OS-dependent code is stubbed out or +has an alternate implementation if WIN32 is defined. Code that +needs to be portable to Windows should be careful to, well, be portable. + + +Required OS facilities +------------------------------------------------------------- + +Linux systems must be at least 2.4 or later. As a practical matter +though, 2.4 kernels never receive any testing. Use 2.6 already. + +TODO: Solaris. + +TODO: *BSD. + +Windows-dependent code assumes at least NT 5.1. + +OSX support is generally limited to the most recent version. Currently +that means 10.5. --- xorg-server-1.18.2.orig/dri3/dri3int.h +++ xorg-server-1.18.2/dri3/dri3int.h @@ -0,0 +1,26 @@ +/* + * Copyright © 2011 Daniel Stone + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice (including the next + * paragraph) shall be included in all copies or substantial portions of the + * Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + * + * Author: Daniel Stone + */ + +extern Bool DRI2ModuleSetup(void); --- xorg-server-1.18.2.orig/fix-miregion +++ xorg-server-1.18.2/fix-miregion @@ -0,0 +1,29 @@ +#!/bin/sh +sed -i \ +-e 's/miRegionCreate\b/RegionCreate/g' \ +-e 's/miRegionInit\b/RegionInit/g' \ +-e 's/miRegionDestroy\b/RegionDestroy/g' \ +-e 's/miRegionUninit\b/RegionUninit/g' \ +-e 's/miRegionCopy\b/RegionCopy/g' \ +-e 's/miIntersect\b/RegionIntersect/g' \ +-e 's/miUnion\b/RegionUnion/g' \ +-e 's/miRegionAppend\b/RegionAppend/g' \ +-e 's/miRegionValidate\b/RegionValidate/g' \ +-e 's/miRectsToRegion\b/RegionFromRects/g' \ +-e 's/miSubtract\b/RegionSubtract/g' \ +-e 's/miInverse\b/RegionInverse/g' \ +-e 's/miRectIn\b/RegionContainsRect/g' \ +-e 's/miTranslateRegion\b/RegionTranslate/g' \ +-e 's/miRegionReset\b/RegionReset/g' \ +-e 's/miRegionBreak\b/RegionBreak/g' \ +-e 's/miPointInRegion\b/RegionContainsPoint/g' \ +-e 's/miRegionEqual\b/RegionEqual/g' \ +-e 's/miRegionNotEmpty\b/RegionNotEmpty/g' \ +-e 's/miRegionEmpty\b/RegionEmpty/g' \ +-e 's/miRegionExtents\b/RegionExtents/g' \ +-e 's/miPrintRegion\b/RegionPrint/g' \ +-e 's/miRectAlloc\b/RegionRectAlloc/g' \ +-e 's/miValidRegion\b/RegionIsValid/g' \ +-e 's/miRegionBroken\b/RegionBroken/g' \ +-e 's/miClipSpans\b/RegionClipSpans/g' \ +"$@" --- xorg-server-1.18.2.orig/fix-miregion-private +++ xorg-server-1.18.2/fix-miregion-private @@ -0,0 +1,14 @@ +#!/bin/sh +sed -i \ +-e 's/miEmptyBox\b/RegionEmptyBox/g' \ +-e 's/miEmptyData\b/RegionEmptyData/g' \ +-e 's/miBrokenData\b/RegionBrokenData/g' \ +-e 's/miBrokenRegion\b/RegionBrokenRegion/g' \ +-e 's/miCoalesce\b/RegionCoalesce/g' \ +-e 's/miAppendNonO\b/RegionAppendNonO/g' \ +-e 's/miRegionOp\b/RegionOp/g' \ +-e 's/miSetExtents\b/RegionSetExtents/g' \ +-e 's/miIntersectO\b/RegionIntersectO/g' \ +-e 's/miUnionO\b/RegionUnionO/g' \ +-e 's/miSubtractO\b/RegionSubtractO/g' \ +"$@" --- xorg-server-1.18.2.orig/fix-patch-whitespace +++ xorg-server-1.18.2/fix-patch-whitespace @@ -0,0 +1,4 @@ +#!/bin/sh +git diff --check | +sed -n 's!^\([^:]*\):\([^:]*\):.*!sed -i "\2 s/[ \t]*$//; \2 s/ *\t/\t/g" \1!p' | +sh --- xorg-server-1.18.2.orig/fix-region +++ xorg-server-1.18.2/fix-region @@ -0,0 +1,38 @@ +#!/bin/sh +sed -i \ + -e 's/REGION_NIL\b/RegionNil/g' \ + -e 's/REGION_NAR\b/RegionNar/g' \ + -e 's/REGION_NUM_RECTS\b/RegionNumRects/g' \ + -e 's/REGION_SIZE\b/RegionSize/g' \ + -e 's/REGION_RECTS\b/RegionRects/g' \ + -e 's/REGION_BOXPTR\b/RegionBoxptr/g' \ + -e 's/REGION_BOX\b/RegionBox/g' \ + -e 's/REGION_TOP\b/RegionTop/g' \ + -e 's/REGION_END\b/RegionEnd/g' \ + -e 's/REGION_SZOF\b/RegionSizeof/g' \ + -e 's/REGION_CREATE *([^,]*, */RegionCreate(/g' \ + -e 's/REGION_COPY *([^,]*, */RegionCopy(/g' \ + -e 's/REGION_DESTROY *([^,]*, */RegionDestroy(/g' \ + -e 's/REGION_INTERSECT *([^,]*, */RegionIntersect(/g' \ + -e 's/REGION_UNION *([^,]*, */RegionUnion(/g' \ + -e 's/REGION_SUBTRACT *([^,]*, */RegionSubtract(/g' \ + -e 's/REGION_INVERSE *([^,]*, */RegionInverse(/g' \ + -e 's/REGION_TRANSLATE *([^,]*, */RegionTranslate(/g' \ + -e 's/RECT_IN_REGION *([^,]*, */RegionContainsRect(/g' \ + -e 's/POINT_IN_REGION *([^,]*, */RegionContainsPoint(/g' \ + -e 's/REGION_EQUAL *([^,]*, */RegionEqual(/g' \ + -e 's/REGION_APPEND *([^,]*, */RegionAppend(/g' \ + -e 's/REGION_VALIDATE *([^,]*, */RegionValidate(/g' \ + -e 's/BITMAP_TO_REGION\b/BitmapToRegion/g' \ + -e 's/RECTS_TO_REGION *([^,]*, */RegionFromRects(/g' \ + -e 's/REGION_BREAK *([^,]*, */RegionBreak(/g' \ + -e 's/REGION_INIT *([^,]*, */RegionInit(/g' \ + -e 's/REGION_UNINIT *([^,]*, */RegionUninit(/g' \ + -e 's/REGION_RESET *([^,]*, */RegionReset(/g' \ + -e 's/REGION_NOTEMPTY *([^,]*, */RegionNotEmpty(/g' \ + -e 's/REGION_BROKEN *([^,]*, */RegionBroken(/g' \ + -e 's/REGION_EMPTY *([^,]*, */RegionEmpty(/g' \ + -e 's/REGION_EXTENTS *([^,]*, */RegionExtents(/g' \ + -e 's/REGION_NULL *([^,]*, */RegionNull(/g' \ + -e 's/REGION_NULL$/RegionNull/g' \ + "$@" --- xorg-server-1.18.2.orig/hw/kdrive/Xkdrive.man +++ xorg-server-1.18.2/hw/kdrive/Xkdrive.man @@ -0,0 +1,50 @@ +.\" $RCSId: xc/programs/Xserver/hw/kdrive/Xkdrive.man,v 1.3 2001/01/24 00:06:10 dawes Exp $ +.\" +.TH Xkdrive 1 __vendorversion__ +.SH NAME +Xkdrive \- tiny X server +.SH SYNOPSIS +.B Xfbdev +.RI [ :display ] +.RI [ option ...] +.SH DESCRIPTION +.B Xkdrive +is a family of X servers designed to be particularly small. This +manual page describes the common functionality of the +.B Xkdrive +servers; for information on a specific X server, please refer to the +relevant manual page. +.SH OPTIONS +In addition to the standard options accepted by all X servers (see +Xserver(1)), all the +.B Xkdrive +servers accept the following options: +.TP 8 +.B -dumb +disable hardware acceleration. +.TP 8 +.B -origin \fIX\fP,\fIY\fP +Locates the next screen in the Xinerama virtual screen. +.TP 8 +.B -screen \fIwidth\fBx\fIheight\fR[\fBx\fIdepth\fR[\fBx\fIfreq\fR]]\fR[\fB@\fIrotation\fR]\fB +use a screen of the specified \fIwidth\fP, \fIheight\fP, screen \fIdepth\fP, \fIfrequency\fP, and \fIrotation\fP (0, 90, 180 and 270 are legal values). +.TP 8 +.B -softCursor +disable the hardware cursor. +.TP 8 +.B -videoTest +start the server, pause momentarily, and exit. +.TP 8 +.B -zaphod +disable switching screens by moving the pointer across a screen boundary. +.TP 8 +.B -2button +enable emulation of a middle mouse button by chording. +.TP 8 +.B -3button +disable emulation of a middle mouse button by chording. +.SH SEE ALSO +X(__miscmansuffix__), Xserver(1), xdm(1), xinit(1), Xvesa(1), Xfbdev(1). +.SH AUTHORS +The Xkdrive common core was written by Keith Packard, +and is based on the Sample Implementation of X. --- xorg-server-1.18.2.orig/hw/kdrive/fbdev/Xfbdev.man +++ xorg-server-1.18.2/hw/kdrive/fbdev/Xfbdev.man @@ -0,0 +1,28 @@ +.\" $RCSId: xc/programs/Xserver/hw/kdrive/fbdev/Xfbdev.man,v 1.4 2001/01/27 18:20:40 dawes Exp $ +.\" +.TH Xfbdev 1 __vendorversion__ +.SH NAME +Xfbdev \- Linux framebuffer device tiny X server +.SH SYNOPSIS +.B Xfbdev +.RI [ :display ] +.RI [ option ...] +.SH DESCRIPTION +.B Xfbdev +is a generic X server for Linux. +.B Xfbdev +doesn't know about any particular hardware, and uses the framebuffer +provided by the Linux framebuffer device. +.SH OPTIONS +.B Xfbdev +accepts the common options of the Xkdrive family of servers. Please +see Xkdrive(1). +.SH KEYBOARD +To be written. +.SH SEE ALSO +X(__miscmansuffix__), Xserver(1), Xkdrive(1), xdm(1), xinit(1). +.SH AUTHORS +The +.B Xfbdev +server was written by Keith Packard. + --- xorg-server-1.18.2.orig/hw/xfree86/os-support/shared/platform_noop.c +++ xorg-server-1.18.2/hw/xfree86/os-support/shared/platform_noop.c @@ -0,0 +1,23 @@ + +#ifdef HAVE_XORG_CONFIG_H +#include +#endif + +#ifdef XSERVER_PLATFORM_BUS +/* noop platform device support */ +#include "xf86_OSproc.h" + +#include "xf86.h" +#include "xf86platformBus.h" + +Bool +xf86PlatformDeviceCheckBusID(struct xf86_platform_device *device, const char *busid) +{ + return FALSE; +} + +void xf86PlatformDeviceProbe(struct OdevAttributes *attribs) +{ + +} +#endif --- xorg-server-1.18.2.orig/hw/xquartz/GL/glcontextmodes.c +++ xorg-server-1.18.2/hw/xquartz/GL/glcontextmodes.c @@ -0,0 +1,586 @@ +/* + * (C) Copyright IBM Corporation 2003 + * All Rights Reserved. + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * on the rights to use, copy, modify, merge, publish, distribute, sub + * license, and/or sell copies of the Software, and to permit persons to whom + * the Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice (including the next + * paragraph) shall be included in all copies or substantial portions of the + * Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL + * VA LINUX SYSTEM, IBM AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM, + * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR + * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE + * USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + +/** + * \file glcontextmodes.c + * Utility routines for working with \c __GLcontextModes structures. At + * some point most or all of these functions will be moved to the Mesa + * code base. + * + * \author Ian Romanick + */ + +#if defined(IN_MINI_GLX) +#include +#else +#if defined(HAVE_DIX_CONFIG_H) +#include +#endif +#include +#include +#include "GL/glxint.h" +#endif + +/* Memory macros */ +#if defined(IN_MINI_GLX) +#include +#include +#define _mesa_malloc(b) malloc(b) +#define _mesa_free(m) free(m) +#define _mesa_memset memset +#else +#ifdef XFree86Server +#include +#include +#define _mesa_malloc(b) malloc(b) +#define _mesa_free(m) free(m) +#define _mesa_memset memset +#else +#include +#define _mesa_memset memset +#define _mesa_malloc(b) Xmalloc(b) +#define _mesa_free(m) free(m) +#endif /* XFree86Server */ +#endif /* !defined(IN_MINI_GLX) */ + +#include "glcontextmodes.h" + +#if !defined(IN_MINI_GLX) +#define NUM_VISUAL_TYPES 6 + +/** + * Convert an X visual type to a GLX visual type. + * + * \param visualType X visual type (i.e., \c TrueColor, \c StaticGray, etc.) + * to be converted. + * \return If \c visualType is a valid X visual type, a GLX visual type will + * be returned. Otherwise \c GLX_NONE will be returned. + */ +GLint +_gl_convert_from_x_visual_type(int visualType) +{ + static const int glx_visual_types[NUM_VISUAL_TYPES] = { + GLX_STATIC_GRAY, GLX_GRAY_SCALE, + GLX_STATIC_COLOR, GLX_PSEUDO_COLOR, + GLX_TRUE_COLOR, GLX_DIRECT_COLOR + }; + + return ((unsigned)visualType < NUM_VISUAL_TYPES) + ? glx_visual_types[visualType] : GLX_NONE; +} + +/** + * Convert a GLX visual type to an X visual type. + * + * \param visualType GLX visual type (i.e., \c GLX_TRUE_COLOR, + * \c GLX_STATIC_GRAY, etc.) to be converted. + * \return If \c visualType is a valid GLX visual type, an X visual type will + * be returned. Otherwise -1 will be returned. + */ +GLint +_gl_convert_to_x_visual_type(int visualType) +{ + static const int x_visual_types[NUM_VISUAL_TYPES] = { + TrueColor, DirectColor, + PseudoColor, StaticColor, + GrayScale, StaticGray + }; + + return ((unsigned)(visualType - GLX_TRUE_COLOR) < NUM_VISUAL_TYPES) + ? x_visual_types[visualType - GLX_TRUE_COLOR] : -1; +} + +/** + * Copy a GLX visual config structure to a GL context mode structure. All + * of the fields in \c config are copied to \c mode. Additional fields in + * \c mode that can be derrived from the fields of \c config (i.e., + * \c haveDepthBuffer) are also filled in. The remaining fields in \c mode + * that cannot be derived are set to default values. + * + * \param mode Destination GL context mode. + * \param config Source GLX visual config. + * + * \note + * The \c fbconfigID and \c visualID fields of the \c __GLcontextModes + * structure will be set to the \c vid of the \c __GLXvisualConfig structure. + */ +void +_gl_copy_visual_to_context_mode(__GLcontextModes * mode, + const __GLXvisualConfig * config) +{ + __GLcontextModes * const next = mode->next; + + (void)_mesa_memset(mode, 0, sizeof(__GLcontextModes)); + mode->next = next; + + mode->visualID = config->vid; + mode->visualType = _gl_convert_from_x_visual_type(config->class); + mode->xRenderable = GL_TRUE; + mode->fbconfigID = config->vid; + mode->drawableType = GLX_WINDOW_BIT | GLX_PIXMAP_BIT; + + mode->rgbMode = (config->rgba != 0); + mode->renderType = (mode->rgbMode) ? GLX_RGBA_BIT : GLX_COLOR_INDEX_BIT; + + mode->colorIndexMode = !(mode->rgbMode); + mode->doubleBufferMode = (config->doubleBuffer != 0); + mode->stereoMode = (config->stereo != 0); + + mode->haveAccumBuffer = ((config->accumRedSize + + config->accumGreenSize + + config->accumBlueSize + + config->accumAlphaSize) > 0); + mode->haveDepthBuffer = (config->depthSize > 0); + mode->haveStencilBuffer = (config->stencilSize > 0); + + mode->redBits = config->redSize; + mode->greenBits = config->greenSize; + mode->blueBits = config->blueSize; + mode->alphaBits = config->alphaSize; + mode->redMask = config->redMask; + mode->greenMask = config->greenMask; + mode->blueMask = config->blueMask; + mode->alphaMask = config->alphaMask; + mode->rgbBits = mode->rgbMode ? config->bufferSize : 0; + mode->indexBits = mode->colorIndexMode ? config->bufferSize : 0; + + mode->accumRedBits = config->accumRedSize; + mode->accumGreenBits = config->accumGreenSize; + mode->accumBlueBits = config->accumBlueSize; + mode->accumAlphaBits = config->accumAlphaSize; + mode->depthBits = config->depthSize; + mode->stencilBits = config->stencilSize; + + mode->numAuxBuffers = config->auxBuffers; + mode->level = config->level; + + mode->visualRating = config->visualRating; + mode->transparentPixel = config->transparentPixel; + mode->transparentRed = config->transparentRed; + mode->transparentGreen = config->transparentGreen; + mode->transparentBlue = config->transparentBlue; + mode->transparentAlpha = config->transparentAlpha; + mode->transparentIndex = config->transparentIndex; + mode->samples = config->multiSampleSize; + mode->sampleBuffers = config->nMultiSampleBuffers; + /* mode->visualSelectGroup = config->visualSelectGroup; ? */ + + mode->swapMethod = GLX_SWAP_UNDEFINED_OML; + + mode->bindToTextureRgb = (mode->rgbMode) ? GL_TRUE : GL_FALSE; + mode->bindToTextureRgba = (mode->rgbMode && mode->alphaBits) ? + GL_TRUE : GL_FALSE; + mode->bindToMipmapTexture = mode->rgbMode ? GL_TRUE : GL_FALSE; + mode->bindToTextureTargets = mode->rgbMode ? + GLX_TEXTURE_1D_BIT_EXT | + GLX_TEXTURE_2D_BIT_EXT | + GLX_TEXTURE_RECTANGLE_BIT_EXT : 0; + mode->yInverted = GL_FALSE; +} + +/** + * Get data from a GL context mode. + * + * \param mode GL context mode whose data is to be returned. + * \param attribute Attribute of \c mode that is to be returned. + * \param value_return Location to store the data member of \c mode. + * \return If \c attribute is a valid attribute of \c mode, zero is + * returned. Otherwise \c GLX_BAD_ATTRIBUTE is returned. + */ +int +_gl_get_context_mode_data(const __GLcontextModes *mode, int attribute, + int *value_return) +{ + switch (attribute) { + case GLX_USE_GL: + *value_return = GL_TRUE; + return 0; + + case GLX_BUFFER_SIZE: + *value_return = mode->rgbBits; + return 0; + + case GLX_RGBA: + *value_return = mode->rgbMode; + return 0; + + case GLX_RED_SIZE: + *value_return = mode->redBits; + return 0; + + case GLX_GREEN_SIZE: + *value_return = mode->greenBits; + return 0; + + case GLX_BLUE_SIZE: + *value_return = mode->blueBits; + return 0; + + case GLX_ALPHA_SIZE: + *value_return = mode->alphaBits; + return 0; + + case GLX_DOUBLEBUFFER: + *value_return = mode->doubleBufferMode; + return 0; + + case GLX_STEREO: + *value_return = mode->stereoMode; + return 0; + + case GLX_AUX_BUFFERS: + *value_return = mode->numAuxBuffers; + return 0; + + case GLX_DEPTH_SIZE: + *value_return = mode->depthBits; + return 0; + + case GLX_STENCIL_SIZE: + *value_return = mode->stencilBits; + return 0; + + case GLX_ACCUM_RED_SIZE: + *value_return = mode->accumRedBits; + return 0; + + case GLX_ACCUM_GREEN_SIZE: + *value_return = mode->accumGreenBits; + return 0; + + case GLX_ACCUM_BLUE_SIZE: + *value_return = mode->accumBlueBits; + return 0; + + case GLX_ACCUM_ALPHA_SIZE: + *value_return = mode->accumAlphaBits; + return 0; + + case GLX_LEVEL: + *value_return = mode->level; + return 0; + + case GLX_TRANSPARENT_TYPE_EXT: + *value_return = mode->transparentPixel; + return 0; + + case GLX_TRANSPARENT_RED_VALUE: + *value_return = mode->transparentRed; + return 0; + + case GLX_TRANSPARENT_GREEN_VALUE: + *value_return = mode->transparentGreen; + return 0; + + case GLX_TRANSPARENT_BLUE_VALUE: + *value_return = mode->transparentBlue; + return 0; + + case GLX_TRANSPARENT_ALPHA_VALUE: + *value_return = mode->transparentAlpha; + return 0; + + case GLX_TRANSPARENT_INDEX_VALUE: + *value_return = mode->transparentIndex; + return 0; + + case GLX_X_VISUAL_TYPE: + *value_return = mode->visualType; + return 0; + + case GLX_CONFIG_CAVEAT: + *value_return = mode->visualRating; + return 0; + + case GLX_VISUAL_ID: + *value_return = mode->visualID; + return 0; + + case GLX_DRAWABLE_TYPE: + *value_return = mode->drawableType; + return 0; + + case GLX_RENDER_TYPE: + *value_return = mode->renderType; + return 0; + + case GLX_X_RENDERABLE: + *value_return = mode->xRenderable; + return 0; + + case GLX_FBCONFIG_ID: + *value_return = mode->fbconfigID; + return 0; + + case GLX_MAX_PBUFFER_WIDTH: + *value_return = mode->maxPbufferWidth; + return 0; + + case GLX_MAX_PBUFFER_HEIGHT: + *value_return = mode->maxPbufferHeight; + return 0; + + case GLX_MAX_PBUFFER_PIXELS: + *value_return = mode->maxPbufferPixels; + return 0; + + case GLX_OPTIMAL_PBUFFER_WIDTH_SGIX: + *value_return = mode->optimalPbufferWidth; + return 0; + + case GLX_OPTIMAL_PBUFFER_HEIGHT_SGIX: + *value_return = mode->optimalPbufferHeight; + return 0; + + case GLX_SWAP_METHOD_OML: + *value_return = mode->swapMethod; + return 0; + + case GLX_SAMPLE_BUFFERS_SGIS: + *value_return = mode->sampleBuffers; + return 0; + + case GLX_SAMPLES_SGIS: + *value_return = mode->samples; + return 0; + + case GLX_BIND_TO_TEXTURE_RGB_EXT: + *value_return = mode->bindToTextureRgb; + return 0; + + case GLX_BIND_TO_TEXTURE_RGBA_EXT: + *value_return = mode->bindToTextureRgba; + return 0; + + case GLX_BIND_TO_MIPMAP_TEXTURE_EXT: + *value_return = mode->bindToMipmapTexture == GL_TRUE ? GL_TRUE : + GL_FALSE; + return 0; + + case GLX_BIND_TO_TEXTURE_TARGETS_EXT: + *value_return = mode->bindToTextureTargets; + return 0; + + case GLX_Y_INVERTED_EXT: + *value_return = mode->yInverted; + return 0; + + /* Applications are NOT allowed to query GLX_VISUAL_SELECT_GROUP_SGIX. + * It is ONLY for communication between the GLX client and the GLX + * server. + */ + case GLX_VISUAL_SELECT_GROUP_SGIX: + default: + return GLX_BAD_ATTRIBUTE; + } +} +#endif /* !defined(IN_MINI_GLX) */ + +/** + * Allocate a linked list of \c __GLcontextModes structures. The fields of + * each structure will be initialized to "reasonable" default values. In + * most cases this is the default value defined by table 3.4 of the GLX + * 1.3 specification. This means that most values are either initialized to + * zero or \c GLX_DONT_CARE (which is -1). As support for additional + * extensions is added, the new values will be initialized to appropriate + * values from the extension specification. + * + * \param count Number of structures to allocate. + * \param minimum_size Minimum size of a structure to allocate. This allows + * for differences in the version of the + * \c __GLcontextModes stucture used in libGL and in a + * DRI-based driver. + * \returns A pointer to the first element in a linked list of \c count + * stuctures on success, or \c NULL on failure. + * + * \warning Use of \c minimum_size does \b not guarantee binary compatibility. + * The fundamental assumption is that if the \c minimum_size + * specified by the driver and the size of the \c __GLcontextModes + * structure in libGL is the same, then the meaning of each byte in + * the structure is the same in both places. \b Be \b careful! + * Basically this means that fields have to be added in libGL and + * then propagated to drivers. Drivers should \b never arbitrarilly + * extend the \c __GLcontextModes data-structure. + */ +__GLcontextModes * +_gl_context_modes_create(unsigned count, size_t minimum_size) +{ + const size_t size = (minimum_size > sizeof(__GLcontextModes)) + ? minimum_size : sizeof(__GLcontextModes); + __GLcontextModes * base = NULL; + __GLcontextModes ** next; + unsigned i; + + next = &base; + for (i = 0; i < count; i++) { + *next = (__GLcontextModes *)_mesa_malloc(size); + if (*next == NULL) { + _gl_context_modes_destroy(base); + base = NULL; + break; + } + + (void)_mesa_memset(*next, 0, size); + (*next)->visualID = GLX_DONT_CARE; + (*next)->visualType = GLX_DONT_CARE; + (*next)->visualRating = GLX_NONE; + (*next)->transparentPixel = GLX_NONE; + (*next)->transparentRed = GLX_DONT_CARE; + (*next)->transparentGreen = GLX_DONT_CARE; + (*next)->transparentBlue = GLX_DONT_CARE; + (*next)->transparentAlpha = GLX_DONT_CARE; + (*next)->transparentIndex = GLX_DONT_CARE; + (*next)->xRenderable = GLX_DONT_CARE; + (*next)->fbconfigID = GLX_DONT_CARE; + (*next)->swapMethod = GLX_SWAP_UNDEFINED_OML; + (*next)->bindToTextureRgb = GLX_DONT_CARE; + (*next)->bindToTextureRgba = GLX_DONT_CARE; + (*next)->bindToMipmapTexture = GLX_DONT_CARE; + (*next)->bindToTextureTargets = GLX_DONT_CARE; + (*next)->yInverted = GLX_DONT_CARE; + + next = &((*next)->next); + } + + return base; +} + +/** + * Destroy a linked list of \c __GLcontextModes structures created by + * \c _gl_context_modes_create. + * + * \param modes Linked list of structures to be destroyed. All structres + * in the list will be freed. + */ +void +_gl_context_modes_destroy(__GLcontextModes * modes) +{ + while (modes != NULL) { + __GLcontextModes * const next = modes->next; + + _mesa_free(modes); + modes = next; + } +} + +/** + * Find a context mode matching a Visual ID. + * + * \param modes List list of context-mode structures to be searched. + * \param vid Visual ID to be found. + * \returns A pointer to a context-mode in \c modes if \c vid was found in + * the list, or \c NULL if it was not. + */ + +__GLcontextModes * +_gl_context_modes_find_visual(__GLcontextModes *modes, int vid) +{ + __GLcontextModes *m; + + for (m = modes; m != NULL; m = m->next) + if (m->visualID == vid) + return m; + + return NULL; +} + +__GLcontextModes * +_gl_context_modes_find_fbconfig(__GLcontextModes *modes, int fbid) +{ + __GLcontextModes *m; + + for (m = modes; m != NULL; m = m->next) + if (m->fbconfigID == fbid) + return m; + + return NULL; +} + +/** + * Determine if two context-modes are the same. This is intended to be used + * by libGL implementations to compare to sets of driver generated FBconfigs. + * + * \param a Context-mode to be compared. + * \param b Context-mode to be compared. + * \returns \c GL_TRUE if the two context-modes are the same. \c GL_FALSE is + * returned otherwise. + */ +GLboolean +_gl_context_modes_are_same(const __GLcontextModes * a, + const __GLcontextModes * b) +{ + return ((a->rgbMode == b->rgbMode) && + (a->floatMode == b->floatMode) && + (a->colorIndexMode == b->colorIndexMode) && + (a->doubleBufferMode == b->doubleBufferMode) && + (a->stereoMode == b->stereoMode) && + (a->redBits == b->redBits) && + (a->greenBits == b->greenBits) && + (a->blueBits == b->blueBits) && + (a->alphaBits == b->alphaBits) && +#if 0 /* For some reason these don't get set on the client-side in libGL. */ + (a->redMask == b->redMask) && + (a->greenMask == b->greenMask) && + (a->blueMask == b->blueMask) && + (a->alphaMask == b->alphaMask) && +#endif + (a->rgbBits == b->rgbBits) && + (a->indexBits == b->indexBits) && + (a->accumRedBits == b->accumRedBits) && + (a->accumGreenBits == b->accumGreenBits) && + (a->accumBlueBits == b->accumBlueBits) && + (a->accumAlphaBits == b->accumAlphaBits) && + (a->depthBits == b->depthBits) && + (a->stencilBits == b->stencilBits) && + (a->numAuxBuffers == b->numAuxBuffers) && + (a->level == b->level) && + (a->visualRating == b->visualRating) && + + (a->transparentPixel == b->transparentPixel) && + + ((a->transparentPixel != GLX_TRANSPARENT_RGB) || + ((a->transparentRed == b->transparentRed) && + (a->transparentGreen == b->transparentGreen) && + (a->transparentBlue == b->transparentBlue) && + (a->transparentAlpha == b->transparentAlpha))) && + + ((a->transparentPixel != GLX_TRANSPARENT_INDEX) || + (a->transparentIndex == b->transparentIndex)) && + + (a->sampleBuffers == b->sampleBuffers) && + (a->samples == b->samples) && + ((a->drawableType & b->drawableType) != 0) && + (a->renderType == b->renderType) && + (a->maxPbufferWidth == b->maxPbufferWidth) && + (a->maxPbufferHeight == b->maxPbufferHeight) && + (a->maxPbufferPixels == b->maxPbufferPixels) && + (a->optimalPbufferWidth == b->optimalPbufferWidth) && + (a->optimalPbufferHeight == b->optimalPbufferHeight) && + (a->swapMethod == b->swapMethod) && + (a->bindToTextureRgb == b->bindToTextureRgb) && + (a->bindToTextureRgba == b->bindToTextureRgba) && + (a->bindToMipmapTexture == b->bindToMipmapTexture) && + (a->bindToTextureTargets == b->bindToTextureTargets) && + (a->yInverted == b->yInverted)); +} --- xorg-server-1.18.2.orig/hw/xquartz/GL/glcontextmodes.h +++ xorg-server-1.18.2/hw/xquartz/GL/glcontextmodes.h @@ -0,0 +1,60 @@ +/* + * (C) Copyright IBM Corporation 2003 + * All Rights Reserved. + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * on the rights to use, copy, modify, merge, publish, distribute, sub + * license, and/or sell copies of the Software, and to permit persons to whom + * the Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice (including the next + * paragraph) shall be included in all copies or substantial portions of the + * Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL + * VA LINUX SYSTEM, IBM AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM, + * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR + * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE + * USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + +/** + * \file glcontextmodes.h + * \author Ian Romanick + */ + +#ifndef GLCONTEXTMODES_H +#define GLCONTEXTMODES_H + +#include "GL/internal/glcore.h" + +#if !defined(IN_MINI_GLX) +extern GLint +_gl_convert_from_x_visual_type(int visualType); +extern GLint +_gl_convert_to_x_visual_type(int visualType); +extern void +_gl_copy_visual_to_context_mode(__GLcontextModes * mode, + const __GLXvisualConfig * config); +extern int +_gl_get_context_mode_data(const __GLcontextModes *mode, int attribute, + int *value_return); +#endif /* !defined(IN_MINI_GLX) */ + +extern __GLcontextModes * +_gl_context_modes_create(unsigned count, size_t minimum_size); +extern void +_gl_context_modes_destroy(__GLcontextModes * modes); +extern __GLcontextModes * +_gl_context_modes_find_visual(__GLcontextModes *modes, int vid); +extern __GLcontextModes * +_gl_context_modes_find_fbconfig(__GLcontextModes *modes, int fbid); +extern GLboolean +_gl_context_modes_are_same(const __GLcontextModes * a, + const __GLcontextModes * b); + +#endif /* GLCONTEXTMODES_H */ --- xorg-server-1.18.2.orig/hw/xwin/winclipboard/internal.h +++ xorg-server-1.18.2/hw/xwin/winclipboard/internal.h @@ -0,0 +1,125 @@ + +/* + *Copyright (C) 2003-2004 Harold L Hunt II All Rights Reserved. + * + *Permission is hereby granted, free of charge, to any person obtaining + * a copy of this software and associated documentation files (the + *"Software"), to deal in the Software without restriction, including + *without limitation the rights to use, copy, modify, merge, publish, + *distribute, sublicense, and/or sell copies of the Software, and to + *permit persons to whom the Software is furnished to do so, subject to + *the following conditions: + * + *The above copyright notice and this permission notice shall be + *included in all copies or substantial portions of the Software. + * + *THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + *EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + *MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + *NONINFRINGEMENT. IN NO EVENT SHALL HAROLD L HUNT II BE LIABLE FOR + *ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF + *CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + *WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * + *Except as contained in this notice, the name of Harold L Hunt II + *shall not be used in advertising or otherwise to promote the sale, use + *or other dealings in this Software without prior written authorization + *from Harold L Hunt II. + * + * Authors: Harold L Hunt II + */ + +#ifndef WINCLIPBOARD_INTERNAL_H +#define WINCLIPBOARD_INTERNAL_H + +/* X headers */ +#include + +/* Windows headers */ +#include + +#define WIN_XEVENTS_SUCCESS 0 +#define WIN_XEVENTS_FAILED 1 +#define WIN_XEVENTS_NOTIFY_DATA 3 +#define WIN_XEVENTS_NOTIFY_TARGETS 4 + +#define WM_WM_REINIT (WM_USER + 1) +#define WM_WM_QUIT (WM_USER + 2) + +/* + * References to external symbols + */ + +extern void winDebug(const char *format, ...) _X_ATTRIBUTE_PRINTF(1, 2); +extern void ErrorF(const char *format, ...) _X_ATTRIBUTE_PRINTF(1, 2); + +/* + * winclipboardtextconv.c + */ + +void + winClipboardDOStoUNIX(char *pszData, int iLength); + +void + winClipboardUNIXtoDOS(char **ppszData, int iLength); + +/* + * winclipboardthread.c + */ + + +typedef struct +{ + Atom atomClipboard; + Atom atomLocalProperty; + Atom atomUTF8String; + Atom atomCompoundText; + Atom atomTargets; +} ClipboardAtoms; + +/* Modern clipboard API functions */ +typedef wBOOL WINAPI (*ADDCLIPBOARDFORMATLISTENERPROC)(HWND hwnd); +typedef wBOOL WINAPI (*REMOVECLIPBOARDFORMATLISTENERPROC)(HWND hwnd); + +extern Bool g_fHasModernClipboardApi; +extern ADDCLIPBOARDFORMATLISTENERPROC g_fpAddClipboardFormatListener; +extern REMOVECLIPBOARDFORMATLISTENERPROC g_fpRemoveClipboardFormatListener; + +/* + * winclipboardwndproc.c + */ + +Bool winClipboardFlushWindowsMessageQueue(HWND hwnd); + +LRESULT CALLBACK +winClipboardWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam); + +typedef struct +{ + Display *pClipboardDisplay; + Window iClipboardWindow; + ClipboardAtoms *atoms; +} ClipboardWindowCreationParams; + +/* + * winclipboardxevents.c + */ + +typedef struct +{ + Bool fUseUnicode; + Atom *targetList; +} ClipboardConversionData; + +int +winClipboardFlushXEvents(HWND hwnd, + Window iWindow, Display * pDisplay, ClipboardConversionData *data, ClipboardAtoms *atom); + + +Atom +winClipboardGetLastOwnedSelectionAtom(ClipboardAtoms *atoms); + +void +winClipboardInitMonitoredSelections(void); + +#endif --- xorg-server-1.18.2.orig/xkb/XKM_file_format.txt +++ xorg-server-1.18.2/xkb/XKM_file_format.txt @@ -0,0 +1,684 @@ + XKM File Format Description + Version 15 + +1. Introduction + +The XKM file format is the exchange format for XKB keyboard descriptions +between the server and xkbcomp. Usually, the server forks off xkbcomp, +xkbcomp compiles the XKM format from the given parameters. +The resulting XKM file is put into a directory readable by the server and +then parsed. + +The XKM format is little more than a binary dump of various XKB-specific +structures and hence tied to the ABI of the server. + + ❧❧❧❧❧❧❧❧❧❧❧ + +1.1 About this file format description + +This description was produced by analyzing the XKM parsing code. Parts of +the file description present in the original format specification may be +missing. This description thus cannot be a reference document for XKM +implementations. + +No description of the meaning of the various fields is given here. Refer to +the XKB protocol specification for more details. + ❧❧❧❧❧❧❧❧❧❧❧ + +2. Notations used in this document + +Notation for structures: + +┌─── + Name of struct + name of field: type or fixed value of field + name of field: type or fixed value of field +└─── + +Data types are identical to those used in the X Protocol specification +except where noted otherwise. Structs specific to XKM are prefixed with XKM, +defines specific to the XKB protocol specification are prefixed with Xkb and +their value is equivalent to that in the protocol specification. + +Multiple instances of a given type are denoted in the following form: + name of field: LISTofFIELDTYPE + +Length specifiers for such fields are usually prefixed with num_. For +example, a struct containing a num_foo of 8 and a 'foo' field contains 8 +structures of type 'foo'. + +Variable length padding is specified as pad(x), where x is the length of the +data to be padded out to a multiple of 4 bytes. For example, given an x of +10, pad(x) would be the remaining 2 bytes to pad the whole struct to 12 +bytes. + +A special notation is a variable content struct. In this case, the contents +of the struct depend on the value of one or more specific fields. +┌─── + Name of struct + field: type or fixed value of field + field: type or fixed value of field + ─── + field ⇒ value 1 + ⇒ + specific field: type + specific field: type + ─── + field ⇒ value 2 + ⇒ + specific field: type + specific field: type +└─── +This notation denotes that if field is of value 1, this struct contains the +specific fields listed underneath value 1. + + ❧❧❧❧❧❧❧❧❧❧❧ + +3. XKM Format + +The XKM format is a binary format with structs usually being padded to a +multiple of 4 bytes. No provisions for endianess are provided, the parser is +left to guess the endianess of the XKM file. + + ❧❧❧❧❧❧❧❧❧❧❧ +3.1 Common data types + +┌─── + XKMCountedString + count: CARD16 + string: count * CHAR + pad: pad(count + 2) +└─── + +XKMCountedString is used for user-readable identifiers. Prime example are +the level names and the section names ("complete", "evdev(inet)", etc.) + +┌─── + XKMGroupBits: CARD8 + group1 0x1 + group2 0x2 + group3 0x4 + group4 0x8 +└─── + + ❧❧❧❧❧❧❧❧❧❧❧ + +3.2 Header and Table of Contents + +┌─── + XKMHeader + version: CARD8 + identifier1: 'm' + identifier2: 'k' + idenfifier3: 'x' +└─── + +The XKM file format has a 4 byte header identifying the file and the XKM +version. The header is followed by the table of contents indicating the +sections present in this file. + +┌─── + XKMFileInfo + type: CARD8 + min_keycode: CARD8 + max_keycode: CARD8 + num_sectioninfo: CARD8 + present: CARD16 + pad: CARD16 + sectioninfo: LISTofXKMSectionInfo +└─── + +min_keycode and max_keycode specify the keycode range for this keyboard +descriptions. The core protocol requires min_keycode always be equal to or +greater than 8. + +┌─── + XKMSectionInfo + type: CARD16 + XkmTypesIndex 0 + XkmCompatMapIndex 1 + XkmSymbolsIndex 2 + XkmIndicatorsIndex 3 + XkmKeyNamesIndex 4 + XkmGeometryIndex 5 + XkmVirtualModsIndex 6 + format: CARD16 + size: CARD16 + offset: CARD16 +└─── + +Describes the section found in a chunk of a file. This struct is found +_twice_ in the file per section, once as part of the XKMFileInfo, once at +the beginning of the actual section (see offset). +The type specifies the type of the section, the section is to be parsed +according to this type. +Size and offset specify the size in bytes and the offset into the file in +bytes, respectively. + +3.3 Sections + +Each section resides at the offset specified in the XKMFileInfo sectioninfo. + + ❧❧❧❧❧❧❧❧❧❧❧ + +3.3.1 XKMTypes + +An XKMTypes section describes the key types defined in a layout. Roughly +speaking, a key type defines how many levels a given key has and which +modifiers change to a particular level. + +┌─── + XKMTypesSection + section_info: XKMSectionInfo + name: XKMCountedString + num_types: CARD16 + pad: CARD16 + types: LISTofXKMKeyType +└─── + +┌─── + XKMKeyType + real_mods: CARD8 + num_levels: CARD8 + virt_mods: CARD16 + num_map_entries: CARD8 + num_level_names: CARD8 + perserve: CARD8 + pad: CARD8 + map_entries: LISTofXKMKTMapEntry + name: XKMCountedString + mods: LISTofXKMModsDesc + level_names: LISXTofXKMCountedString +└─── + +The num_map_entries specifies the number of structs in both map_entries and mods. mods is only present if preserve is TRUE. + +┌─── + XKMKTMapEntry + level: CARD8 + real_mods: CARD8 + virt_mods: CARD16 +└─── + +┌─── + XKMModsDesc + real_mods: CARD8 + pad: CARD8 + virt_mods: CARD16 +└─── + + ❧❧❧❧❧❧❧❧❧❧❧ +3.3.2 XKMCompatMap + +An XKMCompatMap section describes the actions a keyboard may trigger. This +ranges from the TerminateServer action to simple modifier bits. + +┌─── + XKMCompatMap + section_info: XKMSectionInfo + name: XKMCountedString + num_si: CARD16 + group_mask: XKMGroupBits + pad: CARD8 + si: LISTofXKMSymInterpreterDesc + groups: LISTofXKMModsDesc +└─── + +One XKMModsDesc is present for each bit set in group_mask. + +┌─── + XKMSymInterpretDesc + sym: CARD32 + mods: CARD8 + match: CARD8 + virtual_mod: CARD8 + flags: CARD8 + action_type: CARD8 + action_data: XKMActionData +└─── + +Where the action is 7 bytes of CARD8 whose content is determined by +action_type. + +┌─── + XKMActionData: + pad0: CARD8 + pad1: CARD16 + pad2: CARD32 + ─── + action_type ⇒ XkbSA_SetMods || + action_type ⇒ XkbSA_LatchMods || + action_type ⇒ XkbSA_LockMods + ⇒ + flags: CARD8 + mask: CARD8 + real_mods: CARD8 + vmods1: CARD8 + vmods2: CARD8 + pad: CARD16 + ─── + action_type ⇒ XkbSA_SetGroup || + action_type ⇒ XkbSA_LatchGroup || + action_type ⇒ XkbSA_LockGroup + ⇒ + flags: CARD8 + group_XXX: CARD8 + pad0: CARD8 + pad1: CARD32 + ─── + action_type ⇒ XkbSA_MovePtr + ⇒ + flags: CARD8 + high_XXX: CARD8 + low_XXX: CARD8 + high_YYY: CARD8 + low_YYY: CARD8 + pad: CARD16 + ─── + action_type ⇒ XkbSA_PtrBtn || + action_type ⇒ XkbSA_LockPtrBtn + ⇒ + flags: CARD8 + count: CARD8 + button: CARD8 + pad: CARD32 + ─── + action_type ⇒ XkbSA_DeviceBtn || + action_type ⇒ XkbSA_LockLockPtrBtn + ⇒ + flags: CARD8 + count: CARD8 + button: CARD8 + device: CARD8 + pad0: CARD8 + pad1: CARD16 + ─── + action_type ⇒ XkbSA_SetPtrDflt + ⇒ + flags: CARD8 + affect: CARD8 + valueXXX: CARD8 + pad0: CARD32 + ─── + action_type ⇒ XkbSA_ISOLock + ⇒ + flags: CARD8 + mask: CARD8 + real_mods: CARD8 + group_XXX: CARD8 + affect: CARD8 + vmods1: CARD8 + vmods1: CARD8 + ─── + action_type ⇒ XkbSA_SwitchScreen + ⇒ + flags: CARD8 + screenXXX: CARD8 + pad0: CARD8 + pad1: CARD32 + ─── + action_type ⇒ XkbSA_SetControls || + action_type ⇒ XkbSA_LockControls + ⇒ + flags: CARD8 + ctrls3: CARD8 + ctrls2: CARD8 + ctrls1: CARD8 + ctrls0: CARD8 + pad: CARD16 + ─── + action_type ⇒ XkbSA_RedirectKey + ⇒ + new_key: CARD8 + mods_mask: CARD8 + mods: CARD8 + vmods_mask0: CARD8 + vmods_mask1: CARD8 + vmods0: CARD8 + vmods1: CARD8 + ─── + action_type ⇒ XkbSA_DeviceValuator + ⇒ + device: CARD8 + v1_what: CARD8 + v1_idx: CARD8 + v1_value: CARD8 + v2_what: CARD8 + v2_idx: CARD8 + v2_value: CARD8 + pad: CARD8 + ─── + action_type ⇒ XkbSA_XFree86Private || + action_type ⇒ XkbSA_Terminate + ⇒ + pad0: CARD8 + pad1: CARD16 + pad2: CARD32 + ─── + action_type ⇒ XkbSA_ActionMessage + ⇒ + press_msg: BOOL + release_msg: BOOL + gen_event: BOOL + message: 4 * CHAR +└─── + +Note: XkbSA_ActionMessage is currently unsupported and the contents are +ignored. + + ❧❧❧❧❧❧❧❧❧❧❧ +3.3.3 XkmSymbols + +The symbols in a keymap define the actual keysyms each key may produce. + +┌─── + XKMSymbols + section_info: XKMSectionInfo + name: XKMCountedString + min_keycode: CARD8 + max_keycode: CARD8 + group_names_mask: XKMGroupBits + num_vmod_maps: CARD8 + group_names: LISTofXKMCountedString + keysyms: XKMKeysymMapDesc + vmod_maps: XKMVModMapDesc +└─── +One group_name is present for each bit set in group_names_mask. +The number of keysyms present is max_keycode - min_keycode + 1. + +┌─── + XKMKeysymMapDesc + width: CARD8 + num_groups: CARD8 + modifier_map: CARD8 + flags: CARD8 + names: LISTofXKMCountedString + syms: LISTofCARD32 + behavior: XKMBehaviorDesc +└─── + +Presence of names is conditional on the XkmKeyHasTypes flag. The number of +strings is equal to the number of group bits in group_names_mask in the +preceeding XKMSymbols section. +The number of elements in syms is equal to width * num_groups. +Presence of behavior is conditional on the XkmKeyHasBehavior flag. + +┌─── + XKMKeyBehaviorDesc + type: CARD8 + data: CARD8 + pad: CARD16 +└─── + +┌─── + XKMVModMapDesc + key: CARD8 + pad: CARD8 + vmods: CARD16 +└─── + + ❧❧❧❧❧❧❧❧❧❧❧ + +3.3.4 XKMIndicators + +┌─── + XKMIndicators + section_info: XKMSectionInfo + name: XKMCountedString + num_indicators: CARD8 + pad0: CARD8 + pad1: CARD16 + indicators: LISTofXKMIndicatorMapDesc +└─── + +┌─── + XKMIndicatorMapDesc + name: XKMCountedString + indicator: CARD8 + flags: CARD8 + which_mods: CARD8 + real_mods: CARD8 + vmods: CARD16 + which_groups: CARD8 + groups: CARD8 + ctrls: CARD32 +└─── + ❧❧❧❧❧❧❧❧❧❧❧ + +3.3.5 XKMKeyNames + +┌─── + XKMKeyNames + section_info: XKMSectionInfo + name: XKMCountedString + min_keycode: CARD8 + max_keycode: CARD8 + num_aliases: CARD8 + pad: CARD8 + keynames: LISTofXKMKeyname + aliases: LISTofXKMKeyAlias +└─── + +keynames contains max_keycode - min_keycode + 1 entries. + +┌─── + XkmKeyname + name: 4 * CHAR8 +└─── + +┌─── + XkmKeyAlias + real: XkmKeyname + alias: XkmKeyname +└─── + + ❧❧❧❧❧❧❧❧❧❧❧ + +3.3.5 XKMGeometry + +┌─── + XKMGeometry + section_info: XKMSectionInfo + name: XKMCountedString + width_mm: CARD16 + height_mm: CARD16 + base_color_ndx: CARD8 + label_color_ndx: CARD8 + num_properties: CARD16 + num_colors: CARD16 + num_shapes: CARD16 + num_sections: CARD16 + num_doodads: CARD16 + num_key_aliases: CARD16 + pad: CARD16 + label_font: XKMCountedString + properties: LISTofXKMGeomProperty + colors: LISTofXKMCountedString + shapes: LISTofXKMGeomShape + sections: LISTofXKMGeomSection + doodads: LISTofXKMGeomDoodad + key_aliases: LISTofXKMKeyAlias +└─── + +┌─── + XKMGeomProperty + name: XKMCountedString + value: XKMCountedString + +└─── + +┌─── + XKMGeomShape + name: XKMCountedString + num_outlines: CARD8 + primary_idx: CARD8 + approx_idx: CARD8 + pad: CARD8 + outlines: LISTofXKMOutlineDesc +└─── + +┌─── + XKMOutlineDesc + num_points: CARD8 + corner_radius: CARD8 + pad: CARD16 + points: LISTofXKMPointDesc +└─── + +┌─── + XKMPointDesc + x: INT16 + y: INT16 +└─── + +┌─── + XKMGeomSection + name: XKMCountedString + top: INT16 + left: INT16 + width: CARD16 + height: CARD16 + angle: INT16 + priority: CARD8 + num_rows: CARD8 + num_doodads: CARD8 + num_overlays: CARD8 + pad: CARD16 + rows: LISTofXKMRowDesc + doodads: LISTofXKMGeomDoodad + overlays: LISTofXKMGeomOverlay +└─── + +┌─── + XKMRowDesc + top: INT16 + left: INT16 + num_keys: CARD8 + vertical: BOOL + pad: CARD16 + keys: XKMKeyDesc +└─── + +┌─── + XKMKeyDesc + name: XKMKeyname + gap: INT16 + shape_idx: CARD8 + color_idx: CARD8 +└─── + +┌─── + XKMGeomDoodad + name: XKMCountedString + type: CARD8 + priority: CARD8 + top: INT16 + left: INT16 + pad1: CARD16 + pad2: CARD32 + pad3: CARD32 + ─── + type ⇒ XkbOutlineDoodad || + type ⇒ XkbSolideDoodad + ⇒ + type: CARD8 + priority: CARD8 + top: INT16 + left: INT16 + angle: INT16 + color_idx: CARD8 + shape_idx: CARD8 + pad0: CARD16 + pad1: CARD32 + ─── + type ⇒ XkbTextDoodad + ⇒ + type: CARD8 + priority: CARD8 + top: INT16 + left: INT16 + angle: INT16 + width: CARD16 + height: CARD16 + color_idx: CARD8 + pad0: CARD8 + pad1: CARD16 + text: XKMCountedString + font: XKMCountedString + ─── + type ⇒ XkbIndicatorDoodad + ⇒ + type: CARD8 + priority: CARD8 + top: INT16 + left: INT16 + shape_idx: CARD8 + on_color_idx: CARD8 + off_color_idx: CARD8 + pad0: CARD8 + pad1: CARD16 + pad2: CARD32 + ─── + type ⇒ XkbLogoDoodad + ⇒ + type: CARD8 + priority: CARD8 + top: INT16 + left: INT16 + angle: INT16 + color_idx: CARD8 + shape_idx: CARD8 + pad0: CARD16 + pad1: CARD32 + logo_name: XKMCountedString +└─── + +WARNING: XKMGeomDoodad has variable length depending on the type. +NOTE: The current server implementation does not use all fields of all +structures. + +┌─── + XKMOverlayDesc + name: XKMCountedString + num_rows: CARD8 + pad0: CARD8 + pad1: CARD16 + rows: LISTofXKMOverlayRowDesc +└─── + +┌─── + XKMOverlayRowDesc + name: XKMCountedString + row_under: CARD8 + num_keys: CARD8 + pad: CARD16 + keys: LISTofXKMOverlayKeyDesc +└─── + +┌─── + XKMOverlayKeyDesc + over: XKMKeyname + under: XKMKeyname +└─── + + ❧❧❧❧❧❧❧❧❧❧❧ + +3.3.6 XKMVirtualMods + +┌─── + XKMOverlayRowDesc + section_info: XKMSectionInfo + name: XKMCountedString + bound_mask: SETofVMODBITS + named_mask: SETofVMODBITS + vmods: LISTofCARD8 + pad: pad(vmods) + names: LISTofXKMCountedString +└─── + + VMODBITS: CARD16 + +Number of elements in vmods is equal to the number of bits set in +bound_mask. The padding completes vmods to a multiple of 4 byte units. +Number of elements in names is equal to the number of bits set in +named_mask. --- xorg-server-1.18.2.orig/xserver-autobind-hotplug.patch +++ xorg-server-1.18.2/xserver-autobind-hotplug.patch @@ -0,0 +1,113 @@ +From cd6f931fb06f825f246222a4362fbf728f8dce73 Mon Sep 17 00:00:00 2001 +From: Dave Airlie +Date: Fri, 17 Aug 2012 09:49:24 +1000 +Subject: [PATCH] autobind GPUs to the screen, (v3) + +this is racy and really not what we want for hotplug going forward, +but until DE support is in GNOME its probably for the best. + +v2: fix if config or slave config is NULL +v3: fix multi useful slaves +DO NOT UPSTREAM. + +Signed-off-by: Dave Airlie +--- + hw/xfree86/common/xf86Init.c | 12 ++++++++++++ + hw/xfree86/common/xf86platformBus.c | 3 +++ + hw/xfree86/modes/xf86Crtc.c | 32 ++++++++++++++++++++++++++++++++ + 3 files changed, 47 insertions(+) + +diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c +index 6282252..dc33ad1 100644 +--- a/hw/xfree86/common/xf86Init.c ++++ b/hw/xfree86/common/xf86Init.c +@@ -361,6 +361,16 @@ xf86CreateRootWindow(WindowPtr pWin) + return ret; + } + ++extern void xf86AutoConfigOutputDevice(ScrnInfoPtr pScrn, ScrnInfoPtr master); ++static void ++xf86AutoConfigOutputDevices(void) ++{ ++ int i; ++ ++ for (i = 0; i < xf86NumGPUScreens; i++) ++ xf86AutoConfigOutputDevice(xf86GPUScreens[i], xf86Screens[0]); ++} ++ + static void + InstallSignalHandlers(void) + { +@@ -949,6 +959,8 @@ InitOutput(ScreenInfo * pScreenInfo, int argc, char **argv) + for (i = 0; i < xf86NumGPUScreens; i++) + AttachUnboundGPU(xf86Screens[0]->pScreen, xf86GPUScreens[i]->pScreen); + ++ xf86AutoConfigOutputDevices(); ++ + xf86VGAarbiterWrapFunctions(); + if (sigio_blocked) + OsReleaseSIGIO(); +diff --git a/hw/xfree86/common/xf86platformBus.c b/hw/xfree86/common/xf86platformBus.c +index 33b2b7d..be3bdd9 100644 +--- a/hw/xfree86/common/xf86platformBus.c ++++ b/hw/xfree86/common/xf86platformBus.c +@@ -393,6 +393,8 @@ xf86platformProbeDev(DriverPtr drvp) + return foundScreen; + } + ++extern void xf86AutoConfigOutputDevice(ScrnInfoPtr pScrn, ScrnInfoPtr master); ++ + int + xf86platformAddDevice(int index) + { +@@ -465,6 +467,7 @@ xf86platformAddDevice(int index) + } + /* attach unbound to 0 protocol screen */ + AttachUnboundGPU(xf86Screens[0]->pScreen, xf86GPUScreens[i]->pScreen); ++ xf86AutoConfigOutputDevice(xf86GPUScreens[i], xf86Screens[0]); + + RRResourcesChanged(xf86Screens[0]->pScreen); + RRTellChanged(xf86Screens[0]->pScreen); +diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c +index 4726f2a..e83ea13 100644 +--- a/hw/xfree86/modes/xf86Crtc.c ++++ b/hw/xfree86/modes/xf86Crtc.c +@@ -3440,3 +3440,35 @@ xf86DetachAllCrtc(ScrnInfoPtr scrn) + crtc->x = crtc->y = 0; + } + } ++ ++ ++void xf86AutoConfigOutputDevice(ScrnInfoPtr pScrn, ScrnInfoPtr master) ++{ ++ RRProviderPtr master_provider; ++ xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(master); ++ xf86CrtcConfigPtr slave_config = XF86_CRTC_CONFIG_PTR(pScrn); ++ Bool unbound = FALSE; ++ ++ if (!config || !slave_config) ++ return; ++ ++ master_provider = config->randr_provider; ++ ++ if ((master->capabilities & RR_Capability_SinkOffload) && ++ pScrn->capabilities & RR_Capability_SourceOffload) { ++ /* source offload */ ++ ++ DetachUnboundGPU(pScrn->pScreen); ++ unbound = TRUE; ++ AttachOffloadGPU(master->pScreen, pScrn->pScreen); ++ slave_config->randr_provider->offload_sink = master_provider; ++ } ++ if ((master->capabilities & RR_Capability_SourceOutput) && ++ pScrn->capabilities & RR_Capability_SinkOutput) { ++ /* sink offload */ ++ if (!unbound) ++ DetachUnboundGPU(pScrn->pScreen); ++ AttachOutputGPU(master->pScreen, pScrn->pScreen); ++ slave_config->randr_provider->output_source = master_provider; ++ } ++} +-- +1.8.3.1 +