From d712b77850a9a7c4ad73f3c0971acfe6262bfb10 Mon Sep 17 00:00:00 2001 From: "jk7744.park" Date: Tue, 8 Sep 2015 22:55:10 +0900 Subject: [PATCH] tizen 2.3.1 release --- COPYING | 686 ++++++ debian/README.source | 73 - debian/changelog | 524 ---- debian/compat | 1 - debian/control | 69 - debian/copyright | 729 ------ debian/patches/01_xedit_mkdir_races.diff | 2588 -------------------- debian/patches/02_xedit_manpage_typos.diff | 22 - .../03_xconsole_implicit_pointer_conversion.diff | 16 - .../patches/05_xmore_fix_segv_without_xprint.diff | 34 - debian/patches/series | 4 - debian/rules | 114 - debian/watch.bitmap | 2 - debian/watch.ico | 2 - debian/watch.oclock | 2 - debian/watch.x11perf | 2 - debian/watch.xbiff | 2 - debian/watch.xcalc | 2 - debian/watch.xclipboard | 2 - debian/watch.xclock | 2 - debian/watch.xconsole | 2 - debian/watch.xcursorgen | 2 - debian/watch.xditview | 2 - debian/watch.xedit | 2 - debian/watch.xeyes | 2 - debian/watch.xgc | 2 - debian/watch.xload | 2 - debian/watch.xlogo | 2 - debian/watch.xmag | 2 - debian/watch.xman | 2 - debian/watch.xmore | 2 - debian/watch.xwd | 2 - debian/watch.xwud | 2 - debian/x11-apps.install | 3 - debian/x11-apps.menu | 97 - debian/xsfbs/repack.sh | 32 - debian/xsfbs/xsfbs.mk | 293 --- debian/xsfbs/xsfbs.sh | 853 ------- luit/Makefile.am | 7 +- oclock/Makefile.am | 3 +- packaging/xorg-x11-apps.spec | 73 +- x11perf/Makefile.am | 3 +- xbiff/Makefile.am | 3 +- xclipboard/Makefile.am | 3 +- xclock/Makefile.am | 3 +- xconsole/Makefile.am | 3 +- xcursorgen/Makefile.am | 3 +- xeyes/Makefile.am | 3 +- xfd/Makefile.am | 3 +- xfontsel/Makefile.am | 4 +- xload/Makefile.am | 3 +- xlogo/Makefile.am | 4 +- xmag/Makefile.am | 4 +- xmessage/Makefile.am | 4 +- xorg-x11-apps.manifest | 9 + xpr/Makefile.am | 3 +- xvidtune/Makefile.am | 4 +- xwd/Makefile.am | 4 +- xwud/Makefile.am | 4 +- 59 files changed, 762 insertions(+), 5568 deletions(-) create mode 100644 COPYING delete mode 100644 debian/README.source delete mode 100644 debian/changelog delete mode 100644 debian/compat delete mode 100644 debian/control delete mode 100644 debian/copyright delete mode 100644 debian/patches/01_xedit_mkdir_races.diff delete mode 100644 debian/patches/02_xedit_manpage_typos.diff delete mode 100644 debian/patches/03_xconsole_implicit_pointer_conversion.diff delete mode 100644 debian/patches/05_xmore_fix_segv_without_xprint.diff delete mode 100644 debian/patches/series delete mode 100755 debian/rules delete mode 100644 debian/watch.bitmap delete mode 100644 debian/watch.ico delete mode 100644 debian/watch.oclock delete mode 100644 debian/watch.x11perf delete mode 100644 debian/watch.xbiff delete mode 100644 debian/watch.xcalc delete mode 100644 debian/watch.xclipboard delete mode 100644 debian/watch.xclock delete mode 100644 debian/watch.xconsole delete mode 100644 debian/watch.xcursorgen delete mode 100644 debian/watch.xditview delete mode 100644 debian/watch.xedit delete mode 100644 debian/watch.xeyes delete mode 100644 debian/watch.xgc delete mode 100644 debian/watch.xload delete mode 100644 debian/watch.xlogo delete mode 100644 debian/watch.xmag delete mode 100644 debian/watch.xman delete mode 100644 debian/watch.xmore delete mode 100644 debian/watch.xwd delete mode 100644 debian/watch.xwud delete mode 100644 debian/x11-apps.install delete mode 100644 debian/x11-apps.menu delete mode 100755 debian/xsfbs/repack.sh delete mode 100755 debian/xsfbs/xsfbs.mk delete mode 100644 debian/xsfbs/xsfbs.sh mode change 100644 => 100755 luit/Makefile.am mode change 100644 => 100755 oclock/Makefile.am mode change 100644 => 100755 x11perf/Makefile.am mode change 100644 => 100755 xbiff/Makefile.am mode change 100644 => 100755 xclipboard/Makefile.am mode change 100644 => 100755 xclock/Makefile.am mode change 100644 => 100755 xconsole/Makefile.am mode change 100644 => 100755 xcursorgen/Makefile.am mode change 100644 => 100755 xeyes/Makefile.am mode change 100644 => 100755 xfd/Makefile.am mode change 100644 => 100755 xfontsel/Makefile.am mode change 100644 => 100755 xload/Makefile.am mode change 100644 => 100755 xlogo/Makefile.am mode change 100644 => 100755 xmag/Makefile.am mode change 100644 => 100755 xmessage/Makefile.am create mode 100644 xorg-x11-apps.manifest mode change 100644 => 100755 xpr/Makefile.am mode change 100644 => 100755 xvidtune/Makefile.am mode change 100644 => 100755 xwd/Makefile.am mode change 100644 => 100755 xwud/Makefile.am diff --git a/COPYING b/COPYING new file mode 100644 index 0000000..49083e8 --- /dev/null +++ b/COPYING @@ -0,0 +1,686 @@ +[x11-apps/xbiff] +Copyright (c) 1988 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. + +[x11-apps/luit] +Copyright (c) 2001 by Juliusz Chroboczek +Copyright (c) 2002 by Tomohiro KUBOTA + +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 +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. + +[x11-apps/xwd] +Copyright 1987, 1988, 1993, 1994, 1996, 1998 The Open Group +Copyright 1994 Hewlett-Packard Co. + +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 2007 Kim woelders + +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. + +[x11-apps/oclock] +Copyright 1989, 1993, 1998 The Open Group + +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) 1994 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 CONNEC- +TION 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 deal- +ings in this Software without prior written authorization from the X Consor- +tium. + +[x11-apps/xcursorgen] +Copyright (C) 2002 Manish Singh + +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 Manish Singh not be used in +advertising or publicity pertaining to distribution of the software without +specific, written prior permission. Manish Singh makes no +representations about the suitability of this software for any purpose. It +is provided "as is" without express or implied warranty. + +MANISH SINGH DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO +EVENT SHALL MANISH SINGH 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. + +[x11-apps/x11perf] +Copyright 1988, 1989 by Digital Equipment Corporation, Maynard, Massachusetts. + + 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 (c) 1993 by Hewlett-Packard Company + +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 the 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. + +[x11-apps/xfd] +Copyright 1989, 1993, 1994, 1998 The Open Group + +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. + +[x11-apps/xpr] +This is a stub file. This package has not yet had its complete licensing +information compiled. Please see the individual source files for details on +your rights to use and modify this software. + +Please submit updated COPYING files to the Xorg bugzilla: + +https://bugs.freedesktop.org/enter_bug.cgi?product=xorg + +All licensing questions regarding this software should be directed at the +Xorg mailing list: + +http://lists.freedesktop.org/mailman/listinfo/xorg + +[x11-apps/xlogo] +Copyright 1988, 1990, 1993 1994, 1998 The Open Group +Copyright 2004 Roland Mainz + +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. + +[x11-apps/xconsole] +Copyright 1990, 1994, 1998 The Open Group + +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. + +[x11-apps/xload] +Copyright (c) 1989 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 (c) 2000, Oracle and/or its affiliates. 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 (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. + + + ---------------------------------------- + +get_rload.c (rwhod support) was added in 2001 by the XFree86 Project without +a copyright notice, and is thus covered by this general notice: + +XFree86 code without an explicit copyright is covered by the following copy- +right/license: + +Copyright (C) 1994-2003 The XFree86 Project, 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 fur- +nished 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 CON- +NECTION 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 deal- +ings in this Software without prior written authorization from the XFree86 +Project. + +[x11-apps/xmessage] +Copyright (c) 1988, 1991, 1994 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 (C) 2003 The XFree86 Project, 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 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 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. + +[x11-apps/xeyes] +Copyright (c) 1991 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. + +[x11-apps/xclock] +Copyright 1987, 1988, 1994, 1998 The Open Group + +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 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts. + + 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 (c) 2004, Oracle and/or its affiliates. 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 (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. + +[x11-apps/xwud] +Copyright 1985, 1986, 1988, 1998 The Open Group + +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. + +[x11-apps/xmag] +Copyright 1989, 1990, 1991, 1993, 1994, 1998 The Open Group + +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) 1999 The XFree86 Project, 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 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 +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. + +[x11-apps/xvidtune] +Copyright (c) 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. + +[x11-apps/xclipboard] +Copyright 1989, 1994, 1998 The Open Group + +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. + +[x11-apps/xfontsel] +Copyright (c) 1985-1989, 1994 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 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts. + + 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. + + diff --git a/debian/README.source b/debian/README.source deleted file mode 100644 index 34ab4bf..0000000 --- a/debian/README.source +++ /dev/null @@ -1,73 +0,0 @@ ------------------------------------------------------- -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 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. - -quilt is actually invoked by the Debian X packaging through a larger -set of scripts called XSFBS. XSFBS brings some other X specific -features such as managing dependencies and conflicts due to the video -and input driver ABIs. -XSFBS itself is maintained in a separate repository at - git://git.debian.org/pkg-xorg/xsfbs.git -and it is pulled inside the other Debian X repositories when needed. - -The XSFBS patching system requires a build dependency on quilt. Also -a dependency on $(STAMP_DIR)/patch has to be added to debian/rules -so that the XSFBS patching occurs before the actual build. So the -very first target of the build (likely the one running autoreconf) -should depend on $(STAMP_DIR)/patch. It should also not depend on -anything so that parallel builds are correctly supported (nothing -should probably run while patching is being done). And finally, the -clean target should depend on the xsfclean target so that patches -are unapplied on clean. - -When the upstream sources contain some DFSG-nonfree files, they are -listed in text files in debian/prune/ in the "debian-*" branch of -the Debian repository. XSFBS' scripts then take care of removing -these listed files during the build so as to generate a modified -DFSG-free .orig.tar.gz tarball. diff --git a/debian/changelog b/debian/changelog deleted file mode 100644 index fb23e7c..0000000 --- a/debian/changelog +++ /dev/null @@ -1,524 +0,0 @@ -x11-apps (7.5-2slp2+6) unstable; urgency=low - - * [x11-apps] Fix xbitmap, xcalc and xclock for gcc 4.5 - * Git: 165.213.180.234:slp/pkgs/xorg/app/x11-apps - * Tag: x11-apps_7.5-2slp2+6 - - -- Sung-Jin Park Tue, 29 Mar 2011 15:28:20 +0900 - -x11-apps (7.5-2slp2+5) unstable; urgency=low - - * [xwd] block the check of multivis - * Git: 165.213.180.234:slp/pkgs/xorg/app/x11-apps - * Tag: x11-apps_7.5-2slp2+5 - - -- SooChan Lim Mon, 07 Mar 2011 15:10:39 +0900 - -x11-apps (7.5-1slp2+5) unstable; urgency=low - - * [X11R7.6] upgrade package - * Git: 165.213.180.234:slp/pkgs/xorg/app/x11-apps - * Tag: x11-apps_7.5-1slp2+5 - - -- SooChan Lim Tue, 11 Jan 2011 14:44:46 +0900 - -x11-apps (7.5+5) unstable; urgency=low - - [ Julien Cristau ] - * Autoreconf xedit with the patch from 7.5+3 applied. - Really closes: #569430. - - [ Brice Goglin ] - * Add missing file renames to 01_xedit_mkdir_races.diff. - * Bump Standards-Version to 3.8.4, no changes. - - -- Brice Goglin Sun, 21 Mar 2010 10:18:52 +0100 - -x11-apps (7.5+4) unstable; urgency=low - - [ Steve Langasek ] - * Since we have xedit again, drop the conffile removal handling from the - maintainer scripts. LP: #518045. - - -- Julien Cristau Sat, 13 Mar 2010 00:25:15 +0100 - -x11-apps (7.5+3) unstable; urgency=low - - * Add 01_xedit_mkdir_races.diff to fix FTBFS, closes: #569430. - - -- Brice Goglin Tue, 23 Feb 2010 21:51:06 +0100 - -x11-apps (7.5+2) unstable; urgency=low - - [ Brice Goglin ] - * Update debian/copyright and package description according - to ico and xedit additions. - * x11pref 1.5.1. - * xbiff 1.0.2. - * xcalc 1.0.3. - * xeyes 1.1.0. - * xlogo 1.0.2. - - [ Julien Cristau ] - * Rename the build directory to not include DEB_BUILD_GNU_TYPE for no - good reason. Thanks, Colin Watson! - * Remove myself from Uploaders - - -- Brice Goglin Sun, 07 Feb 2010 11:22:59 +0100 - -x11-apps (7.5+1) unstable; urgency=low - - [ Julien Cristau ] - * Update xload config.{guess,sub}, adding avr32 support (closes: #536410) - * Improve the long description using patch from Justin B Rye (closes: - #549457). Thanks! - - [ Brice Goglin ] - * Add ico 1.0.2, closes: #518383. - * bitmap 1.0.4. - * xclipboard 1.1.0. - + Add UTF8 support, closes: #489998. - * xclock 1.0.4. - + Drop 06_xclock_geometry.diff, applied upstream. - * xcursorgen 1.0.3. - * xeyes 1.0.991. - * xgc 1.0.2. - * xmag 1.0.3. - * xman 1.1.0. - * xwd 1.0.3. - + Drop 01_xwd_do_not_spew_usage_on_connection_error.diff, applied upstream. - * xwud 1.0.2. - * Refresh patches. - - -- Brice Goglin Sun, 06 Dec 2009 12:23:46 +0100 - -x11-apps (7.4-2slp2+2) unstable; urgency=low - - * Fix Git information and modify maintainer infomation - * Git: 165.213.180.234:/git/slp/pkgs/xorg/app/x11-apps - * Tag: x11-apps_7.4-2slp2+2 - - -- Sung-Jin Park Thu, 02 Dec 2010 10:35:26 +0900 - -x11-apps (7.4-2slp2+1) unstable; urgency=low - - * Fix xwd.c (Do not get multivisual) by request from soolim - * Git: 165.213.180.234:/git/slp2.0/slp2.0-pkgs/X11 - * Tag: x11-apps_7.4-2slp2+1 - - -- Sung-Jin Park Fri, 14 May 2010 11:08:32 +0900 - -x11-apps (7.4-2slp2) unstable; urgency=low - - * Update maintainer - * Git: 165.213.180.234:/git/slp2.0/slp2.0-pkgs/X11 - * Tag: x11-apps_7.4-2slp2 - - -- Sung-Jin Park Wed, 21 Apr 2010 10:16:58 +0900 - -x11-apps (7.4-1slp2) unstable; urgency=low - - * Change revision - - -- Sung-Jin Park Thu, 25 Mar 2010 17:30:00 +0900 - -x11-apps (7.4+4) unstable; urgency=low - - * Fix debian/control to replace xmodmap and xsetroot - - -- Sung-Jin Park Tue, 08 Dec 2009 19:58:50 +0900 - -x11-apps (7.4+3) unstable; urgency=low - - * Import debian package - - -- Sung-Jin Park Tue, 08 Dec 2009 18:51:07 +0900 - -x11-apps (7.4+2) unstable; urgency=low - - * Add xedit 1.1.2, closes: #499085, #505064. - * Bump Standards-Version to 3.8.2, no changes. - - -- Brice Goglin Mon, 27 Jul 2009 18:55:03 +0200 - -x11-apps (7.4+1) unstable; urgency=low - - [ Brice Goglin ] - * xwd 1.0.2. - - [ Julien Cristau ] - * Add support for parallel=n in DEB_BUILD_OPTIONS, and for actually building - the apps in parallel. Install is still sequential, at least for now. - * xload 1.0.2 - + drop patch 04_SECURITY_setuid.diff, included upstream. - * Add README.source, bump Standards-Version to 3.8.1. - * Fix patches to apply with -p1; silences lintian. - - -- Julien Cristau Wed, 10 Jun 2009 15:30:56 +0200 - -x11-apps (7.3+4) unstable; urgency=low - - * Remove xedit from the package, it's unmaintained and broken - (closes: #321434). - * Remove xedit's conffiles on upgrade. - - -- Julien Cristau Tue, 23 Sep 2008 00:24:45 +0200 - -x11-apps (7.3+3) unstable; urgency=low - - * xclock: Fix geometry computation (closes: #443227). - * debian/rules, xsfbs: fix rules dependencies. - - -- Julien Cristau Sat, 02 Aug 2008 18:45:33 +0200 - -x11-apps (7.3+2) unstable; urgency=low - - [ Julien Cristau ] - * Re-add bitmap (closes: #445097). - * x11perf 1.5 - * drop -1 debian revisions from build-deps - * bump Standards-Version to 3.7.3 - * don't call dh_makeshlibs - * drop XS- prefix from Vcs-* control fields - - [ Brice Goglin ] - * Re-add xgc (closes: #460453). - - -- Julien Cristau Tue, 10 Jun 2008 16:35:24 +0200 - -x11-apps (7.3+1) unstable; urgency=low - - [ Julien Cristau ] - * xclock 1.0.3. - + adds documentation for the -face command-line option (closes: #224402) - * xman 1.0.3. - * xmag 1.0.2. - + manpage fixed (closes: #180712). - * Pass --with-sysmanpath option to configure so xman looks for manpages in - the right place (closes: #156497). - - [ Brice Goglin ] - * Add upstream URL to debian/copyright. - * Add menu entries for oclock, xbiff, xcalc, xclipboard, xclock, xconsole, - xditview, xeyes, xedit, xload, xlogo, xmag, xman and xwd. - * xcalc 1.0.2. - * xconsole 1.0.3. - * xcursorgen 1.0.2. - * Add myself to Uploaders, and remove Branden with his permission. - - -- Brice Goglin Fri, 14 Sep 2007 23:14:57 +0200 - -x11-apps (0.1) experimental; urgency=low - - [ Timo Aaltonen ] - * Split xbase-clients, new versioning. - * Included packages: - - oclock 1.0.1 - - x11perf 1.4.1 - - xbiff 1.0.1 - - xcalc 1.0.1 - - xclipboard 1.0.1 - - xclock 1.0.2 - - xconsole 1.0.2 - - xcursorgen 1.0.1 - - xditview 1.0.1 - - xedit 1.0.2 - - xeyes 1.0.1 - - xload 1.0.1 - - xlogo 1.0.1 - - xmag 1.0.1 - - xman 1.0.2 - - xmore 1.0.1 - - xwd 1.0.1 - - xwud 1.0.1 - * debian/control: - - Rename Package and Source. - - Remove unnecessary Build-Deps. - - Split the Build-Dep line into multiple lines - - Clean up the description. - - Replaces: xbase-clients (<= 1:7.2.ds2-3) to make upgrades smoother. - - C/R: to work around old Ubuntu - packaging. - * debian/copyright: Leave only copyright notices that affect this package. - * debian/x11-apps.dirs: Remove. - * debian/x11-apps.install, rules: Edit to reflect new packaging. - * debian/local/: Remove. - * debian/patches: - - Delete patches which do not concern this package. - - Edit 01_xwd_do_not_spew_usage_on_connection_error.diff to patch only - xwd. - - -- Julien Cristau Sun, 27 May 2007 19:30:49 +0200 - -xbase-clients (1:7.2.ds2-3) unstable; urgency=low - - * Add patch to xsm's configure.ac to not override the user-provided RSH - variable, so we can drop the openssh build-dep (closes: #362787). - - -- Julien Cristau Wed, 09 May 2007 16:26:06 +0200 - -xbase-clients (1:7.2.ds2-2) unstable; urgency=low - - [ Julien Cristau ] - * Autoreconf with patches applied. - * Add build-dep on libxinerama-dev, so xdpyinfo is built with support for - the xinerama extension. - * Add patch 17_xmodmap_manpage.diff to make xmodmap(1) refer to - /usr/share/X11/XKeysymDB instead of /usr/lib/X11/XKeysymDB - (closes: #394077). Thanks, Joachim Breitner! - * Document each app's build-dependencies in debian/control for reference. - * Update long description: XKB configuration data is in xkb-data, bitmap - images in xbitmaps. - * Add XS-Vcs-* in debian/control. - * Upload to unstable. - - [ Brice Goglin ] - * Restore Depends: on cpp (got lost during modularization) - since xrdb needs it to process .Xdefaults. - Thanks Marcus C. Gottwald (closes: #413298). - * Remove mention of xf86cfg in package description. - Thanks Daniel Leidert (really closes: #362066). - - -- Julien Cristau Fri, 20 Apr 2007 22:00:14 +0200 - -xbase-clients (1:7.2.ds2-1) experimental; urgency=low - - * Update to xrandr 1.2.0. - * Build-dep on libxrandr 1.2.0. - * New patch to install beforelight's app-defaults file correctly. - - -- Julien Cristau Mon, 19 Feb 2007 10:46:11 +0100 - -xbase-clients (1:7.2.ds1-2) experimental; urgency=low - - * Build-dep on libpng12-dev instead of libpng-dev. xcursorgen requires - libpng12.pc, which is not available in libpng14-dev, despite it providing - libpng-dev and libpng12-dev, *sigh*. - - -- Julien Cristau Mon, 12 Feb 2007 05:35:18 +0100 - -xbase-clients (1:7.2.ds1-1) experimental; urgency=low - - * Patch setxkbmap(1) to refer to the correct location for xkb files, thanks - to Celejar for noticing. - * Update to appres 1.0.1. - * Update to beforelight 1.0.2. - * Update to bitmap 1.0.3. - * Update to editres 1.0.3. - * Update to setxkbmap 1.0.3. - * Update to xauth 1.0.2. - * Update to xdbedizzy 1.0.2. - + patch 16_xdbedizzy_fix_crash.diff dropped, included upstream. - + patch pkgconfig_naughtiness dropped, now unnecessary. - * Update to xedit 1.0.2. - * Update to xev 1.0.2. - * Update to xf86dga 1.0.2. - + relevant part dropped from 14_SECURITY_setuid.diff. - * Update to xfontsel 1.0.2. - * Update to xinit 1.0.3. - + relevant part dropped from 14_SECURITY_setuid.diff. - * Update to xkbcomp 1.0.3. - * Update to xlsfonts 1.0.2. - * Update to xmodmap 1.0.2. - * Update to xprop 1.0.2. - * Update to xrdb 1.0.3. - * Update to xsetpointer 1.0.1. - + Add build-dep on x11proto-input-dev >= 1.4. - * Update to xtrap 1.0.2. - * Modify patch 08_xlsfonts_do_not_spew_usage_on_connection_error.diff to - apply to xprop, xwd and xwininfo as well, since they all use a copy of - dsimple.c. - * Change my email address in debian/control. - - -- Julien Cristau Sun, 11 Feb 2007 15:42:54 +0100 - -xbase-clients (1:7.1.ds1-2) unstable; urgency=low - - * Add patch by Eugene Konev to fix xdbedizzy crash (closes: #365291). - - -- Julien Cristau Fri, 12 Jan 2007 17:54:07 +0100 - -xbase-clients (1:7.1.ds1-1) unstable; urgency=low - - * Add patch by Eugene Konev to fix xmore crash (closes: #365292). - * Remove version string from subdirectory names, thus new tarball, and - update patches to match. - * Define MANCONF when configuring xman, to make it look for man pages in the - right path instead of in /usr/man (closes: 404757). - * Remove Fabio from Uploaders with his permission, and add myself. - - -- Julien Cristau Mon, 8 Jan 2007 00:50:31 +0100 - -xbase-clients (1:7.1.ds-3) unstable; urgency=low - - [ Branden Robinson ] - * Patch xprop to stop segfaulting when deleted atoms are requested. - Committed upstream as git 47514347db811d002e7f3ca05d390565bc3ee5e5. - (Closes: #197526) - - [ Denis Barbier ] - * Acknowledge NMU, thanks dann frazier. (closes: #363198) - * The rsh program is required to build xsm. Replace Build-Depends: ssh | rsh - by Build-Depends: openssh-client | ssh - * Fix debian/rules so that xkbcomp look for XKB files in /usr/share/X11/xkb. - Thanks Steinar H. Gunderson (closes: #381884) - All XKB related programs share now the same build system, so factor - commands in debian/rules. - - -- Denis Barbier Sat, 12 Aug 2006 15:08:47 +0200 - -xbase-clients (1:7.1.ds-2.1) unstable; urgency=low - - * Non-maintainer upload. - * Fix implicit pointer conversion in xconsole.c (closes: #363198) - (Was fixed in 1:7.1.ds-1.1 NMU, but silently dropped in 1:7.1.ds-2 MU) - - -- dann frazier Sat, 29 Jul 2006 13:59:40 -0600 - -xbase-clients (1:7.1.ds-2) unstable; urgency=high - - * Security update. Fix for setuid privledge escalation vulernabilities in - xinit, xf86dga, and xload. See - http://lists.freedesktop.org/archives/xorg/2006-June/016146.html for the - full advisory. This package applies the patches for the 7.0 release of - those apps. - - -- David Nusinow Fri, 30 Jun 2006 01:10:17 -0400 - -xbase-clients (1:7.1.ds-1) unstable; urgency=low - - [ Steve Langasek ] - * Drop broken build-dependency on xprint-utils, no thanks to anonymous - someone. - * Pass --disable-xprint to invocations of configure instead, which is - the real fix for the symptoms described: we want the xbase-clients - package to consistently build *without* xprint support, instead of - autodetecting (and possibly failing) based on whether libxp-dev is - installed. Properly closes: #366275. - * Also call PKG_PROG_PKG_CONFIG explicitly from xdbebizzy's - configure.ac, since otherwise --disable-xprint leaves us without - PKG_CONFIG defined. - - [ David Nusinow ] - * This update should include all the apps released with X11R7.1. Version the - package to match this. - * Update bitmap to 1.0.2 - * Update xcursorgen to 1.0.1 - * Autoreconf everything in order to ensure that manpages have the proper - section - * Update 11_xkb_documentation_updates.diff to not use __manpagesuffix__ - imakeism - * Bump standards version to 3.7.2.0 - * Bump debhelper compat to 5 - - -- David Nusinow Sun, 11 Jun 2006 21:51:54 -0400 - -xbase-clients (1:7.0.1-2) unstable; urgency=low - - * Add xprint-utils to build-depends. Thanks anonymous someone. - (closes: #366275) - - -- David Nusinow Sun, 14 May 2006 22:57:13 -0400 - -xbase-clients (1:7.0.1-1) unstable; urgency=low - - * Move xserverrc back to this package from xserver-xorg-core. Thanks - Benjamin Mesing. (closes: #365022) - * Update smproxy to version 1.0.2 - * Update xhost to version 1.0.1 - * Update fstobdf to version 1.0.2 - * Update xdriinfo to version 1.0.1 - * Update xinit to version 1.0.2 - * Remove obsolete patch 03_startx_dummy.diff - * Update xkbevd to version 1.0.2 - * Update xman to version 1.0.2 - * Update xrefresh to version 1.0.2 - * Update xwininfo to version 1.0.2 - * Update xclock to version 1.0.2 - * Update xconsole to version 1.0.2 - * Update xkbcomp to version 1.0.2 - * Update xmodmap to version 1.0.1 - * Update xrandr to version 1.0.2 - * Update xrdb to version 1.0.2 - * Update xset to version 1.0.2 - - -- David Nusinow Tue, 2 May 2006 22:58:57 -0400 - -xbase-clients (1:7.0.0-5) unstable; urgency=low - - * Patch startx so that it points to /etc/X11/xinit for xserverrc and - xinitrc. Thanks Vasilis Vasaitis and Bastian Kleineidam. - * Move xserverrc back to /etc/X11/xinit - * Use --list-missing with dh_install - - -- David Nusinow Tue, 25 Apr 2006 21:37:22 -0400 - -xbase-clients (1:7.0.0-4) unstable; urgency=low - - * Add quilt to build-depends. - - -- David Nusinow Sat, 15 Apr 2006 19:49:02 -0400 - -xbase-clients (1:7.0.0-3) unstable; urgency=low - - * Remove mention of xorgconfig and xorgcfg in package description. Thanks - Daniel Leidert. (closes: #362066) - * Add 12_startx_paths.diff to use X11R7 paths for startx and xinit. Thanks - Arjan Opmeer. (closes: #357713) - * Add libxi-dev to build-depends - * Make xbase-clients explicitly pre-depend on x11-common >= 1:7.0.0, rather - than implicitly. Thanks Vasilis Vasaitis. (closes: #357713) - - -- David Nusinow Thu, 13 Apr 2006 22:39:46 -0400 - -xbase-clients (1:7.0.0-2) unstable; urgency=low - - * Upload to unstable - * Add build-depends on libgl1-mesa-dev, versioned build-depneds on - libdrender-dev, and re-version build-depend on libxft-dev. Thanks Frank - Lichtenheld. (closes: #361821) - - -- David Nusinow Mon, 10 Apr 2006 19:49:23 -0400 - -xbase-clients (1:7.0.0-1) experimental; urgency=low - - [ Denis Barbier ] - * Set XKB base path to /usr/share/X11/xkb. - - [ David Nusinow ] - * Update to x11perf 1.4.1 and setxkbmap 1.0.2 upstream releases - * Bump version number to match upstream's current katamari release - - -- David Nusinow Thu, 16 Mar 2006 23:06:15 -0500 - -xbase-clients (1:1.0.1-2) experimental; urgency=low - - * Add an empty /var/lib/xkb directory so that the server loads the correct - keymaps. Thanks Silvestre Zabala, Eugene Konev, and Daniel Stone. - (closes: #354130) - * Port patches from trunk - + general/014_startx_hostname_fix.diff - + general/015_startx_dummy_fix.diff - + general/073_xev_flush_standard_output.diff - + general/025c_bitmap_manpage_typo.diff - + general/025d_xedit_manpage_typos.diff - + general/025e_xvinfo_manpage_typo.diff - + general/099r_xlsfonts_do_not_spew_usage_on_connection_error.diff - + debian/902_debian_startx_manpage.diff - + debian/916_add_XKBPATH_env_variable.diff - + general/051_xkb_documentation_updates.diff - * Suggest mesa-utils, where glxinfo and glxgears have been moved. - Thanks Mike Hommey. (closes: #354246) - - -- David Nusinow Sat, 4 Mar 2006 18:59:20 -0500 - -xbase-clients (1:1.0.1-1) experimental; urgency=low - - [ David Nusinow ] - * First modular upload to Debian - - [ Eugene Konev ] - * Divide packages that we process in debian/rules by category so we can pass - the xkb packages the proper configure flags - - -- David Nusinow Sun, 19 Feb 2006 19:46:46 -0500 diff --git a/debian/compat b/debian/compat deleted file mode 100644 index 7ed6ff8..0000000 --- a/debian/compat +++ /dev/null @@ -1 +0,0 @@ -5 diff --git a/debian/control b/debian/control deleted file mode 100644 index c9f2074..0000000 --- a/debian/control +++ /dev/null @@ -1,69 +0,0 @@ -Source: x11-apps -Section: x11 -Priority: optional -Maintainer: Sung-Jin Park , Sangjin Lee , Debian X Strike Force -Uploaders: SooChan Lim , Sung-Jin Park , David Nusinow , Brice Goglin -Build-Depends: debhelper (>= 5.0.0), pkg-config, libpng12-dev, libx11-dev (>= 2:1.0.0), libxaw7-dev (>= 1:1.0.1), libxcursor-dev (>= 1.1.5.2), libxext-dev (>= 1:1.0.0), libxft-dev (>= 2.1.8.2-6), libxkbfile-dev (>= 1:1.0.1), libxmuu-dev (>= 1:1.0.1), libxrender-dev (>= 1:0.9.0.2-2), libxt-dev (>= 1:1.0.0), xbitmaps, quilt, libxmu-dev -# Reasons for build-depends: -# debhelper for the packaging, pkg-config needed by configure scripts -# Individual apps: -# bitmap: libx11-dev, libxmu-dev, xbitmaps, libxt-dev -# ico: libx11-dev -# oclock: libx11-dev, libxmu-dev, libxext-dev -# x11perf: libx11-dev, libxmuu-dev, libxrender-dev, libxft-dev, libxext-dev -# xbiff: xbitmaps, libxext-dev -# xcalc: libxt-dev, libxaw7-dev -# xclipboard: libxt-dev -# xclock: libx11-dev, libxaw7-dev, libxft-dev, libxkbfile-dev, libxt-dev -# xconsole: libxt-dev, libxaw7-dev -# xcursorgen: libx11-dev, libxcursor-dev, libpng12-dev -# xditview: libxaw7-dev, libxt-dev -# xedit: libxaw7-dev, libxt-dev -# xeyes: libx11-dev, libxt-dev, libxext-dev, libxmu-dev -# xgc: libxt-dev, libxmu-dev -# xload: libxaw7-dev, libxt-dev -# xlogo: libxaw7-dev, libxrender-dev, libxft-dev, libxext-dev, libxt-dev -# xmag: libxaw7-dev, libxt-dev -# xman: libxaw7-dev, libxt-dev -# xmore: libxaw7-dev, libxt-dev -# xwd: libx11-dev -# xwud: libx11-dev -Standards-Version: 3.8.4 -Vcs-Git: git://git.debian.org/git/pkg-xorg/app/x11-apps -Vcs-Browser: http://git.debian.org/?p=pkg-xorg/app/x11-apps.git - -Package: x11-apps -Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends} -#Depends: ${shlibs:Depends}, ${misc:Depends}, cpp -Pre-Depends: x11-common (>= 1:7.0.0) -Suggests: mesa-utils -Conflicts: bitmap, oclock, x11perf, xbiff, xcalc, xclipboard, xclock, xconsole, xcursorgen, xditview, xeyes, xgc, xload, xlogo, xmag, xman, xmore, xwd, xwud -Replaces: xbase-clients (<= 1:7.2.ds2-3), bitmap, oclock, x11perf, xbiff, xcalc, xclipboard, xclock, xconsole, xcursorgen, xditview, xeyes, xgc, xload, xlogo, xmag, xman, xmore, xwd, xwud -Description: X applications - This package provides a miscellaneous assortment of X applications - that ship with the X Window System, including: - - atobm, bitmap, and bmtoa, tools for manipulating bitmap images; - - ico, a demo program animating polyhedrons; - - oclock and xclock, graphical clocks; - - xbiff, a tool which tells you when you have new email; - - xcalc, a scientific calculator desktop accessory; - - xclipboard, a tool to manage cut-and-pasted text selections; - - xconsole, which monitors system console messages; - - xcursorgen, a tool for creating X cursor files from PNGs; - - xditview, a viewer for ditroff output; - - xedit, a simple text editor for X; - - xeyes, a demo program in which a pair of eyes track the pointer; - - xgc, a graphics demo; - - xload, a monitor for the system load average; - - xlogo, a demo program that displays the X logo; - - xmag, which magnifies parts of the X screen; - - xman, a manual page browser; - - xmore, a text pager; - - xwd, a utility for taking window dumps ("screenshots") of the X session; - - xwud, a viewer for window dumps created by xwd; - - Xmark, x11perf, and x11perfcomp, tools for benchmarking graphical - operations under the X Window System; - . - The xbiff, xcalc, xconsole and xman programs use bitmap images provided - by the xbitmaps package. diff --git a/debian/copyright b/debian/copyright deleted file mode 100644 index 909ee70..0000000 --- a/debian/copyright +++ /dev/null @@ -1,729 +0,0 @@ -The contents of this package were downloaded from -http://xorg.freedesktop.org/releases/individual/app/ -It contains the bitmap, ico, oclock, x11perf, xbiff, xcalc, xclipboard, -xclock, xcursorgen, xconsole, xditview, xedit, xeyes, xgc, xload, xlogo, -xmag, xman, xmore, xmd and xwd applications. - -bitmap: - Copyright 1988, 1993, 1998 The Open Group - - 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. - -ico: - Copyright (c) 1987, 1994 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 1987 by Digital Equipment Corporation, Maynard, Massachusetts. - - 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 2005 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 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. - -oclock: - Copyright 1989, 1998 The Open Group - - 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. - -x11perf: - Copyright 1988, 1989 by Digital Equipment Corporation, Maynard, Massachusetts. - - 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. - -xbiff: - Copyright (c) 1988 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. - -xcalc: - Copyright (c) 1989 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. - - */ - /* $XFree86$ */ - - /* - * xcalc.c - a hand calculator for the X Window system - * - * Original Author: John H. Bradley, University of Pennsylvania - * (bradley@cis.upenn.edu) March, 1987 - * RPN mode added and port to X11 by Mark Rosenstein, MIT Project Athena - * Rewritten to be an Xaw and Xt client by Donna Converse, MIT X Consortium - */ - -xclipboard: - Copyright 1989, 1998 The Open Group - - 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. - * * - * Author: Ralph Swick, DEC/Project Athena - * Updated for R4: Chris D. Peterson, MIT X Consortium. - * Reauthored by: Keith Packard, MIT X Consortium. - -xclock: - * xclock -- Hacked from Tony Della Fera's much hacked clock program. - * - * "-strftime" option added by George Belotsky, Open Light Software Inc. - */ - - /* - Copyright 1989, 1998 The Open Group - - 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. - -xconsole: - Copyright 1990, 1998 The Open Group - - 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. - * - * Author: Keith Packard, MIT X Consortium - */ - -xcursorgen: - Copyright (C) 2002 Manish Singh - - 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 Manish Singh not be used in - advertising or publicity pertaining to distribution of the software without - specific, written prior permission. Manish Singh makes no - representations about the suitability of this software for any purpose. It - is provided "as is" without express or implied warranty. - - MANISH SINGH DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, - INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO - EVENT SHALL MANISH SINGH 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. - -xditview: - Copyright (c) 1991 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. - -xedit: - Copyright (c) 1987, 1993 - The Regents of the University of California. 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. All advertising materials mentioning features or use of this software - must display the following acknowledgement: - This product includes software developed by the University of - California, Berkeley and its contributors. - 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. - - - Copyright (c) 1994 - The Regents of the University of California. All rights reserved. - - This code is derived from software contributed to Berkeley by - Jan-Simon Pendry. - - 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. All advertising materials mentioning features or use of this software - must display the following acknowledgement: - This product includes software developed by the University of - California, Berkeley and its contributors. - 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. - - - COPYRIGHT 1987 - DIGITAL EQUIPMENT CORPORATION - MAYNARD, MASSACHUSETTS - ALL RIGHTS RESERVED. - - THE INFORMATION IN THIS SOFTWARE IS SUBJECT TO CHANGE WITHOUT NOTICE AND - SHOULD NOT BE CONSTRUED AS A COMMITMENT BY DIGITAL EQUIPMENT CORPORATION. - DIGITAL MAKES NO REPRESENTATIONS ABOUT THE SUITABILITY OF THIS SOFTWARE FOR - ANY PURPOSE. IT IS SUPPLIED "AS IS" WITHOUT EXPRESS OR IMPLIED WARRANTY. - - IF THE SOFTWARE IS MODIFIED IN A MANNER CREATING DERIVATIVE COPYRIGHT RIGHTS, - APPROPRIATE LEGENDS MAY BE PLACED ON THE DERIVATIVE WORK IN ADDITION TO THAT - SET FORTH ABOVE. - - - 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 Equipment Corporation not be - used in advertising or publicity pertaining to distribution of the software - without specific, written prior permission. - - - Copyright 2004 Roland Mainz - - 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) 1999-2002 by The XFree86 Project, Inc. - - 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 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 (c) 2007 Paulo Cesar Pereira de Andrade - - 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. - -xeyes: - Copyright (c) 1991 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. - -xgc: - Copyright (c) 1991 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. - -xload: - Copyright (c) 1989 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. - -xlogo: - Copyright 1989, 1998 The Open Group - - 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. - -xmag: - Copyright 1991, 1998 The Open Group - - 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. - -xman: - Copyright (c) 1987, 1988 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. - - Author: Chris D. Peterson, MIT Project Athena - Created: October 22, 1987 - -xmore: - Copyright 2004 Roland Mainz - - 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. - -xwd: - Copyright 1987, 1998 The Open Group - - 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. - -xwud: - Copyright 1985, 1986, 1988, 1998 The Open Group - - 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. diff --git a/debian/patches/01_xedit_mkdir_races.diff b/debian/patches/01_xedit_mkdir_races.diff deleted file mode 100644 index 4a012ca..0000000 --- a/debian/patches/01_xedit_mkdir_races.diff +++ /dev/null @@ -1,2588 +0,0 @@ -Combination of two upstream patches (post 1.1.2) to fix #569430 - -From 0ab2815743d89b1cd283abaf4d2cb77fed4a2df4 Mon Sep 17 00:00:00 2001 -From: Peter Breitenlohner -Date: Sun, 09 Nov 2008 13:24:10 +0000 -Subject: avoid race condition for parallel jobs - -From cfc78a1c2452362a5e7c88ed239c9d7ef0240a4d Mon Sep 17 00:00:00 2001 -From: Peter Breitenlohner -Date: Tue, 11 Nov 2008 09:52:18 +0000 -Subject: reorganize app default files - - -Index: x11-apps/xedit/Makefile.am -=================================================================== ---- x11-apps.orig/xedit/Makefile.am 2010-03-21 10:04:31.000000000 +0100 -+++ x11-apps/xedit/Makefile.am 2010-03-21 10:04:42.000000000 +0100 -@@ -161,33 +161,13 @@ - lisp_re_tests_SOURCES = lisp/re/tests.c - - --# App default files (*.ad) -+# App default files - --APPDEFAULTFILES = \ -+appdefaultdir = @appdefaultdir@ -+appdefault_DATA = \ - app-defaults/Xedit-color \ - app-defaults/Xedit - --if USE_XPRINT --app-defaults/Xedit.ad: -- test -d app-defaults || mkdir app-defaults -- cp $(top_srcdir)/app-defaults/Xedit-xprint.ad app-defaults/Xedit.ad --else --app-defaults/Xedit.ad: -- test -d app-defaults || mkdir app-defaults -- cp $(top_srcdir)/app-defaults/Xedit-noxprint.ad app-defaults/Xedit.ad --endif -- --SUFFIXES = .ad -- --.ad: -- test -d app-defaults || mkdir app-defaults -- cp $< $@ -- --appdefaultdir = @appdefaultdir@ --appdefault_DATA = $(APPDEFAULTFILES) -- --CLEANFILES = $(APPDEFAULTFILES) app-defaults/Xedit.ad -- - lispdir = $(LISPDIR) - dist_lisp_DATA = ${srcdir}/lisp/modules/lisp.lsp \ - ${srcdir}/lisp/modules/xedit.lsp \ -@@ -216,9 +196,9 @@ - appman_PRE = xedit.man - - EXTRA_DIST = \ -- app-defaults/Xedit-color.ad \ -- app-defaults/Xedit-xprint.ad \ -- app-defaults/Xedit-noxprint.ad \ -+ app-defaults/Xedit-color \ -+ app-defaults/Xedit-xprint \ -+ app-defaults/Xedit-noxprint \ - app-defaults/Xedit-sample \ - lisp/README \ - lisp/TODO \ -@@ -246,7 +226,7 @@ - appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@) - - EXTRA_DIST += $(appman_PRE) --CLEANFILES += $(appman_DATA) -+CLEANFILES = $(appman_DATA) - - SED = sed - -@@ -267,7 +247,7 @@ - -e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \ - -e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g' - --SUFFIXES += .$(APP_MAN_SUFFIX) .man -+SUFFIXES = .$(APP_MAN_SUFFIX) .man - - .man.$(APP_MAN_SUFFIX): - sed $(MAN_SUBSTS) < $< > $@ -Index: x11-apps/xedit/configure.ac -=================================================================== ---- x11-apps.orig/xedit/configure.ac 2010-03-21 10:04:31.000000000 +0100 -+++ x11-apps/xedit/configure.ac 2010-03-21 10:04:42.000000000 +0100 -@@ -41,9 +41,12 @@ - AM_CONDITIONAL(USE_XPRINT, test x$enable_xprint = xyes) - if test x$enable_xprint = xyes; then - PKG_CHECK_MODULES(PKGDEPS, xprintutil xp xaw8) -+ print_noprint=xprint - else - PKG_CHECK_MODULES(PKGDEPS, xaw7) -+ print_noprint=noxprint - fi -+AC_CONFIG_LINKS([app-defaults/Xedit:app-defaults/Xedit-$print_noprint]) - - AC_ARG_WITH(lispdir, AS_HELP_STRING([--with-lispdir=PATH], - [Directory to install lisp files (default: $libdir/X11/xedit/lisp)]), -Index: x11-apps/xedit/app-defaults/Xedit-color -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ x11-apps/xedit/app-defaults/Xedit-color 2010-03-21 10:04:31.000000000 +0100 -@@ -0,0 +1,195 @@ -+! $XFree86: xc/programs/xedit/Xedit-color.ad,v 1.14 2002/11/10 23:21:56 paulo Exp $ -+ -+#include "Xedit" -+ -+*background: gray70 -+*foreground: gray15 -+*borderColor: gray40 -+*Command.highlightThickness: 1 -+*Command.backgroundPixmap: gradient:vertical?dimension=18&start=gray90&end=gray65 -+*Command.foreground: gray20 -+*Command.displayList:\ -+foreground gray92;\ -+line 1,0,-2,0;\ -+foreground gray95;\ -+line 2,1,-3,1;\ -+foreground gray74;\ -+segments 3,-3,-4,-3, 2,-4,-3,-4, 1,-6,-2,-6;\ -+point -1,-1;\ -+foreground gray80;\ -+line 0,0,0,-1;\ -+point -1,0 -+ -+*Command.translations: #override \ -+: set-values(1, foreground, gray20, background, rgb:d/5/5) set()\n\ -+Button1: reset() set-values(1, foreground, gray20, background, gray70)\n\ -+: notify() unset() -+ -+*Toggle.foreground: gray30 -+*Toggle.background: gray82 -+*Toggle.borderColor: gray90 -+*Toggle.displayList:\ -+foreground gray75;\ -+segments 0,1,0,-2,-1,1,-1,-2;\ -+foreground gray80;\ -+segments 0,0,-1,0,0,-1,-1,-1;\ -+points 1,1,1,-2,-2,1, -2,-2 -+ -+*bc_label.backgroundPixmap: gradient:vertical?dimension=18&start=gray90&end=gray65 -+*bc_label.displayList:\ -+foreground gray92;\ -+line 1,0,-2,0;\ -+foreground gray95;\ -+line 2,1,-3,1;\ -+foreground gray74;\ -+segments 3,-2,-4,-2, 2,-3,-3,-3, 1,-5,-2,-5 -+*bc_label.foreground: gray20 -+ -+*formWindow.backgroundPixmap: gradient:vertical?dimension=18&start=gray90&end=gray65 -+*formWindow.displayList:\ -+foreground gray92;\ -+line 1,0,-2,0;\ -+foreground gray95;\ -+line 2,1,-3,1;\ -+foreground gray74;\ -+segments 3,-2,-4,-2, 2,-3,-3,-3, 1,-5,-2,-5 -+*formWindow*backgroundPixmap: ParentRelative -+*formWindow*foreground: gray20 -+*formWindow*background: gray74 -+*formWindow.labelWindow.background: gray80 -+*formWindow.labelWindow.displayList:\ -+line-style onoffdash;\ -+foreground gray30;\ -+background gray96;\ -+draw-rect 3,2,15,14;\ -+foreground gray78;\ -+fill-rect 4,3,15,14 -+ -+*dirlabel.foreground: gray20 -+*dirlabel.backgroundPixmap: gradient:vertical?dimension=18&start=gray90&end=gray65 -+*dirlabel.displayList:\ -+foreground gray92;\ -+line 1,0,-2,0;\ -+foreground gray95;\ -+line 2,1,-3,1;\ -+foreground gray74;\ -+segments 3,-2,-4,-2, 2,-3,-3,-3, 1,-5,-2,-5 -+*dirwindow.background: gray96 -+ -+*internalBorderColor: gray40 -+ -+*Text*Text.background: gray96 -+*Text.background: gray96 -+*Text.?.background: gray96 -+*Text*cursorColor: rgb:d/5/5 -+*Text.displayList:\ -+foreground white;\ -+line 1,-1,-2,-1;\ -+foreground gray88;\ -+line 1,0,-2,0 -+ -+*Scrollbar.foreground: rgb:a/5/5 -+*Scrollbar.background: gray60 -+*Text.Scrollbar.background: gray60 -+*Scrollbar.backgroundPixmap: gradient:horizontal?dimension=14&start=gray70&end=gray85 -+*hScrollbar.backgroundPixmap: gradient:vertical?dimension=14&start=gray85&end=gray70 -+*hScrollbar.displayList:\ -+foreground gray85;\ -+segments 1,-1,-2,-1,1,0,-2,0 -+*vScrollbar.displayList:\ -+foreground gray85;\ -+segments 0,1,0,-2,-1,1,-1,-2 -+*Scrollbar.thumb: vlines2 -+*hScrollbar.thumb: hlines2 -+ -+*SimpleMenu*borderWidth: 0 -+*SimpleMenu*backgroundPixmap: xlogo11?foreground=gray90&background=gray88 -+*SimpleMenu*background: gray90 -+*SimpleMenu*foreground: gray20 -+*SimpleMenu.VerticalMargins: 3 -+*SimpleMenu.HorizontalMargins: 3 -+*SimpleMenu.SimpleMenu.VerticalMargins: 3 -+*SimpleMenu.SimpleMenu.HorizontalMargins: 3 -+*SimpleMenu.menuLabel.foreground: rgb:d/5/5 -+*SimpleMenu*displayList:\ -+foreground gray70;\ -+lines +2,-2,-2,-2,-2,+2;\ -+foreground gray95;\ -+lines -2,+1,+1,+1,+1,-2;\ -+foreground gray30;\ -+lines +1,-1,-1,-1,-1,+1;\ -+foreground gray80;\ -+lines -1,+0,+0,+0,+0,-1 -+ -+*TransientShell.backgroundPixmap: xlogo11?foreground=gray90&background=gray87 -+*TransientShell.Form.backgroundPixmap: ParentRelative -+*TransientShell.Form.Label.backgroundPixmap: ParentRelative -+ -+*ispell*Scrollbar.borderColor: gray50 -+*ispell*Scrollbar.displayList: -+*ispell*List.background: gray96 -+*ispell*word.background: gray96 -+*ispell*word.backgroundPixmap: XtUnspecifiedPixmap -+*ispell*word.translations:\ -+: highlight()\n\ -+: reset()\n\ -+: set()\n\ -+: notify() unset()\n -+*ispell*word.displayList: -+*ispell.Form.Form.borderColor: gray80 -+*ispell.Form.Form.displayList: \ -+foreground gray90;\ -+lines +1,-1,-1,-1,-1,+1;\ -+foreground gray30;\ -+lines -1,+0,+0,+0,+0,-1;\ -+foreground gray60;\ -+lines +2,-2,-2,-2,-2,+2 -+*ispell*status.backgroundPixmap: XtUnspecifiedPixmap -+*ispell*status.background: gray96 -+*ispell*terse.justify: right -+*ispell*terse.internalWidth: 10 -+*ispell*terse.background: gray75 -+*ispell*terse.foreground: gray20 -+*ispell*terse.highlightThickness: 0 -+*ispell*terse.displayList:\ -+line-style solid;\ -+foreground gray70;\ -+fill-arc 6,4,14,12;\ -+foreground gray90;\ -+draw-arc 6,4,14,12,45,180;\ -+draw-lines +0,-1,-1,-1,-1,+0;\ -+foreground gray50;\ -+draw-arc 6,4,14,12,225,180;\ -+draw-lines -2,+0,+0,+0,+0,-2;\ -+foreground gray45;\ -+dashes 2,1;\ -+line-style onoffdash;\ -+draw-rect +1,+1,-2,-2 -+*ispell*options.MenuButton.borderColor: gray70 -+*ispell*options.MenuButton.background: gray78 -+*ispell*options.MenuButton.backgroundPixmap: gradient:vertical?dimension=18&start=gray90&end=gray65 -+*ispell*options.MenuButton.displayList:\ -+foreground gray60;\ -+lines +2,-2,-2,-2,-2,+2;\ -+foreground gray95;\ -+lines -3,+1,+1,+1,+1,-3;\ -+foreground gray78;\ -+points -2,+1,+1,-2 -+ -+*tip.foreground: rgb:48/48/00 -+*tip.backgroundPixmap: None -+*tip.borderWidth: 0 -+*tip.rightMargin: 7 -+*tip.bottomMargin: 3 -+*tip.displayList:\ -+foreground rgb:f/e/8;\ -+fill-rect 1,1,-2,-2;\ -+foreground rgb:d/c/6;\ -+draw-segments 0,1,0,-3,1,-2,-3,-2,-2,-3,-2,1,-3,0,1,0;\ -+foreground rgb:a/8/4;\ -+draw-lines 2,-1, -2,-1, -1,-2, -1,2 -+ -+*grip.foreground: gray10 -+*grip.displayList:\ -+foreground gray80;\ -+points 0,0,0,-1,-1,-1,-1,0 -Index: x11-apps/xedit/app-defaults/Xedit-color.ad -=================================================================== ---- x11-apps.orig/xedit/app-defaults/Xedit-color.ad 2010-03-21 10:07:03.000000000 +0100 -+++ /dev/null 1970-01-01 00:00:00.000000000 +0000 -@@ -1,195 +0,0 @@ --! $XFree86: xc/programs/xedit/Xedit-color.ad,v 1.14 2002/11/10 23:21:56 paulo Exp $ -- --#include "Xedit" -- --*background: gray70 --*foreground: gray15 --*borderColor: gray40 --*Command.highlightThickness: 1 --*Command.backgroundPixmap: gradient:vertical?dimension=18&start=gray90&end=gray65 --*Command.foreground: gray20 --*Command.displayList:\ --foreground gray92;\ --line 1,0,-2,0;\ --foreground gray95;\ --line 2,1,-3,1;\ --foreground gray74;\ --segments 3,-3,-4,-3, 2,-4,-3,-4, 1,-6,-2,-6;\ --point -1,-1;\ --foreground gray80;\ --line 0,0,0,-1;\ --point -1,0 -- --*Command.translations: #override \ --: set-values(1, foreground, gray20, background, rgb:d/5/5) set()\n\ --Button1: reset() set-values(1, foreground, gray20, background, gray70)\n\ --: notify() unset() -- --*Toggle.foreground: gray30 --*Toggle.background: gray82 --*Toggle.borderColor: gray90 --*Toggle.displayList:\ --foreground gray75;\ --segments 0,1,0,-2,-1,1,-1,-2;\ --foreground gray80;\ --segments 0,0,-1,0,0,-1,-1,-1;\ --points 1,1,1,-2,-2,1, -2,-2 -- --*bc_label.backgroundPixmap: gradient:vertical?dimension=18&start=gray90&end=gray65 --*bc_label.displayList:\ --foreground gray92;\ --line 1,0,-2,0;\ --foreground gray95;\ --line 2,1,-3,1;\ --foreground gray74;\ --segments 3,-2,-4,-2, 2,-3,-3,-3, 1,-5,-2,-5 --*bc_label.foreground: gray20 -- --*formWindow.backgroundPixmap: gradient:vertical?dimension=18&start=gray90&end=gray65 --*formWindow.displayList:\ --foreground gray92;\ --line 1,0,-2,0;\ --foreground gray95;\ --line 2,1,-3,1;\ --foreground gray74;\ --segments 3,-2,-4,-2, 2,-3,-3,-3, 1,-5,-2,-5 --*formWindow*backgroundPixmap: ParentRelative --*formWindow*foreground: gray20 --*formWindow*background: gray74 --*formWindow.labelWindow.background: gray80 --*formWindow.labelWindow.displayList:\ --line-style onoffdash;\ --foreground gray30;\ --background gray96;\ --draw-rect 3,2,15,14;\ --foreground gray78;\ --fill-rect 4,3,15,14 -- --*dirlabel.foreground: gray20 --*dirlabel.backgroundPixmap: gradient:vertical?dimension=18&start=gray90&end=gray65 --*dirlabel.displayList:\ --foreground gray92;\ --line 1,0,-2,0;\ --foreground gray95;\ --line 2,1,-3,1;\ --foreground gray74;\ --segments 3,-2,-4,-2, 2,-3,-3,-3, 1,-5,-2,-5 --*dirwindow.background: gray96 -- --*internalBorderColor: gray40 -- --*Text*Text.background: gray96 --*Text.background: gray96 --*Text.?.background: gray96 --*Text*cursorColor: rgb:d/5/5 --*Text.displayList:\ --foreground white;\ --line 1,-1,-2,-1;\ --foreground gray88;\ --line 1,0,-2,0 -- --*Scrollbar.foreground: rgb:a/5/5 --*Scrollbar.background: gray60 --*Text.Scrollbar.background: gray60 --*Scrollbar.backgroundPixmap: gradient:horizontal?dimension=14&start=gray70&end=gray85 --*hScrollbar.backgroundPixmap: gradient:vertical?dimension=14&start=gray85&end=gray70 --*hScrollbar.displayList:\ --foreground gray85;\ --segments 1,-1,-2,-1,1,0,-2,0 --*vScrollbar.displayList:\ --foreground gray85;\ --segments 0,1,0,-2,-1,1,-1,-2 --*Scrollbar.thumb: vlines2 --*hScrollbar.thumb: hlines2 -- --*SimpleMenu*borderWidth: 0 --*SimpleMenu*backgroundPixmap: xlogo11?foreground=gray90&background=gray88 --*SimpleMenu*background: gray90 --*SimpleMenu*foreground: gray20 --*SimpleMenu.VerticalMargins: 3 --*SimpleMenu.HorizontalMargins: 3 --*SimpleMenu.SimpleMenu.VerticalMargins: 3 --*SimpleMenu.SimpleMenu.HorizontalMargins: 3 --*SimpleMenu.menuLabel.foreground: rgb:d/5/5 --*SimpleMenu*displayList:\ --foreground gray70;\ --lines +2,-2,-2,-2,-2,+2;\ --foreground gray95;\ --lines -2,+1,+1,+1,+1,-2;\ --foreground gray30;\ --lines +1,-1,-1,-1,-1,+1;\ --foreground gray80;\ --lines -1,+0,+0,+0,+0,-1 -- --*TransientShell.backgroundPixmap: xlogo11?foreground=gray90&background=gray87 --*TransientShell.Form.backgroundPixmap: ParentRelative --*TransientShell.Form.Label.backgroundPixmap: ParentRelative -- --*ispell*Scrollbar.borderColor: gray50 --*ispell*Scrollbar.displayList: --*ispell*List.background: gray96 --*ispell*word.background: gray96 --*ispell*word.backgroundPixmap: XtUnspecifiedPixmap --*ispell*word.translations:\ --: highlight()\n\ --: reset()\n\ --: set()\n\ --: notify() unset()\n --*ispell*word.displayList: --*ispell.Form.Form.borderColor: gray80 --*ispell.Form.Form.displayList: \ --foreground gray90;\ --lines +1,-1,-1,-1,-1,+1;\ --foreground gray30;\ --lines -1,+0,+0,+0,+0,-1;\ --foreground gray60;\ --lines +2,-2,-2,-2,-2,+2 --*ispell*status.backgroundPixmap: XtUnspecifiedPixmap --*ispell*status.background: gray96 --*ispell*terse.justify: right --*ispell*terse.internalWidth: 10 --*ispell*terse.background: gray75 --*ispell*terse.foreground: gray20 --*ispell*terse.highlightThickness: 0 --*ispell*terse.displayList:\ --line-style solid;\ --foreground gray70;\ --fill-arc 6,4,14,12;\ --foreground gray90;\ --draw-arc 6,4,14,12,45,180;\ --draw-lines +0,-1,-1,-1,-1,+0;\ --foreground gray50;\ --draw-arc 6,4,14,12,225,180;\ --draw-lines -2,+0,+0,+0,+0,-2;\ --foreground gray45;\ --dashes 2,1;\ --line-style onoffdash;\ --draw-rect +1,+1,-2,-2 --*ispell*options.MenuButton.borderColor: gray70 --*ispell*options.MenuButton.background: gray78 --*ispell*options.MenuButton.backgroundPixmap: gradient:vertical?dimension=18&start=gray90&end=gray65 --*ispell*options.MenuButton.displayList:\ --foreground gray60;\ --lines +2,-2,-2,-2,-2,+2;\ --foreground gray95;\ --lines -3,+1,+1,+1,+1,-3;\ --foreground gray78;\ --points -2,+1,+1,-2 -- --*tip.foreground: rgb:48/48/00 --*tip.backgroundPixmap: None --*tip.borderWidth: 0 --*tip.rightMargin: 7 --*tip.bottomMargin: 3 --*tip.displayList:\ --foreground rgb:f/e/8;\ --fill-rect 1,1,-2,-2;\ --foreground rgb:d/c/6;\ --draw-segments 0,1,0,-3,1,-2,-3,-2,-2,-3,-2,1,-3,0,1,0;\ --foreground rgb:a/8/4;\ --draw-lines 2,-1, -2,-1, -1,-2, -1,2 -- --*grip.foreground: gray10 --*grip.displayList:\ --foreground gray80;\ --points 0,0,0,-1,-1,-1,-1,0 -Index: x11-apps/xedit/app-defaults/Xedit-noxprint -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ x11-apps/xedit/app-defaults/Xedit-noxprint 2010-03-21 10:04:31.000000000 +0100 -@@ -0,0 +1,468 @@ -+! $XFree86: xc/programs/xedit/Xedit.ad,v 1.23 2002/09/22 07:09:05 paulo Exp $ -+ -+*geometry: 590x440 -+*input: TRUE -+*enableBackups: True -+*backupNameSuffix: ~ -+*changedBitmap: xlogo11 -+*international: False -+ -+*hints:\ -+Use Control-S and Control-R to Search.\n\ -+Use Control-Shift-_ to Undo. Control-G to switch between Undo and Redo.\n\ -+Use Control-A to jump to the beginning of the line.\n\ -+Use Control-E to jump to the end of the line.\n\ -+Use Control-T to transpose characters.\n\ -+Use Control-K to cut to the end of the line. Control-Y to paste.\n\ -+Use Control-Q to escape control characters.\n\ -+Use Control-U[,] to multiply actions. Control-G to cancel.\n\ -+Use Control-Z to scroll one line up. Meta-Z to scroll one line down.\n\ -+Use Meta-Q to format a paragraph.\n\ -+Use Right-Button to extend selections.\n\ -+Use Meta-I to insert a file.\n\ -+Use Control-W to delete a selection, and/or jump to the selection mark.\n\ -+Use Control-X,Control-F to find a file. Tab for filename completion.\n\ -+Use Control-X,Control-S to save.\n\ -+Use Control-X,Control-C to exit.\n\ -+Use Control-C to paste the selection at CUT_BUFFER0.\n\ -+Use Control Left-Button to popup the File Menu.\n\ -+Use Control Middle-Button to popup the Edit Menu.\n\ -+Use Control Right-Button to popup the Option Menu.\n\ -+Use Control-X,Tab to Indent.\n\ -+Use Control-X,0 to delete current splitted window.\n\ -+Use Control-X,1 to delete other splitted window.\n\ -+Use Control-X,2 to split the window vertically.\n\ -+Use Control-X,3 to split the window horizontally.\n\ -+Use Control-X,b to switch to another file.\n\ -+Use Control-X,d to list directory. Control-G to Cancel.\n\ -+Use Control-X,k to close file being edited.\n\ -+Use Control-X,o to switch to another splitted window.\n\ -+Use Control-X,u to undo. Control-G to switch between Undo and Redo.\n\ -+Use Insert to toggle Overwrite mode.\n\ -+Use Control-G to interrupt the lisp subprocess.\n\ -+Use Escape to enter or leave regex search and replace mode.\n\ -+Use Alt-. to search tags for the selected symbol or find the next match. -+ -+*formWindow*defaultDistance: 2 -+*formWindow.?.borderWidth: 0 -+*formWindow.min: 18 -+*formWindow.max: 18 -+*formWindow.showGrip: False -+*positionWindow.fromHoriz: labelWindow -+*positionWindow.horizDistance: 0 -+*positionWindow.left: chainRight -+*positionWindow.right: chainRight -+*positionWindow.width: 90 -+*positionWindow.label: error -+*positionWindow.justify: left -+*labelWindow*justify: center -+*labelWindow*label: no file yet -+*labelWindow.left: chainLeft -+*labelWindow.right: chainRight -+ -+*quit.label: Quit -+*quit.tip: Close xedit window -+*save.label: Save -+*save.tip: Save current file -+*load.label: Load -+*load.tip: Load a new file -+ -+*buttons*orientation: horizontal -+*buttons*showGrip: False -+*buttons.min: 18 -+ -+*messageWindow.height: 50 -+*messageWindow.min: 18 -+*Paned*Text*allowResize: True -+ -+*messageWindow.autoFill: False -+*messageWindow.scrollVertical: Never -+ -+*editWindow.autoFill: False -+*editWindow.scrollVertical: Always -+*editWindow.showGrip: True -+xedit.textSource*enableUndo: True -+ -+*bc_label*label: Use Control-S and Control-R to Search. -+*bc_label*showGrip: False -+*bc_label.min: 18 -+ -+*dirlabel.showGrip: False -+*dirlabel.min: 18 -+*dirlabel.max: 18 -+ -+*dirwindow.defaultColumns: 0 -+*dirwindow.verticalList: True -+ -+*viewport.forceBars: True -+*viewport.allowVert: 1 -+ -+*insertFile*text.width: 141 -+*insertFile*text.?.pieceSize: 256 -+*search*searchText.width: 157 -+*search*replaceText.width: 157 -+*search*case.horizDistance: 25 -+*search*Text.?.pieceSize: 256 -+ -+*SimpleMenu.BackingStore: NotUseful -+*SimpleMenu.menuLabel.vertSpace: 80 -+*SimpleMenu.SmeBSB.HorizontalMargins: 16 -+*SimpleMenu.justify: center -+*SimpleMenu.menuLabel.height: 250 -+*SimpleMenu*cursor: left_ptr -+ -+*fileMenu.label: File Menu -+*optionsMenu.label: Option Menu -+*optionsMenu.ispell.label: ispell... -+*editMenu.label: Edit Menu -+*editMenu.wrapMenuItem.label: Wrapping -+*editMenu.wrapMenuItem.leftBitmap: menu12 -+*wrapMenu.never.label: Never -+*wrapMenu.line.label: Line -+*wrapMenu.word.label: Word -+*editMenu.autoFill.label: Auto Fill -+*editMenu.justifyMenuItem.label: Justification -+*editMenu.justifyMenuItem.leftBitmap: menu12 -+*justifyMenu.left.label: Left -+*justifyMenu.right.label: Right -+*justifyMenu.center.label: Center -+*justifyMenu.full.label: Full -+*editMenu.breakColumns.label: Break Columns... -+*editMenu.scrollMenuItem.label: Scrollbars -+*editMenu.scrollMenuItem.leftBitmap: menu12 -+*scrollMenu.vertical.label: Vertical -+*scrollMenu.horizontal.label: Horizontal -+*editMenu.modeMenuItem.leftBitmap: menu12 -+*editMenu.modeMenuItem.label: Edit Mode -+*editModes.none.label: Plain/None -+ -+*TransientShell*Text.translations: #override \ -+cS: no-op(r)\n\ -+cR: no-op(r)\n\ -+mI: no-op(r) -+ -+*search.translations: #override \ -+:get-values(my, $w, width, $h, height)\ -+ set-values(1, minWidth, $w, minHeight, $h, maxHeight, $h, allowShellResize, False) -+ -+*insertFile.title: Insert File -+*insertFile.translations: #override \ -+:get-values(my, $w, width, $h, height)\ -+ set-values(1, minWidth, $w, minHeight, $h, maxHeight, $h, allowShellResize, False) -+ -+*baseTranslations: #override \ -+X,C:quit()\n\ -+X,S:save-file()\n\ -+X,F:find-file()\n\ -+Escape: line-edit() -+ -+*messageWindow.Translations: #override \ -+X,C:quit()\n\ -+X,S:save-file()\n\ -+X,F:find-file()\n\ -+: no-op()\n\ -+: no-op()\n\ -+: set-keyboard-focus() select-start() -+ -+*searchText.Translations: #override \ -+: no-op()\n\ -+: no-op()\n\ -+: set-keyboard-focus() select-start() -+ -+*replaceText.Translations: #override \ -+: no-op()\n\ -+: no-op()\n\ -+: set-keyboard-focus() select-start() -+ -+*editWindow.translations: #override \ -+X,E:lisp-eval()\n\ -+X,Tab:indent()\n\ -+X,:0:delete-window(current)\n\ -+X,:1:delete-window(other)\n\ -+X,:2:split-window(vertical)\n\ -+X,:3:split-window(horizontal)\n\ -+X,!l @Num_Lockb:switch-source()\n\ -+X,!l b:switch-source()\n\ -+X,!@Num_Lockb:switch-source()\n\ -+X,!b:switch-source()\n\ -+X,!l @Num_Lockd:dir-window()\n\ -+X,!l d:dir-window()\n\ -+X,!@Num_Lockd:dir-window()\n\ -+X,!d:dir-window()\n\ -+X,!l @Num_Lockk:kill-file()\n\ -+X,!l k:kill-file()\n\ -+X,!@Num_Lockk:kill-file()\n\ -+X,!k:kill-file()\n\ -+X,!l @Num_Locko:other-window()\n\ -+X,!l o:other-window()\n\ -+X,!@Num_Locko:other-window()\n\ -+X,!o:other-window()\n\ -+X,!l @Num_Locku:undo()\n\ -+X,!l u:undo()\n\ -+X,!@Num_Locku:undo()\n\ -+X,!u:undo()\n\ -+G: xedit-keyboard-reset()\n\ -+J: xedit-print-lisp-eval()\n\ -+:m.: tags()\n\ -+Tab: insert-char()\n\ -+!l @Num_Lockb:insert-char()\n\ -+!l b: insert-char()\n\ -+!@Num_Lockb:insert-char()\n\ -+!b: insert-char()\n\ -+!l @Num_Lockd:insert-char()\n\ -+!l d: insert-char()\n\ -+!@Num_Lockd:insert-char()\n\ -+!d: insert-char()\n\ -+!l k: insert-char()\n\ -+!l @Num_Lockk:insert-char()\n\ -+!@Num_Lockk:insert-char()\n\ -+!k: insert-char()\n\ -+!l @Num_Locko:insert-char()\n\ -+!l o: insert-char()\n\ -+!@Num_Locko:insert-char()\n\ -+!o: insert-char()\n\ -+!l @Num_Locku:insert-char()\n\ -+!l u: insert-char()\n\ -+!@Num_Locku:insert-char()\n\ -+!u: insert-char()\n\ -+~s Insert: toggle-overwrite()\n\ -+c l @Num_Lock:xedit-focus() popup-menu(fileMenu)\n\ -+c @Num_Lock:xedit-focus() popup-menu(fileMenu)\n\ -+c l: xedit-focus() popup-menu(fileMenu)\n\ -+c: xedit-focus() popup-menu(fileMenu)\n\ -+c l @Num_Lock:xedit-focus() popup-menu(editMenu)\n\ -+c @Num_Lock:xedit-focus() popup-menu(editMenu)\n\ -+c l: xedit-focus() popup-menu(editMenu)\n\ -+c: xedit-focus() popup-menu(editMenu)\n\ -+c l @Num_Lock:xedit-focus() popup-menu(optionsMenu)\n\ -+c @Num_Lock:xedit-focus() popup-menu(optionsMenu)\n\ -+c l:xedit-focus() popup-menu(optionsMenu)\n\ -+c: xedit-focus() popup-menu(optionsMenu)\n\ -+: xedit-focus() select-start()\n\ -+: scroll-one-line-down()\n\ -+: scroll-one-line-up() -+ -+*filename.?.pieceSize: 256 -+*filename.translations: #override \ -+cS: no-op(r)\n\ -+cR: no-op(r)\n\ -+mI: no-op(r)\n\ -+cG: cancel-find-file()\n\ -+Return: load-file()\n\ -+Tab: file-completion(h)\n\ -+Escape: cancel-find-file()\n\ -+: no-op()\n\ -+: no-op()\n\ -+: set-keyboard-focus() select-start() -+ -+*ispell.translations: #override \ -+WM_PROTOCOLS: ispell(end) -+ -+! Sample dictionary, word chars and text mode resources setup -+!*ispell.dictionary: br -+!*ispell.dictionaries: br american americanmed+ english -+!*ispell*br.wordChars: áéíóúçÁÉÍÓÚÇàÀâêôÂÊÔüÜãõÃÕ- -+*ispell.ispellCommand: /usr/bin/aspell -B -m -+*ispell.lookCommand: /bin/egrep -+!*ispell*text.skipLines: .# -+ -+*ispell.geometry: 0x0 -+*ispell.minWidth: 320 -+*ispell.minHeight: 245 -+*ispell*Label.borderWidth: 0 -+*ispell*Label.internalHeight: 4 -+*ispell*Label.justify: right -+*ispell*Label.width: 112 -+*ispell*Label.left: chainLeft -+*ispell*Label.right: chainLeft -+*ispell*Label.top: chainTop -+*ispell*Label.bottom: chainTop -+*ispell*mispelled.label: Misspelled word: -+*ispell*mispelled.top: chainTop -+*ispell*mispelled.bottom: chainTop -+*ispell*mispelled.internalWidth: 0 -+*ispell*repeated.label: Repeated words: -+*ispell*repeated.internalWidth: 0 -+*ispell*replacement.label: Replace with: -+*ispell*word.fromHoriz: mispelled -+*ispell*word.justify: left -+*ispell*word.borderWidth: 1 -+*ispell*word.internalWidth: 4 -+*ispell*word.internalHeight: 3 -+*ispell*word.width: 194 -+*ispell*word.left: chainLeft -+*ispell*word.right: chainRight -+*ispell*word.top: chainTop -+*ispell*word.bottom: chainTop -+*ispell*word.label: -+*ispell*word.tip: Press here to select this text -+*ispell*word.highlightThickness: 0 -+*ispell*text.fromHoriz: replacement -+*ispell*replacement.fromVert: mispelled -+*ispell*replacement.internalWidth: 0 -+*ispell*form.text.fromVert: word -+*ispell*form.text.width: 194 -+*ispell*form.text.top: chainTop -+*ispell*form.text.bottom: chainTop -+*ispell*form.text.left: chainLeft -+*ispell*form.text.right: chainRight -+*ispell*form.text.leftMargin: 4 -+*ispell*form.text.?.pieceSize: 256 -+*ispell*suggestions.label: Suggestions: -+*ispell*suggestions.fromVert: replacement -+*ispell*suggestions.internalWidth: 0 -+*ispell*viewport.fromHoriz: suggestions -+*ispell*viewport.fromVert: text -+*ispell*viewport.width: 194 -+*ispell*viewport.height: 143 -+*ispell*viewport.top: chainTop -+*ispell*viewport.bottom: chainBottom -+*ispell*viewport.left: chainLeft -+*ispell*viewport.right: chainRight -+*ispell*viewport.forceBars: 1 -+*ispell*viewport.allowVert: 1 -+*ispell*list.defaultColumns: 1 -+*ispell*list.longest: 16384 -+*ispell*commands.vertDistance: 5 -+*ispell*commands.fromVert: suggestions -+*ispell*commands.top: chainBottom -+*ispell*commands.bottom: chainBottom -+*ispell*commands.right: chainLeft -+*ispell*commands.left: chainLeft -+*ispell*check.label: Check -+*ispell*check.width: 54 -+*ispell*check.tip: Ask ispell about the word in the text field -+*ispell*look.label: Look -+*ispell*look.fromHoriz: check -+*ispell*look.horizDistance: 0 -+*ispell*look.width: 46 -+*ispell*look.tip: Runs the look command -+*ispell*undo.fromVert: check -+*ispell*undo.label: Undo -+*ispell*undo.width: 102 -+*ispell*undo.tip: Undo last action -+*ispell*replace.fromVert: undo -+*ispell*replace.label: Replace -+*ispell*replace.tip: Replace occurence of the word -+*ispell*replaceAll.fromVert: undo -+*ispell*replaceAll.fromHoriz: replace -+*ispell*replaceAll.label: All -+*ispell*replaceAll.tip: Replace all occurences of the word -+*ispell*ignore.fromVert: replace -+*ispell*ignore.label: Ignore -+*ispell*ignore.tip: Ignore this word -+*ispell*ignoreAll.fromVert: replaceAll -+*ispell*ignoreAll.fromHoriz: ignore -+*ispell*ignoreAll.label: All -+*ispell*ignoreAll.tip: Ignore all ocurrences of the word -+*ispell*add.fromVert: ignore -+*ispell*add.label: Add -+*ispell*add.width: 50 -+*ispell*add.tip: Add word to your private dictionary -+*ispell*addUncap.fromVert: ignoreAll -+*ispell*addUncap.fromHoriz: add -+*ispell*addUncap.label: Uncap -+*ispell*addUncap.horizDistance: 0 -+*ispell*addUncap.width: 50 -+*ispell*addUncap.tip: Add word uncapitalized, to your private dictionary -+*ispell*suspend.fromVert: add -+*ispell*suspend.label: Suspend -+*ispell*suspend.width: 57 -+*ispell*suspend.tip: Suspend ispell execution -+*ispell*cancel.fromHoriz: suspend -+*ispell*cancel.fromVert: addUncap -+*ispell*cancel.label: Close -+*ispell*cancel.width: 43 -+*ispell*cancel.horizDistance: 0 -+*ispell*cancel.tip: Terminates ispell process -+*ispell*replace.width: 65 -+*ispell*ignore.width: 65 -+*ispell*replaceAll.width: 35 -+*ispell*replaceAll.horizDistance: 0 -+*ispell*ignoreAll.width: 35 -+*ispell*ignoreAll.horizDistance: 0 -+*ispell*terse.fromVert: cancel -+*ispell*terse.Label: Terse Mode -+*ispell*terse.width: 104 -+*ispell*terse.borderWidth: 0 -+*ispell*terse.tip: Switch terse mode -+*ispell*status.fromVert: viewport -+*ispell*status.fromHoriz: suggestions -+*ispell*status.top: chainBottom -+*ispell*status.bottom: chainBottom -+*ispell*status.left: chainLeft -+*ispell*status.right: chainRight -+*ispell*status.width: 194 -+*ispell*status.borderWidth: 1 -+*ispell*status.justify: left -+*ispell*status.internalHeight: 2 -+*ispell*status.vertDistance: 2 -+*ispell*options.fromVert: status -+*ispell*options.fromHoriz: commands -+*ispell*options.bottom: chainBottom -+*ispell*options.top: chainBottom -+*ispell*options.left: chainLeft -+*ispell*options.right: chainRight -+*ispell*options.dict.width: 121 -+*ispell*options.horizDistance: 2 -+*ispell*options.vertDistance: 2 -+*ispell*options.defaultDistance: 2 -+*ispell*dict.highlightThickness: 0 -+*ispell*dict.justify: left -+*ispell*dict.resizable: False -+*ispell*dict.leftBitmap: menu12 -+*ispell*dict.label: Dictionary -+*ispell*dict.tip: Change dictionary -+*ispell*options.format.width: 65 -+*ispell*format.highlightThickness: 0 -+*ispell*format.justify: left -+*ispell*format.resizable: False -+*ispell*format.leftBitmap: menu12 -+*ispell*format.fromHoriz: dict -+*ispell*format.horizDistance: 0 -+*ispell*format.tip: Select text type -+ -+*columns.minWidth: 140 -+*columns.minHeight: 76 -+*columns.maxWidth: 140 -+*columns.maxHeight: 76 -+*columns.form*defaultDistance: 4 -+*columns*left: chainLeft -+*columns*right: chainLeft -+*columns*top: chainTop -+*columns*bottom: chainTop -+*columns*Label.width: 96 -+*columns*Label.borderWidth: 0 -+*columns*Label.internalHeight: 4 -+*columns*Label.internalWidth: 2 -+*columns*Label.justify: right -+*columns*Text.width: 30 -+*columns*Command.width: 58 -+*columns*leftLabel.label: Left Column: -+*columns*left.fromHoriz: leftLabel -+*columns*rightLabel.label: Right Column: -+*columns*rightLabel.fromVert: leftLabel -+*columns*right.fromHoriz: rightLabel -+*columns*right.fromVert: left -+*columns*ok.fromVert: rightLabel -+*columns*cancel.fromHoriz: ok -+*columns*cancel.fromVert: rightLabel -+*columns*cancel.horizDistance: 12 -+*columns*Text.?.pieceSize: 8 -+ -+*columns*Text.translations: #override \ -+cS: no-op(r)\n\ -+cR: no-op(r)\n\ -+mI: no-op(r)\n\ -+Return: set-columns(ok)\n\ -+Tab: change-field()\n\ -+cG: set-columns(cancel)\n\ -+Escape: set-columns(cancel)\n\ -+: no-op()\n\ -+: no-op()\n\ -+: set-keyboard-focus() select-start() -+ -+*columns.translations: #override \ -+WM_PROTOCOLS: set-columns(cancel) -+ -+! EOF. -Index: x11-apps/xedit/app-defaults/Xedit-noxprint.ad -=================================================================== ---- x11-apps.orig/xedit/app-defaults/Xedit-noxprint.ad 2010-03-21 10:06:53.000000000 +0100 -+++ /dev/null 1970-01-01 00:00:00.000000000 +0000 -@@ -1,468 +0,0 @@ --! $XFree86: xc/programs/xedit/Xedit.ad,v 1.23 2002/09/22 07:09:05 paulo Exp $ -- --*geometry: 590x440 --*input: TRUE --*enableBackups: True --*backupNameSuffix: ~ --*changedBitmap: xlogo11 --*international: False -- --*hints:\ --Use Control-S and Control-R to Search.\n\ --Use Control-Shift-_ to Undo. Control-G to switch between Undo and Redo.\n\ --Use Control-A to jump to the beginning of the line.\n\ --Use Control-E to jump to the end of the line.\n\ --Use Control-T to transpose characters.\n\ --Use Control-K to cut to the end of the line. Control-Y to paste.\n\ --Use Control-Q to escape control characters.\n\ --Use Control-U[,] to multiply actions. Control-G to cancel.\n\ --Use Control-Z to scroll one line up. Meta-Z to scroll one line down.\n\ --Use Meta-Q to format a paragraph.\n\ --Use Right-Button to extend selections.\n\ --Use Meta-I to insert a file.\n\ --Use Control-W to delete a selection, and/or jump to the selection mark.\n\ --Use Control-X,Control-F to find a file. Tab for filename completion.\n\ --Use Control-X,Control-S to save.\n\ --Use Control-X,Control-C to exit.\n\ --Use Control-C to paste the selection at CUT_BUFFER0.\n\ --Use Control Left-Button to popup the File Menu.\n\ --Use Control Middle-Button to popup the Edit Menu.\n\ --Use Control Right-Button to popup the Option Menu.\n\ --Use Control-X,Tab to Indent.\n\ --Use Control-X,0 to delete current splitted window.\n\ --Use Control-X,1 to delete other splitted window.\n\ --Use Control-X,2 to split the window vertically.\n\ --Use Control-X,3 to split the window horizontally.\n\ --Use Control-X,b to switch to another file.\n\ --Use Control-X,d to list directory. Control-G to Cancel.\n\ --Use Control-X,k to close file being edited.\n\ --Use Control-X,o to switch to another splitted window.\n\ --Use Control-X,u to undo. Control-G to switch between Undo and Redo.\n\ --Use Insert to toggle Overwrite mode.\n\ --Use Control-G to interrupt the lisp subprocess.\n\ --Use Escape to enter or leave regex search and replace mode.\n\ --Use Alt-. to search tags for the selected symbol or find the next match. -- --*formWindow*defaultDistance: 2 --*formWindow.?.borderWidth: 0 --*formWindow.min: 18 --*formWindow.max: 18 --*formWindow.showGrip: False --*positionWindow.fromHoriz: labelWindow --*positionWindow.horizDistance: 0 --*positionWindow.left: chainRight --*positionWindow.right: chainRight --*positionWindow.width: 90 --*positionWindow.label: error --*positionWindow.justify: left --*labelWindow*justify: center --*labelWindow*label: no file yet --*labelWindow.left: chainLeft --*labelWindow.right: chainRight -- --*quit.label: Quit --*quit.tip: Close xedit window --*save.label: Save --*save.tip: Save current file --*load.label: Load --*load.tip: Load a new file -- --*buttons*orientation: horizontal --*buttons*showGrip: False --*buttons.min: 18 -- --*messageWindow.height: 50 --*messageWindow.min: 18 --*Paned*Text*allowResize: True -- --*messageWindow.autoFill: False --*messageWindow.scrollVertical: Never -- --*editWindow.autoFill: False --*editWindow.scrollVertical: Always --*editWindow.showGrip: True --xedit.textSource*enableUndo: True -- --*bc_label*label: Use Control-S and Control-R to Search. --*bc_label*showGrip: False --*bc_label.min: 18 -- --*dirlabel.showGrip: False --*dirlabel.min: 18 --*dirlabel.max: 18 -- --*dirwindow.defaultColumns: 0 --*dirwindow.verticalList: True -- --*viewport.forceBars: True --*viewport.allowVert: 1 -- --*insertFile*text.width: 141 --*insertFile*text.?.pieceSize: 256 --*search*searchText.width: 157 --*search*replaceText.width: 157 --*search*case.horizDistance: 25 --*search*Text.?.pieceSize: 256 -- --*SimpleMenu.BackingStore: NotUseful --*SimpleMenu.menuLabel.vertSpace: 80 --*SimpleMenu.SmeBSB.HorizontalMargins: 16 --*SimpleMenu.justify: center --*SimpleMenu.menuLabel.height: 250 --*SimpleMenu*cursor: left_ptr -- --*fileMenu.label: File Menu --*optionsMenu.label: Option Menu --*optionsMenu.ispell.label: ispell... --*editMenu.label: Edit Menu --*editMenu.wrapMenuItem.label: Wrapping --*editMenu.wrapMenuItem.leftBitmap: menu12 --*wrapMenu.never.label: Never --*wrapMenu.line.label: Line --*wrapMenu.word.label: Word --*editMenu.autoFill.label: Auto Fill --*editMenu.justifyMenuItem.label: Justification --*editMenu.justifyMenuItem.leftBitmap: menu12 --*justifyMenu.left.label: Left --*justifyMenu.right.label: Right --*justifyMenu.center.label: Center --*justifyMenu.full.label: Full --*editMenu.breakColumns.label: Break Columns... --*editMenu.scrollMenuItem.label: Scrollbars --*editMenu.scrollMenuItem.leftBitmap: menu12 --*scrollMenu.vertical.label: Vertical --*scrollMenu.horizontal.label: Horizontal --*editMenu.modeMenuItem.leftBitmap: menu12 --*editMenu.modeMenuItem.label: Edit Mode --*editModes.none.label: Plain/None -- --*TransientShell*Text.translations: #override \ --cS: no-op(r)\n\ --cR: no-op(r)\n\ --mI: no-op(r) -- --*search.translations: #override \ --:get-values(my, $w, width, $h, height)\ -- set-values(1, minWidth, $w, minHeight, $h, maxHeight, $h, allowShellResize, False) -- --*insertFile.title: Insert File --*insertFile.translations: #override \ --:get-values(my, $w, width, $h, height)\ -- set-values(1, minWidth, $w, minHeight, $h, maxHeight, $h, allowShellResize, False) -- --*baseTranslations: #override \ --X,C:quit()\n\ --X,S:save-file()\n\ --X,F:find-file()\n\ --Escape: line-edit() -- --*messageWindow.Translations: #override \ --X,C:quit()\n\ --X,S:save-file()\n\ --X,F:find-file()\n\ --: no-op()\n\ --: no-op()\n\ --: set-keyboard-focus() select-start() -- --*searchText.Translations: #override \ --: no-op()\n\ --: no-op()\n\ --: set-keyboard-focus() select-start() -- --*replaceText.Translations: #override \ --: no-op()\n\ --: no-op()\n\ --: set-keyboard-focus() select-start() -- --*editWindow.translations: #override \ --X,E:lisp-eval()\n\ --X,Tab:indent()\n\ --X,:0:delete-window(current)\n\ --X,:1:delete-window(other)\n\ --X,:2:split-window(vertical)\n\ --X,:3:split-window(horizontal)\n\ --X,!l @Num_Lockb:switch-source()\n\ --X,!l b:switch-source()\n\ --X,!@Num_Lockb:switch-source()\n\ --X,!b:switch-source()\n\ --X,!l @Num_Lockd:dir-window()\n\ --X,!l d:dir-window()\n\ --X,!@Num_Lockd:dir-window()\n\ --X,!d:dir-window()\n\ --X,!l @Num_Lockk:kill-file()\n\ --X,!l k:kill-file()\n\ --X,!@Num_Lockk:kill-file()\n\ --X,!k:kill-file()\n\ --X,!l @Num_Locko:other-window()\n\ --X,!l o:other-window()\n\ --X,!@Num_Locko:other-window()\n\ --X,!o:other-window()\n\ --X,!l @Num_Locku:undo()\n\ --X,!l u:undo()\n\ --X,!@Num_Locku:undo()\n\ --X,!u:undo()\n\ --G: xedit-keyboard-reset()\n\ --J: xedit-print-lisp-eval()\n\ --:m.: tags()\n\ --Tab: insert-char()\n\ --!l @Num_Lockb:insert-char()\n\ --!l b: insert-char()\n\ --!@Num_Lockb:insert-char()\n\ --!b: insert-char()\n\ --!l @Num_Lockd:insert-char()\n\ --!l d: insert-char()\n\ --!@Num_Lockd:insert-char()\n\ --!d: insert-char()\n\ --!l k: insert-char()\n\ --!l @Num_Lockk:insert-char()\n\ --!@Num_Lockk:insert-char()\n\ --!k: insert-char()\n\ --!l @Num_Locko:insert-char()\n\ --!l o: insert-char()\n\ --!@Num_Locko:insert-char()\n\ --!o: insert-char()\n\ --!l @Num_Locku:insert-char()\n\ --!l u: insert-char()\n\ --!@Num_Locku:insert-char()\n\ --!u: insert-char()\n\ --~s Insert: toggle-overwrite()\n\ --c l @Num_Lock:xedit-focus() popup-menu(fileMenu)\n\ --c @Num_Lock:xedit-focus() popup-menu(fileMenu)\n\ --c l: xedit-focus() popup-menu(fileMenu)\n\ --c: xedit-focus() popup-menu(fileMenu)\n\ --c l @Num_Lock:xedit-focus() popup-menu(editMenu)\n\ --c @Num_Lock:xedit-focus() popup-menu(editMenu)\n\ --c l: xedit-focus() popup-menu(editMenu)\n\ --c: xedit-focus() popup-menu(editMenu)\n\ --c l @Num_Lock:xedit-focus() popup-menu(optionsMenu)\n\ --c @Num_Lock:xedit-focus() popup-menu(optionsMenu)\n\ --c l:xedit-focus() popup-menu(optionsMenu)\n\ --c: xedit-focus() popup-menu(optionsMenu)\n\ --: xedit-focus() select-start()\n\ --: scroll-one-line-down()\n\ --: scroll-one-line-up() -- --*filename.?.pieceSize: 256 --*filename.translations: #override \ --cS: no-op(r)\n\ --cR: no-op(r)\n\ --mI: no-op(r)\n\ --cG: cancel-find-file()\n\ --Return: load-file()\n\ --Tab: file-completion(h)\n\ --Escape: cancel-find-file()\n\ --: no-op()\n\ --: no-op()\n\ --: set-keyboard-focus() select-start() -- --*ispell.translations: #override \ --WM_PROTOCOLS: ispell(end) -- --! Sample dictionary, word chars and text mode resources setup --!*ispell.dictionary: br --!*ispell.dictionaries: br american americanmed+ english --!*ispell*br.wordChars: áéíóúçÁÉÍÓÚÇàÀâêôÂÊÔüÜãõÃÕ- --*ispell.ispellCommand: /usr/bin/aspell -B -m --*ispell.lookCommand: /bin/egrep --!*ispell*text.skipLines: .# -- --*ispell.geometry: 0x0 --*ispell.minWidth: 320 --*ispell.minHeight: 245 --*ispell*Label.borderWidth: 0 --*ispell*Label.internalHeight: 4 --*ispell*Label.justify: right --*ispell*Label.width: 112 --*ispell*Label.left: chainLeft --*ispell*Label.right: chainLeft --*ispell*Label.top: chainTop --*ispell*Label.bottom: chainTop --*ispell*mispelled.label: Misspelled word: --*ispell*mispelled.top: chainTop --*ispell*mispelled.bottom: chainTop --*ispell*mispelled.internalWidth: 0 --*ispell*repeated.label: Repeated words: --*ispell*repeated.internalWidth: 0 --*ispell*replacement.label: Replace with: --*ispell*word.fromHoriz: mispelled --*ispell*word.justify: left --*ispell*word.borderWidth: 1 --*ispell*word.internalWidth: 4 --*ispell*word.internalHeight: 3 --*ispell*word.width: 194 --*ispell*word.left: chainLeft --*ispell*word.right: chainRight --*ispell*word.top: chainTop --*ispell*word.bottom: chainTop --*ispell*word.label: --*ispell*word.tip: Press here to select this text --*ispell*word.highlightThickness: 0 --*ispell*text.fromHoriz: replacement --*ispell*replacement.fromVert: mispelled --*ispell*replacement.internalWidth: 0 --*ispell*form.text.fromVert: word --*ispell*form.text.width: 194 --*ispell*form.text.top: chainTop --*ispell*form.text.bottom: chainTop --*ispell*form.text.left: chainLeft --*ispell*form.text.right: chainRight --*ispell*form.text.leftMargin: 4 --*ispell*form.text.?.pieceSize: 256 --*ispell*suggestions.label: Suggestions: --*ispell*suggestions.fromVert: replacement --*ispell*suggestions.internalWidth: 0 --*ispell*viewport.fromHoriz: suggestions --*ispell*viewport.fromVert: text --*ispell*viewport.width: 194 --*ispell*viewport.height: 143 --*ispell*viewport.top: chainTop --*ispell*viewport.bottom: chainBottom --*ispell*viewport.left: chainLeft --*ispell*viewport.right: chainRight --*ispell*viewport.forceBars: 1 --*ispell*viewport.allowVert: 1 --*ispell*list.defaultColumns: 1 --*ispell*list.longest: 16384 --*ispell*commands.vertDistance: 5 --*ispell*commands.fromVert: suggestions --*ispell*commands.top: chainBottom --*ispell*commands.bottom: chainBottom --*ispell*commands.right: chainLeft --*ispell*commands.left: chainLeft --*ispell*check.label: Check --*ispell*check.width: 54 --*ispell*check.tip: Ask ispell about the word in the text field --*ispell*look.label: Look --*ispell*look.fromHoriz: check --*ispell*look.horizDistance: 0 --*ispell*look.width: 46 --*ispell*look.tip: Runs the look command --*ispell*undo.fromVert: check --*ispell*undo.label: Undo --*ispell*undo.width: 102 --*ispell*undo.tip: Undo last action --*ispell*replace.fromVert: undo --*ispell*replace.label: Replace --*ispell*replace.tip: Replace occurence of the word --*ispell*replaceAll.fromVert: undo --*ispell*replaceAll.fromHoriz: replace --*ispell*replaceAll.label: All --*ispell*replaceAll.tip: Replace all occurences of the word --*ispell*ignore.fromVert: replace --*ispell*ignore.label: Ignore --*ispell*ignore.tip: Ignore this word --*ispell*ignoreAll.fromVert: replaceAll --*ispell*ignoreAll.fromHoriz: ignore --*ispell*ignoreAll.label: All --*ispell*ignoreAll.tip: Ignore all ocurrences of the word --*ispell*add.fromVert: ignore --*ispell*add.label: Add --*ispell*add.width: 50 --*ispell*add.tip: Add word to your private dictionary --*ispell*addUncap.fromVert: ignoreAll --*ispell*addUncap.fromHoriz: add --*ispell*addUncap.label: Uncap --*ispell*addUncap.horizDistance: 0 --*ispell*addUncap.width: 50 --*ispell*addUncap.tip: Add word uncapitalized, to your private dictionary --*ispell*suspend.fromVert: add --*ispell*suspend.label: Suspend --*ispell*suspend.width: 57 --*ispell*suspend.tip: Suspend ispell execution --*ispell*cancel.fromHoriz: suspend --*ispell*cancel.fromVert: addUncap --*ispell*cancel.label: Close --*ispell*cancel.width: 43 --*ispell*cancel.horizDistance: 0 --*ispell*cancel.tip: Terminates ispell process --*ispell*replace.width: 65 --*ispell*ignore.width: 65 --*ispell*replaceAll.width: 35 --*ispell*replaceAll.horizDistance: 0 --*ispell*ignoreAll.width: 35 --*ispell*ignoreAll.horizDistance: 0 --*ispell*terse.fromVert: cancel --*ispell*terse.Label: Terse Mode --*ispell*terse.width: 104 --*ispell*terse.borderWidth: 0 --*ispell*terse.tip: Switch terse mode --*ispell*status.fromVert: viewport --*ispell*status.fromHoriz: suggestions --*ispell*status.top: chainBottom --*ispell*status.bottom: chainBottom --*ispell*status.left: chainLeft --*ispell*status.right: chainRight --*ispell*status.width: 194 --*ispell*status.borderWidth: 1 --*ispell*status.justify: left --*ispell*status.internalHeight: 2 --*ispell*status.vertDistance: 2 --*ispell*options.fromVert: status --*ispell*options.fromHoriz: commands --*ispell*options.bottom: chainBottom --*ispell*options.top: chainBottom --*ispell*options.left: chainLeft --*ispell*options.right: chainRight --*ispell*options.dict.width: 121 --*ispell*options.horizDistance: 2 --*ispell*options.vertDistance: 2 --*ispell*options.defaultDistance: 2 --*ispell*dict.highlightThickness: 0 --*ispell*dict.justify: left --*ispell*dict.resizable: False --*ispell*dict.leftBitmap: menu12 --*ispell*dict.label: Dictionary --*ispell*dict.tip: Change dictionary --*ispell*options.format.width: 65 --*ispell*format.highlightThickness: 0 --*ispell*format.justify: left --*ispell*format.resizable: False --*ispell*format.leftBitmap: menu12 --*ispell*format.fromHoriz: dict --*ispell*format.horizDistance: 0 --*ispell*format.tip: Select text type -- --*columns.minWidth: 140 --*columns.minHeight: 76 --*columns.maxWidth: 140 --*columns.maxHeight: 76 --*columns.form*defaultDistance: 4 --*columns*left: chainLeft --*columns*right: chainLeft --*columns*top: chainTop --*columns*bottom: chainTop --*columns*Label.width: 96 --*columns*Label.borderWidth: 0 --*columns*Label.internalHeight: 4 --*columns*Label.internalWidth: 2 --*columns*Label.justify: right --*columns*Text.width: 30 --*columns*Command.width: 58 --*columns*leftLabel.label: Left Column: --*columns*left.fromHoriz: leftLabel --*columns*rightLabel.label: Right Column: --*columns*rightLabel.fromVert: leftLabel --*columns*right.fromHoriz: rightLabel --*columns*right.fromVert: left --*columns*ok.fromVert: rightLabel --*columns*cancel.fromHoriz: ok --*columns*cancel.fromVert: rightLabel --*columns*cancel.horizDistance: 12 --*columns*Text.?.pieceSize: 8 -- --*columns*Text.translations: #override \ --cS: no-op(r)\n\ --cR: no-op(r)\n\ --mI: no-op(r)\n\ --Return: set-columns(ok)\n\ --Tab: change-field()\n\ --cG: set-columns(cancel)\n\ --Escape: set-columns(cancel)\n\ --: no-op()\n\ --: no-op()\n\ --: set-keyboard-focus() select-start() -- --*columns.translations: #override \ --WM_PROTOCOLS: set-columns(cancel) -- --! EOF. -Index: x11-apps/xedit/app-defaults/Xedit-xprint -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ x11-apps/xedit/app-defaults/Xedit-xprint 2010-03-21 10:04:31.000000000 +0100 -@@ -0,0 +1,565 @@ -+! $XFree86: xc/programs/xedit/Xedit.ad,v 1.23 2002/09/22 07:09:05 paulo Exp $ -+ -+*geometry: 590x440 -+*input: TRUE -+*enableBackups: True -+*backupNameSuffix: ~ -+*changedBitmap: xlogo11 -+*international: True -+ -+*hints:\ -+Use Control-S and Control-R to Search.\n\ -+Use Control-Shift-_ to Undo. Control-G to switch between Undo and Redo.\n\ -+Use Control-A to jump to the beginning of the line.\n\ -+Use Control-E to jump to the end of the line.\n\ -+Use Control-T to transpose characters.\n\ -+Use Control-K to cut to the end of the line. Control-Y to paste.\n\ -+Use Control-Q to escape control characters.\n\ -+Use Control-U[,] to multiply actions. Control-G to cancel.\n\ -+Use Control-Z to scroll one line up. Meta-Z to scroll one line down.\n\ -+Use Meta-Q to format a paragraph.\n\ -+Use Right-Button to extend selections.\n\ -+Use Meta-I to insert a file.\n\ -+Use Control-W to delete a selection, and/or jump to the selection mark.\n\ -+Use Control-X,Control-F to find a file. Tab for filename completion.\n\ -+Use Control-X,Control-S to save.\n\ -+Use Control-X,Control-C to exit.\n\ -+Use Control-C to paste the selection at CUT_BUFFER0.\n\ -+Use Control Left-Button to popup the File Menu.\n\ -+Use Control Middle-Button to popup the Edit Menu.\n\ -+Use Control Right-Button to popup the Option Menu.\n\ -+Use Control-X,Tab to Indent.\n\ -+Use Control-X,0 to delete current splitted window.\n\ -+Use Control-X,1 to delete other splitted window.\n\ -+Use Control-X,2 to split the window vertically.\n\ -+Use Control-X,3 to split the window horizontally.\n\ -+Use Control-X,b to switch to another file.\n\ -+Use Control-X,d to list directory. Control-G to Cancel.\n\ -+Use Control-X,k to close file being edited.\n\ -+Use Control-X,o to switch to another splitted window.\n\ -+Use Control-X,u to undo. Control-G to switch between Undo and Redo.\n\ -+Use Insert to toggle Overwrite mode.\n\ -+Use Control-G to interrupt the lisp subprocess -+ -+*formWindow*defaultDistance: 2 -+*formWindow.?.borderWidth: 0 -+*formWindow.min: 18 -+*formWindow.max: 18 -+*formWindow.showGrip: False -+*positionWindow.fromHoriz: labelWindow -+*positionWindow.horizDistance: 0 -+*positionWindow.left: chainRight -+*positionWindow.right: chainRight -+*positionWindow.width: 90 -+*positionWindow.label: error -+*positionWindow.justify: left -+*labelWindow*justify: center -+*labelWindow*label: no file yet -+*labelWindow.left: chainLeft -+*labelWindow.right: chainRight -+ -+*quit.label: Quit -+*quit.tip: Close xedit window -+*save.label: Save -+*save.tip: Save current file -+*load.label: Load -+*load.tip: Load a new file -+*print.label: Print -+*print.tip: Print current file -+ -+*buttons*orientation: horizontal -+*buttons*showGrip: False -+*buttons.min: 18 -+ -+*messageWindow.height: 70 -+*messageWindow.min: 18 -+*Paned*Text*allowResize: True -+ -+*messageWindow.autoFill: False -+*messageWindow.scrollVertical: Never -+ -+*editWindow.autoFill: False -+*editWindow.scrollVertical: Always -+*editWindow.showGrip: True -+xedit.textSource*enableUndo: True -+ -+*bc_label*label: Use Control-S and Control-R to Search. -+*bc_label*showGrip: False -+*bc_label.min: 18 -+ -+*dirlabel.showGrip: False -+*dirlabel.min: 18 -+*dirlabel.max: 18 -+ -+*dirwindow.defaultColumns: 0 -+*dirwindow.verticalList: True -+ -+*viewport.forceBars: True -+*viewport.allowVert: 1 -+ -+*insertFile*text.width: 141 -+*insertFile*text.?.pieceSize: 256 -+*search*searchText.width: 157 -+*search*replaceText.width: 157 -+*search*case.horizDistance: 25 -+*search*Text.?.pieceSize: 256 -+ -+*SimpleMenu.BackingStore: NotUseful -+*SimpleMenu.menuLabel.vertSpace: 80 -+*SimpleMenu.SmeBSB.HorizontalMargins: 16 -+*SimpleMenu.justify: center -+*SimpleMenu.menuLabel.height: 250 -+*SimpleMenu*cursor: left_ptr -+ -+*fileMenu.label: File Menu -+*optionsMenu.label: Option Menu -+*optionsMenu.ispell.label: ispell... -+*editMenu.label: Edit Menu -+*editMenu.wrapMenuItem.label: Wrapping -+*editMenu.wrapMenuItem.leftBitmap: menu12 -+*wrapMenu.never.label: Never -+*wrapMenu.line.label: Line -+*wrapMenu.word.label: Word -+*editMenu.autoFill.label: Auto Fill -+*editMenu.justifyMenuItem.label: Justification -+*editMenu.justifyMenuItem.leftBitmap: menu12 -+*justifyMenu.left.label: Left -+*justifyMenu.right.label: Right -+*justifyMenu.center.label: Center -+*justifyMenu.full.label: Full -+*editMenu.breakColumns.label: Break Columns... -+*editMenu.scrollMenuItem.label: Scrollbars -+*editMenu.scrollMenuItem.leftBitmap: menu12 -+*scrollMenu.vertical.label: Vertical -+*scrollMenu.horizontal.label: Horizontal -+*editMenu.modeMenuItem.leftBitmap: menu12 -+*editMenu.modeMenuItem.label: Edit Mode -+*editModes.none.label: Plain/None -+ -+*TransientShell*Text.translations: #override \ -+cS: no-op(r)\n\ -+cR: no-op(r)\n\ -+mI: no-op(r) -+ -+*search.translations: #override \ -+:get-values(my, $w, width, $h, height)\ -+ set-values(1, minWidth, $w, minHeight, $h, maxHeight, $h, allowShellResize, False) -+ -+*insertFile.title: Insert File -+*insertFile.translations: #override \ -+:get-values(my, $w, width, $h, height)\ -+ set-values(1, minWidth, $w, minHeight, $h, maxHeight, $h, allowShellResize, False) -+ -+*baseTranslations: #override \ -+X,C:quit()\n\ -+X,S:save-file()\n\ -+X,P:print-file()\n\ -+X,F:find-file()\n\ -+Escape: line-edit() -+ -+*messageWindow.Translations: #override \ -+X,C:quit()\n\ -+X,S:save-file()\n\ -+X,P:print-file()\n\ -+X,F:find-file()\n\ -+: no-op()\n\ -+: no-op()\n\ -+: set-keyboard-focus() select-start() -+ -+*searchText.Translations: #override \ -+: no-op()\n\ -+: no-op()\n\ -+: set-keyboard-focus() select-start() -+ -+*replaceText.Translations: #override \ -+: no-op()\n\ -+: no-op()\n\ -+: set-keyboard-focus() select-start() -+ -+*editWindow.translations: #override \ -+X,E:lisp-eval()\n\ -+X,Tab:indent()\n\ -+X,:0:delete-window(current)\n\ -+X,:1:delete-window(other)\n\ -+X,:2:split-window(vertical)\n\ -+X,:3:split-window(horizontal)\n\ -+X,!l @Num_Lockb:switch-source()\n\ -+X,!l b:switch-source()\n\ -+X,!@Num_Lockb:switch-source()\n\ -+X,!b:switch-source()\n\ -+X,!l @Num_Lockd:dir-window()\n\ -+X,!l d:dir-window()\n\ -+X,!@Num_Lockd:dir-window()\n\ -+X,!d:dir-window()\n\ -+X,!l @Num_Lockk:kill-file()\n\ -+X,!l k:kill-file()\n\ -+X,!@Num_Lockk:kill-file()\n\ -+X,!k:kill-file()\n\ -+X,!l @Num_Locko:other-window()\n\ -+X,!l o:other-window()\n\ -+X,!@Num_Locko:other-window()\n\ -+X,!o:other-window()\n\ -+X,!l @Num_Locku:undo()\n\ -+X,!l u:undo()\n\ -+X,!@Num_Locku:undo()\n\ -+X,!u:undo()\n\ -+G: xedit-keyboard-reset()\n\ -+J: xedit-print-lisp-eval()\n\ -+Tab: insert-char()\n\ -+!l @Num_Lockb:insert-char()\n\ -+!l b: insert-char()\n\ -+!@Num_Lockb:insert-char()\n\ -+!b: insert-char()\n\ -+!l @Num_Lockd:insert-char()\n\ -+!l d: insert-char()\n\ -+!@Num_Lockd:insert-char()\n\ -+!d: insert-char()\n\ -+!l k: insert-char()\n\ -+!l @Num_Lockk:insert-char()\n\ -+!@Num_Lockk:insert-char()\n\ -+!k: insert-char()\n\ -+!l @Num_Locko:insert-char()\n\ -+!l o: insert-char()\n\ -+!@Num_Locko:insert-char()\n\ -+!o: insert-char()\n\ -+!l @Num_Locku:insert-char()\n\ -+!l u: insert-char()\n\ -+!@Num_Locku:insert-char()\n\ -+!u: insert-char()\n\ -+~s Insert: toggle-overwrite()\n\ -+c l @Num_Lock:xedit-focus() popup-menu(fileMenu)\n\ -+c @Num_Lock:xedit-focus() popup-menu(fileMenu)\n\ -+c l: xedit-focus() popup-menu(fileMenu)\n\ -+c: xedit-focus() popup-menu(fileMenu)\n\ -+c l @Num_Lock:xedit-focus() popup-menu(editMenu)\n\ -+c @Num_Lock:xedit-focus() popup-menu(editMenu)\n\ -+c l: xedit-focus() popup-menu(editMenu)\n\ -+c: xedit-focus() popup-menu(editMenu)\n\ -+c l @Num_Lock:xedit-focus() popup-menu(optionsMenu)\n\ -+c @Num_Lock:xedit-focus() popup-menu(optionsMenu)\n\ -+c l:xedit-focus() popup-menu(optionsMenu)\n\ -+c: xedit-focus() popup-menu(optionsMenu)\n\ -+: xedit-focus() select-start()\n\ -+: scroll-one-line-down()\n\ -+: scroll-one-line-up() -+ -+*filename.?.pieceSize: 256 -+*filename.translations: #override \ -+cS: no-op(r)\n\ -+cR: no-op(r)\n\ -+mI: no-op(r)\n\ -+cG: cancel-find-file()\n\ -+Return: load-file()\n\ -+Tab: file-completion(h)\n\ -+Escape: cancel-find-file()\n\ -+: no-op()\n\ -+: no-op()\n\ -+: set-keyboard-focus() select-start() -+ -+*ispell.translations: #override \ -+WM_PROTOCOLS: ispell(end) -+ -+! Sample dictionary, word chars and text mode resources setup -+!*ispell.dictionary: br -+!*ispell.dictionaries: br american americanmed+ english -+!*ispell*br.wordChars: áéíóúçÁÉÍÓÚÇàÀâêôÂÊÔüÜãõÃÕ- -+*ispell.ispellCommand: /usr/bin/aspell -B -m -+*ispell.lookCommand: /bin/egrep -+!*ispell*text.skipLines: .# -+ -+*ispell.geometry: 0x0 -+*ispell.minWidth: 320 -+*ispell.minHeight: 245 -+*ispell*Label.borderWidth: 0 -+*ispell*Label.internalHeight: 4 -+*ispell*Label.justify: right -+*ispell*Label.width: 112 -+*ispell*Label.left: chainLeft -+*ispell*Label.right: chainLeft -+*ispell*Label.top: chainTop -+*ispell*Label.bottom: chainTop -+*ispell*mispelled.label: Misspelled word: -+*ispell*mispelled.top: chainTop -+*ispell*mispelled.bottom: chainTop -+*ispell*mispelled.internalWidth: 0 -+*ispell*repeated.label: Repeated words: -+*ispell*repeated.internalWidth: 0 -+*ispell*replacement.label: Replace with: -+*ispell*word.fromHoriz: mispelled -+*ispell*word.justify: left -+*ispell*word.borderWidth: 1 -+*ispell*word.internalWidth: 4 -+*ispell*word.internalHeight: 3 -+*ispell*word.width: 194 -+*ispell*word.left: chainLeft -+*ispell*word.right: chainRight -+*ispell*word.top: chainTop -+*ispell*word.bottom: chainTop -+*ispell*word.label: -+*ispell*word.tip: Press here to select this text -+*ispell*word.highlightThickness: 0 -+*ispell*text.fromHoriz: replacement -+*ispell*replacement.fromVert: mispelled -+*ispell*replacement.internalWidth: 0 -+*ispell*form.text.fromVert: word -+*ispell*form.text.width: 194 -+*ispell*form.text.top: chainTop -+*ispell*form.text.bottom: chainTop -+*ispell*form.text.left: chainLeft -+*ispell*form.text.right: chainRight -+*ispell*form.text.leftMargin: 4 -+*ispell*form.text.?.pieceSize: 256 -+*ispell*suggestions.label: Suggestions: -+*ispell*suggestions.fromVert: replacement -+*ispell*suggestions.internalWidth: 0 -+*ispell*viewport.fromHoriz: suggestions -+*ispell*viewport.fromVert: text -+*ispell*viewport.width: 194 -+*ispell*viewport.height: 143 -+*ispell*viewport.top: chainTop -+*ispell*viewport.bottom: chainBottom -+*ispell*viewport.left: chainLeft -+*ispell*viewport.right: chainRight -+*ispell*viewport.forceBars: 1 -+*ispell*viewport.allowVert: 1 -+*ispell*list.defaultColumns: 1 -+*ispell*list.longest: 16384 -+*ispell*commands.vertDistance: 5 -+*ispell*commands.fromVert: suggestions -+*ispell*commands.top: chainBottom -+*ispell*commands.bottom: chainBottom -+*ispell*commands.right: chainLeft -+*ispell*commands.left: chainLeft -+*ispell*check.label: Check -+*ispell*check.width: 54 -+*ispell*check.tip: Ask ispell about the word in the text field -+*ispell*look.label: Look -+*ispell*look.fromHoriz: check -+*ispell*look.horizDistance: 0 -+*ispell*look.width: 46 -+*ispell*look.tip: Runs the look command -+*ispell*undo.fromVert: check -+*ispell*undo.label: Undo -+*ispell*undo.width: 102 -+*ispell*undo.tip: Undo last action -+*ispell*replace.fromVert: undo -+*ispell*replace.label: Replace -+*ispell*replace.tip: Replace occurence of the word -+*ispell*replaceAll.fromVert: undo -+*ispell*replaceAll.fromHoriz: replace -+*ispell*replaceAll.label: All -+*ispell*replaceAll.tip: Replace all occurences of the word -+*ispell*ignore.fromVert: replace -+*ispell*ignore.label: Ignore -+*ispell*ignore.tip: Ignore this word -+*ispell*ignoreAll.fromVert: replaceAll -+*ispell*ignoreAll.fromHoriz: ignore -+*ispell*ignoreAll.label: All -+*ispell*ignoreAll.tip: Ignore all ocurrences of the word -+*ispell*add.fromVert: ignore -+*ispell*add.label: Add -+*ispell*add.width: 50 -+*ispell*add.tip: Add word to your private dictionary -+*ispell*addUncap.fromVert: ignoreAll -+*ispell*addUncap.fromHoriz: add -+*ispell*addUncap.label: Uncap -+*ispell*addUncap.horizDistance: 0 -+*ispell*addUncap.width: 50 -+*ispell*addUncap.tip: Add word uncapitalized, to your private dictionary -+*ispell*suspend.fromVert: add -+*ispell*suspend.label: Suspend -+*ispell*suspend.width: 57 -+*ispell*suspend.tip: Suspend ispell execution -+*ispell*cancel.fromHoriz: suspend -+*ispell*cancel.fromVert: addUncap -+*ispell*cancel.label: Close -+*ispell*cancel.width: 43 -+*ispell*cancel.horizDistance: 0 -+*ispell*cancel.tip: Terminates ispell process -+*ispell*replace.width: 65 -+*ispell*ignore.width: 65 -+*ispell*replaceAll.width: 35 -+*ispell*replaceAll.horizDistance: 0 -+*ispell*ignoreAll.width: 35 -+*ispell*ignoreAll.horizDistance: 0 -+*ispell*terse.fromVert: cancel -+*ispell*terse.Label: Terse Mode -+*ispell*terse.width: 104 -+*ispell*terse.borderWidth: 0 -+*ispell*terse.tip: Switch terse mode -+*ispell*status.fromVert: viewport -+*ispell*status.fromHoriz: suggestions -+*ispell*status.top: chainBottom -+*ispell*status.bottom: chainBottom -+*ispell*status.left: chainLeft -+*ispell*status.right: chainRight -+*ispell*status.width: 194 -+*ispell*status.borderWidth: 1 -+*ispell*status.justify: left -+*ispell*status.internalHeight: 2 -+*ispell*status.vertDistance: 2 -+*ispell*options.fromVert: status -+*ispell*options.fromHoriz: commands -+*ispell*options.bottom: chainBottom -+*ispell*options.top: chainBottom -+*ispell*options.left: chainLeft -+*ispell*options.right: chainRight -+*ispell*options.dict.width: 121 -+*ispell*options.horizDistance: 2 -+*ispell*options.vertDistance: 2 -+*ispell*options.defaultDistance: 2 -+*ispell*dict.highlightThickness: 0 -+*ispell*dict.justify: left -+*ispell*dict.resizable: False -+*ispell*dict.leftBitmap: menu12 -+*ispell*dict.label: Dictionary -+*ispell*dict.tip: Change dictionary -+*ispell*options.format.width: 65 -+*ispell*format.highlightThickness: 0 -+*ispell*format.justify: left -+*ispell*format.resizable: False -+*ispell*format.leftBitmap: menu12 -+*ispell*format.fromHoriz: dict -+*ispell*format.horizDistance: 0 -+*ispell*format.tip: Select text type -+ -+*columns.minWidth: 140 -+*columns.minHeight: 76 -+*columns.maxWidth: 140 -+*columns.maxHeight: 76 -+*columns.form*defaultDistance: 4 -+*columns*left: chainLeft -+*columns*right: chainLeft -+*columns*top: chainTop -+*columns*bottom: chainTop -+*columns*Label.width: 96 -+*columns*Label.borderWidth: 0 -+*columns*Label.internalHeight: 4 -+*columns*Label.internalWidth: 2 -+*columns*Label.justify: right -+*columns*Text.width: 30 -+*columns*Command.width: 58 -+*columns*leftLabel.label: Left Column: -+*columns*left.fromHoriz: leftLabel -+*columns*rightLabel.label: Right Column: -+*columns*rightLabel.fromVert: leftLabel -+*columns*right.fromHoriz: rightLabel -+*columns*right.fromVert: left -+*columns*ok.fromVert: rightLabel -+*columns*cancel.fromHoriz: ok -+*columns*cancel.fromVert: rightLabel -+*columns*cancel.horizDistance: 12 -+*columns*Text.?.pieceSize: 8 -+ -+*columns*Text.translations: #override \ -+cS: no-op(r)\n\ -+cR: no-op(r)\n\ -+mI: no-op(r)\n\ -+Return: set-columns(ok)\n\ -+Tab: change-field()\n\ -+cG: set-columns(cancel)\n\ -+Escape: set-columns(cancel)\n\ -+: no-op()\n\ -+: no-op()\n\ -+: set-keyboard-focus() select-start() -+ -+*columns.translations: #override \ -+WM_PROTOCOLS: set-columns(cancel) -+ -+! Use "white" as background for printing -+*printshell*background: white -+ -+! Print dialog -+*printdialogshell*geometry: 600x120 -+*printdialogshell*title: Print -+*printdialogshell*main*ok.fromVert: innerform -+*printdialogshell*main*ok.label: Print -+*printdialogshell*main*ok.tip: Print -+*printdialogshell*main*setup.fromHoriz: ok -+*printdialogshell*main*setup.fromVert: innerform -+*printdialogshell*main*setup.label: Setup... -+*printdialogshell*main*setup.tip: Configure print job options (page size, orientation, etc.) -+*printdialogshell*main*cancel.fromHoriz: setup -+*printdialogshell*main*cancel.fromVert: innerform -+*printdialogshell*main*cancel.label: Cancel -+*printdialogshell*main*cancel.tip: Cancel printing -+*printdialogshell*main*desclabel.label: Printer Description: -+*printdialogshell*main*desclabel.tip: Short description of printer -+*printdialogshell*main*desc.fromHoriz: desclabel -+*printdialogshell*main*desc.tip: Short description of printer -+*printdialogshell*main*info.fromHoriz: desc -+*printdialogshell*main*info.label: Printer info... -+*printdialogshell*main*info.tip: Display additional information about this printer -+*printdialogshell*main*namelabel.fromVert: desclabel -+*printdialogshell*main*namelabel.label: Printer Name: -+*printdialogshell*main*namelabel.tip: Name of selected printer -+*printdialogshell*main*name.fromHoriz: namelabel -+*printdialogshell*main*name.fromVert: desclabel -+*printdialogshell*main*name.tip: Name of selected printer -+*printdialogshell*main*selectprinter.fromHoriz: name -+*printdialogshell*main*selectprinter.fromVert: desclabel -+*printdialogshell*main*selectprinter.label: Select Printer... -+*printdialogshell*main*selectprinter.label: Select Printer... -+*printdialogshell*main*selectprinter.tip: Select a different printer -+*printdialogshell*main*filenamelabel.fromVert: namelabel -+*printdialogshell*main*filenamelabel.label: File Name: -+*printdialogshell*main*filenamelabel.tip: File where the output should be stored -+*printdialogshell*main*filename.fromHoriz: filenamelabel -+*printdialogshell*main*filename.fromVert: namelabel -+*printdialogshell*main*filename.tip: File where the output should be stored -+*printdialogshell*main*selectfile.fromHoriz: filename -+*printdialogshell*main*selectfile.fromVert: namelabel -+*printdialogshell*main*selectfile.label: Select File... -+*printdialogshell*main*selectfile.tip: Select file where the output should be stored -+*printdialogshell*main*printtoprinter.fromVert: filenamelabel -+*printdialogshell*main*printtoprinter.label: Print to Printer -+*printdialogshell*main*printtoprinter.tip: Send print job to printer -+*printdialogshell*main*printtofile.fromVert: filenamelabel -+*printdialogshell*main*printtofile.fromHoriz: printtoprinter -+*printdialogshell*main*printtofile.label: Print to File -+*printdialogshell*main*printtofile.tip: Save print job in a file -+ -+! Print job options dialog -+*printdialogshell*setup*geometry: 600x400 -+*printdialogshell*setup*title: Print: Print job options -+*printdialogshell*setup*ok.fromVert: list -+*printdialogshell*setup*ok.label: OK -+*printdialogshell*setup*ok.tip: Commit changes -+*printdialogshell*setup*cancel.fromHoriz: ok -+*printdialogshell*setup*cancel.fromVert: list -+*printdialogshell*setup*cancel.label: Cancel -+*printdialogshell*setup*cancel.tip: Cancel and reset to defaults -+*printdialogshell*setup*paperlist.tip: Select paper size -+*printdialogshell*setup*resolutionlist.fromHoriz: paperlist -+*printdialogshell*setup*resolutionlist.tip: Select page resolution -+*printdialogshell*setup*orientationlist.fromHoriz: resolutionlist -+*printdialogshell*setup*orientationlist.tip: Select page orientation -+*printdialogshell*setup*plexlist.fromHoriz: orientationlist -+*printdialogshell*setup*plexlist.tip: Select page plex mode (simplex, duplex, etc.) -+*printdialogshell*setup*colorspacelist.fromHoriz: plexlist -+*printdialogshell*setup*colorspacelist.tip: Select color space (color, grayscale, CYMK, etc.) -+*printdialogshell*setup*jobcopieslabel.fromVert: paperlist -+*printdialogshell*setup*jobcopieslabel.tip: Set number of job copies -+*printdialogshell*setup*jobcopieslabel.label: Job Copies: -+*printdialogshell*setup*jobcopies.fromHoriz: jobcopieslabel -+*printdialogshell*setup*jobcopies.fromVert: paperlist -+*printdialogshell*setup*jobcopies.tip: Set number of job copies -+ -+! Printer selection -+*printdialogshell*printerselection*geometry: 400x150 -+*printdialogshell*printerselection*title: Print: Select printer -+*printdialogshell*printerselection*ok.fromVert: list -+*printdialogshell*printerselection*ok.label: OK -+*printdialogshell*printerselection*ok.tip: Switch printer -+*printdialogshell*printerselection*cancel.fromHoriz: ok -+*printdialogshell*printerselection*cancel.fromVert: list -+*printdialogshell*printerselection*cancel.label: Cancel -+*printdialogshell*printerselection*cancel.tip: Cancel printer selection -+*printdialogshell*printerselection*list.tip: Select printer name from list -+ -+! Select job file -+*printdialogshell*selectfile*geometry: 400x80 -+*printdialogshell*selectfile*title: Print: Select job file -+*printdialogshell*selectfile*dialog.label: Select Filename: -+ -+! EOF. -Index: x11-apps/xedit/app-defaults/Xedit-xprint.ad -=================================================================== ---- x11-apps.orig/xedit/app-defaults/Xedit-xprint.ad 2010-03-21 10:07:00.000000000 +0100 -+++ /dev/null 1970-01-01 00:00:00.000000000 +0000 -@@ -1,565 +0,0 @@ --! $XFree86: xc/programs/xedit/Xedit.ad,v 1.23 2002/09/22 07:09:05 paulo Exp $ -- --*geometry: 590x440 --*input: TRUE --*enableBackups: True --*backupNameSuffix: ~ --*changedBitmap: xlogo11 --*international: True -- --*hints:\ --Use Control-S and Control-R to Search.\n\ --Use Control-Shift-_ to Undo. Control-G to switch between Undo and Redo.\n\ --Use Control-A to jump to the beginning of the line.\n\ --Use Control-E to jump to the end of the line.\n\ --Use Control-T to transpose characters.\n\ --Use Control-K to cut to the end of the line. Control-Y to paste.\n\ --Use Control-Q to escape control characters.\n\ --Use Control-U[,] to multiply actions. Control-G to cancel.\n\ --Use Control-Z to scroll one line up. Meta-Z to scroll one line down.\n\ --Use Meta-Q to format a paragraph.\n\ --Use Right-Button to extend selections.\n\ --Use Meta-I to insert a file.\n\ --Use Control-W to delete a selection, and/or jump to the selection mark.\n\ --Use Control-X,Control-F to find a file. Tab for filename completion.\n\ --Use Control-X,Control-S to save.\n\ --Use Control-X,Control-C to exit.\n\ --Use Control-C to paste the selection at CUT_BUFFER0.\n\ --Use Control Left-Button to popup the File Menu.\n\ --Use Control Middle-Button to popup the Edit Menu.\n\ --Use Control Right-Button to popup the Option Menu.\n\ --Use Control-X,Tab to Indent.\n\ --Use Control-X,0 to delete current splitted window.\n\ --Use Control-X,1 to delete other splitted window.\n\ --Use Control-X,2 to split the window vertically.\n\ --Use Control-X,3 to split the window horizontally.\n\ --Use Control-X,b to switch to another file.\n\ --Use Control-X,d to list directory. Control-G to Cancel.\n\ --Use Control-X,k to close file being edited.\n\ --Use Control-X,o to switch to another splitted window.\n\ --Use Control-X,u to undo. Control-G to switch between Undo and Redo.\n\ --Use Insert to toggle Overwrite mode.\n\ --Use Control-G to interrupt the lisp subprocess -- --*formWindow*defaultDistance: 2 --*formWindow.?.borderWidth: 0 --*formWindow.min: 18 --*formWindow.max: 18 --*formWindow.showGrip: False --*positionWindow.fromHoriz: labelWindow --*positionWindow.horizDistance: 0 --*positionWindow.left: chainRight --*positionWindow.right: chainRight --*positionWindow.width: 90 --*positionWindow.label: error --*positionWindow.justify: left --*labelWindow*justify: center --*labelWindow*label: no file yet --*labelWindow.left: chainLeft --*labelWindow.right: chainRight -- --*quit.label: Quit --*quit.tip: Close xedit window --*save.label: Save --*save.tip: Save current file --*load.label: Load --*load.tip: Load a new file --*print.label: Print --*print.tip: Print current file -- --*buttons*orientation: horizontal --*buttons*showGrip: False --*buttons.min: 18 -- --*messageWindow.height: 70 --*messageWindow.min: 18 --*Paned*Text*allowResize: True -- --*messageWindow.autoFill: False --*messageWindow.scrollVertical: Never -- --*editWindow.autoFill: False --*editWindow.scrollVertical: Always --*editWindow.showGrip: True --xedit.textSource*enableUndo: True -- --*bc_label*label: Use Control-S and Control-R to Search. --*bc_label*showGrip: False --*bc_label.min: 18 -- --*dirlabel.showGrip: False --*dirlabel.min: 18 --*dirlabel.max: 18 -- --*dirwindow.defaultColumns: 0 --*dirwindow.verticalList: True -- --*viewport.forceBars: True --*viewport.allowVert: 1 -- --*insertFile*text.width: 141 --*insertFile*text.?.pieceSize: 256 --*search*searchText.width: 157 --*search*replaceText.width: 157 --*search*case.horizDistance: 25 --*search*Text.?.pieceSize: 256 -- --*SimpleMenu.BackingStore: NotUseful --*SimpleMenu.menuLabel.vertSpace: 80 --*SimpleMenu.SmeBSB.HorizontalMargins: 16 --*SimpleMenu.justify: center --*SimpleMenu.menuLabel.height: 250 --*SimpleMenu*cursor: left_ptr -- --*fileMenu.label: File Menu --*optionsMenu.label: Option Menu --*optionsMenu.ispell.label: ispell... --*editMenu.label: Edit Menu --*editMenu.wrapMenuItem.label: Wrapping --*editMenu.wrapMenuItem.leftBitmap: menu12 --*wrapMenu.never.label: Never --*wrapMenu.line.label: Line --*wrapMenu.word.label: Word --*editMenu.autoFill.label: Auto Fill --*editMenu.justifyMenuItem.label: Justification --*editMenu.justifyMenuItem.leftBitmap: menu12 --*justifyMenu.left.label: Left --*justifyMenu.right.label: Right --*justifyMenu.center.label: Center --*justifyMenu.full.label: Full --*editMenu.breakColumns.label: Break Columns... --*editMenu.scrollMenuItem.label: Scrollbars --*editMenu.scrollMenuItem.leftBitmap: menu12 --*scrollMenu.vertical.label: Vertical --*scrollMenu.horizontal.label: Horizontal --*editMenu.modeMenuItem.leftBitmap: menu12 --*editMenu.modeMenuItem.label: Edit Mode --*editModes.none.label: Plain/None -- --*TransientShell*Text.translations: #override \ --cS: no-op(r)\n\ --cR: no-op(r)\n\ --mI: no-op(r) -- --*search.translations: #override \ --:get-values(my, $w, width, $h, height)\ -- set-values(1, minWidth, $w, minHeight, $h, maxHeight, $h, allowShellResize, False) -- --*insertFile.title: Insert File --*insertFile.translations: #override \ --:get-values(my, $w, width, $h, height)\ -- set-values(1, minWidth, $w, minHeight, $h, maxHeight, $h, allowShellResize, False) -- --*baseTranslations: #override \ --X,C:quit()\n\ --X,S:save-file()\n\ --X,P:print-file()\n\ --X,F:find-file()\n\ --Escape: line-edit() -- --*messageWindow.Translations: #override \ --X,C:quit()\n\ --X,S:save-file()\n\ --X,P:print-file()\n\ --X,F:find-file()\n\ --: no-op()\n\ --: no-op()\n\ --: set-keyboard-focus() select-start() -- --*searchText.Translations: #override \ --: no-op()\n\ --: no-op()\n\ --: set-keyboard-focus() select-start() -- --*replaceText.Translations: #override \ --: no-op()\n\ --: no-op()\n\ --: set-keyboard-focus() select-start() -- --*editWindow.translations: #override \ --X,E:lisp-eval()\n\ --X,Tab:indent()\n\ --X,:0:delete-window(current)\n\ --X,:1:delete-window(other)\n\ --X,:2:split-window(vertical)\n\ --X,:3:split-window(horizontal)\n\ --X,!l @Num_Lockb:switch-source()\n\ --X,!l b:switch-source()\n\ --X,!@Num_Lockb:switch-source()\n\ --X,!b:switch-source()\n\ --X,!l @Num_Lockd:dir-window()\n\ --X,!l d:dir-window()\n\ --X,!@Num_Lockd:dir-window()\n\ --X,!d:dir-window()\n\ --X,!l @Num_Lockk:kill-file()\n\ --X,!l k:kill-file()\n\ --X,!@Num_Lockk:kill-file()\n\ --X,!k:kill-file()\n\ --X,!l @Num_Locko:other-window()\n\ --X,!l o:other-window()\n\ --X,!@Num_Locko:other-window()\n\ --X,!o:other-window()\n\ --X,!l @Num_Locku:undo()\n\ --X,!l u:undo()\n\ --X,!@Num_Locku:undo()\n\ --X,!u:undo()\n\ --G: xedit-keyboard-reset()\n\ --J: xedit-print-lisp-eval()\n\ --Tab: insert-char()\n\ --!l @Num_Lockb:insert-char()\n\ --!l b: insert-char()\n\ --!@Num_Lockb:insert-char()\n\ --!b: insert-char()\n\ --!l @Num_Lockd:insert-char()\n\ --!l d: insert-char()\n\ --!@Num_Lockd:insert-char()\n\ --!d: insert-char()\n\ --!l k: insert-char()\n\ --!l @Num_Lockk:insert-char()\n\ --!@Num_Lockk:insert-char()\n\ --!k: insert-char()\n\ --!l @Num_Locko:insert-char()\n\ --!l o: insert-char()\n\ --!@Num_Locko:insert-char()\n\ --!o: insert-char()\n\ --!l @Num_Locku:insert-char()\n\ --!l u: insert-char()\n\ --!@Num_Locku:insert-char()\n\ --!u: insert-char()\n\ --~s Insert: toggle-overwrite()\n\ --c l @Num_Lock:xedit-focus() popup-menu(fileMenu)\n\ --c @Num_Lock:xedit-focus() popup-menu(fileMenu)\n\ --c l: xedit-focus() popup-menu(fileMenu)\n\ --c: xedit-focus() popup-menu(fileMenu)\n\ --c l @Num_Lock:xedit-focus() popup-menu(editMenu)\n\ --c @Num_Lock:xedit-focus() popup-menu(editMenu)\n\ --c l: xedit-focus() popup-menu(editMenu)\n\ --c: xedit-focus() popup-menu(editMenu)\n\ --c l @Num_Lock:xedit-focus() popup-menu(optionsMenu)\n\ --c @Num_Lock:xedit-focus() popup-menu(optionsMenu)\n\ --c l:xedit-focus() popup-menu(optionsMenu)\n\ --c: xedit-focus() popup-menu(optionsMenu)\n\ --: xedit-focus() select-start()\n\ --: scroll-one-line-down()\n\ --: scroll-one-line-up() -- --*filename.?.pieceSize: 256 --*filename.translations: #override \ --cS: no-op(r)\n\ --cR: no-op(r)\n\ --mI: no-op(r)\n\ --cG: cancel-find-file()\n\ --Return: load-file()\n\ --Tab: file-completion(h)\n\ --Escape: cancel-find-file()\n\ --: no-op()\n\ --: no-op()\n\ --: set-keyboard-focus() select-start() -- --*ispell.translations: #override \ --WM_PROTOCOLS: ispell(end) -- --! Sample dictionary, word chars and text mode resources setup --!*ispell.dictionary: br --!*ispell.dictionaries: br american americanmed+ english --!*ispell*br.wordChars: áéíóúçÁÉÍÓÚÇàÀâêôÂÊÔüÜãõÃÕ- --*ispell.ispellCommand: /usr/bin/aspell -B -m --*ispell.lookCommand: /bin/egrep --!*ispell*text.skipLines: .# -- --*ispell.geometry: 0x0 --*ispell.minWidth: 320 --*ispell.minHeight: 245 --*ispell*Label.borderWidth: 0 --*ispell*Label.internalHeight: 4 --*ispell*Label.justify: right --*ispell*Label.width: 112 --*ispell*Label.left: chainLeft --*ispell*Label.right: chainLeft --*ispell*Label.top: chainTop --*ispell*Label.bottom: chainTop --*ispell*mispelled.label: Misspelled word: --*ispell*mispelled.top: chainTop --*ispell*mispelled.bottom: chainTop --*ispell*mispelled.internalWidth: 0 --*ispell*repeated.label: Repeated words: --*ispell*repeated.internalWidth: 0 --*ispell*replacement.label: Replace with: --*ispell*word.fromHoriz: mispelled --*ispell*word.justify: left --*ispell*word.borderWidth: 1 --*ispell*word.internalWidth: 4 --*ispell*word.internalHeight: 3 --*ispell*word.width: 194 --*ispell*word.left: chainLeft --*ispell*word.right: chainRight --*ispell*word.top: chainTop --*ispell*word.bottom: chainTop --*ispell*word.label: --*ispell*word.tip: Press here to select this text --*ispell*word.highlightThickness: 0 --*ispell*text.fromHoriz: replacement --*ispell*replacement.fromVert: mispelled --*ispell*replacement.internalWidth: 0 --*ispell*form.text.fromVert: word --*ispell*form.text.width: 194 --*ispell*form.text.top: chainTop --*ispell*form.text.bottom: chainTop --*ispell*form.text.left: chainLeft --*ispell*form.text.right: chainRight --*ispell*form.text.leftMargin: 4 --*ispell*form.text.?.pieceSize: 256 --*ispell*suggestions.label: Suggestions: --*ispell*suggestions.fromVert: replacement --*ispell*suggestions.internalWidth: 0 --*ispell*viewport.fromHoriz: suggestions --*ispell*viewport.fromVert: text --*ispell*viewport.width: 194 --*ispell*viewport.height: 143 --*ispell*viewport.top: chainTop --*ispell*viewport.bottom: chainBottom --*ispell*viewport.left: chainLeft --*ispell*viewport.right: chainRight --*ispell*viewport.forceBars: 1 --*ispell*viewport.allowVert: 1 --*ispell*list.defaultColumns: 1 --*ispell*list.longest: 16384 --*ispell*commands.vertDistance: 5 --*ispell*commands.fromVert: suggestions --*ispell*commands.top: chainBottom --*ispell*commands.bottom: chainBottom --*ispell*commands.right: chainLeft --*ispell*commands.left: chainLeft --*ispell*check.label: Check --*ispell*check.width: 54 --*ispell*check.tip: Ask ispell about the word in the text field --*ispell*look.label: Look --*ispell*look.fromHoriz: check --*ispell*look.horizDistance: 0 --*ispell*look.width: 46 --*ispell*look.tip: Runs the look command --*ispell*undo.fromVert: check --*ispell*undo.label: Undo --*ispell*undo.width: 102 --*ispell*undo.tip: Undo last action --*ispell*replace.fromVert: undo --*ispell*replace.label: Replace --*ispell*replace.tip: Replace occurence of the word --*ispell*replaceAll.fromVert: undo --*ispell*replaceAll.fromHoriz: replace --*ispell*replaceAll.label: All --*ispell*replaceAll.tip: Replace all occurences of the word --*ispell*ignore.fromVert: replace --*ispell*ignore.label: Ignore --*ispell*ignore.tip: Ignore this word --*ispell*ignoreAll.fromVert: replaceAll --*ispell*ignoreAll.fromHoriz: ignore --*ispell*ignoreAll.label: All --*ispell*ignoreAll.tip: Ignore all ocurrences of the word --*ispell*add.fromVert: ignore --*ispell*add.label: Add --*ispell*add.width: 50 --*ispell*add.tip: Add word to your private dictionary --*ispell*addUncap.fromVert: ignoreAll --*ispell*addUncap.fromHoriz: add --*ispell*addUncap.label: Uncap --*ispell*addUncap.horizDistance: 0 --*ispell*addUncap.width: 50 --*ispell*addUncap.tip: Add word uncapitalized, to your private dictionary --*ispell*suspend.fromVert: add --*ispell*suspend.label: Suspend --*ispell*suspend.width: 57 --*ispell*suspend.tip: Suspend ispell execution --*ispell*cancel.fromHoriz: suspend --*ispell*cancel.fromVert: addUncap --*ispell*cancel.label: Close --*ispell*cancel.width: 43 --*ispell*cancel.horizDistance: 0 --*ispell*cancel.tip: Terminates ispell process --*ispell*replace.width: 65 --*ispell*ignore.width: 65 --*ispell*replaceAll.width: 35 --*ispell*replaceAll.horizDistance: 0 --*ispell*ignoreAll.width: 35 --*ispell*ignoreAll.horizDistance: 0 --*ispell*terse.fromVert: cancel --*ispell*terse.Label: Terse Mode --*ispell*terse.width: 104 --*ispell*terse.borderWidth: 0 --*ispell*terse.tip: Switch terse mode --*ispell*status.fromVert: viewport --*ispell*status.fromHoriz: suggestions --*ispell*status.top: chainBottom --*ispell*status.bottom: chainBottom --*ispell*status.left: chainLeft --*ispell*status.right: chainRight --*ispell*status.width: 194 --*ispell*status.borderWidth: 1 --*ispell*status.justify: left --*ispell*status.internalHeight: 2 --*ispell*status.vertDistance: 2 --*ispell*options.fromVert: status --*ispell*options.fromHoriz: commands --*ispell*options.bottom: chainBottom --*ispell*options.top: chainBottom --*ispell*options.left: chainLeft --*ispell*options.right: chainRight --*ispell*options.dict.width: 121 --*ispell*options.horizDistance: 2 --*ispell*options.vertDistance: 2 --*ispell*options.defaultDistance: 2 --*ispell*dict.highlightThickness: 0 --*ispell*dict.justify: left --*ispell*dict.resizable: False --*ispell*dict.leftBitmap: menu12 --*ispell*dict.label: Dictionary --*ispell*dict.tip: Change dictionary --*ispell*options.format.width: 65 --*ispell*format.highlightThickness: 0 --*ispell*format.justify: left --*ispell*format.resizable: False --*ispell*format.leftBitmap: menu12 --*ispell*format.fromHoriz: dict --*ispell*format.horizDistance: 0 --*ispell*format.tip: Select text type -- --*columns.minWidth: 140 --*columns.minHeight: 76 --*columns.maxWidth: 140 --*columns.maxHeight: 76 --*columns.form*defaultDistance: 4 --*columns*left: chainLeft --*columns*right: chainLeft --*columns*top: chainTop --*columns*bottom: chainTop --*columns*Label.width: 96 --*columns*Label.borderWidth: 0 --*columns*Label.internalHeight: 4 --*columns*Label.internalWidth: 2 --*columns*Label.justify: right --*columns*Text.width: 30 --*columns*Command.width: 58 --*columns*leftLabel.label: Left Column: --*columns*left.fromHoriz: leftLabel --*columns*rightLabel.label: Right Column: --*columns*rightLabel.fromVert: leftLabel --*columns*right.fromHoriz: rightLabel --*columns*right.fromVert: left --*columns*ok.fromVert: rightLabel --*columns*cancel.fromHoriz: ok --*columns*cancel.fromVert: rightLabel --*columns*cancel.horizDistance: 12 --*columns*Text.?.pieceSize: 8 -- --*columns*Text.translations: #override \ --cS: no-op(r)\n\ --cR: no-op(r)\n\ --mI: no-op(r)\n\ --Return: set-columns(ok)\n\ --Tab: change-field()\n\ --cG: set-columns(cancel)\n\ --Escape: set-columns(cancel)\n\ --: no-op()\n\ --: no-op()\n\ --: set-keyboard-focus() select-start() -- --*columns.translations: #override \ --WM_PROTOCOLS: set-columns(cancel) -- --! Use "white" as background for printing --*printshell*background: white -- --! Print dialog --*printdialogshell*geometry: 600x120 --*printdialogshell*title: Print --*printdialogshell*main*ok.fromVert: innerform --*printdialogshell*main*ok.label: Print --*printdialogshell*main*ok.tip: Print --*printdialogshell*main*setup.fromHoriz: ok --*printdialogshell*main*setup.fromVert: innerform --*printdialogshell*main*setup.label: Setup... --*printdialogshell*main*setup.tip: Configure print job options (page size, orientation, etc.) --*printdialogshell*main*cancel.fromHoriz: setup --*printdialogshell*main*cancel.fromVert: innerform --*printdialogshell*main*cancel.label: Cancel --*printdialogshell*main*cancel.tip: Cancel printing --*printdialogshell*main*desclabel.label: Printer Description: --*printdialogshell*main*desclabel.tip: Short description of printer --*printdialogshell*main*desc.fromHoriz: desclabel --*printdialogshell*main*desc.tip: Short description of printer --*printdialogshell*main*info.fromHoriz: desc --*printdialogshell*main*info.label: Printer info... --*printdialogshell*main*info.tip: Display additional information about this printer --*printdialogshell*main*namelabel.fromVert: desclabel --*printdialogshell*main*namelabel.label: Printer Name: --*printdialogshell*main*namelabel.tip: Name of selected printer --*printdialogshell*main*name.fromHoriz: namelabel --*printdialogshell*main*name.fromVert: desclabel --*printdialogshell*main*name.tip: Name of selected printer --*printdialogshell*main*selectprinter.fromHoriz: name --*printdialogshell*main*selectprinter.fromVert: desclabel --*printdialogshell*main*selectprinter.label: Select Printer... --*printdialogshell*main*selectprinter.label: Select Printer... --*printdialogshell*main*selectprinter.tip: Select a different printer --*printdialogshell*main*filenamelabel.fromVert: namelabel --*printdialogshell*main*filenamelabel.label: File Name: --*printdialogshell*main*filenamelabel.tip: File where the output should be stored --*printdialogshell*main*filename.fromHoriz: filenamelabel --*printdialogshell*main*filename.fromVert: namelabel --*printdialogshell*main*filename.tip: File where the output should be stored --*printdialogshell*main*selectfile.fromHoriz: filename --*printdialogshell*main*selectfile.fromVert: namelabel --*printdialogshell*main*selectfile.label: Select File... --*printdialogshell*main*selectfile.tip: Select file where the output should be stored --*printdialogshell*main*printtoprinter.fromVert: filenamelabel --*printdialogshell*main*printtoprinter.label: Print to Printer --*printdialogshell*main*printtoprinter.tip: Send print job to printer --*printdialogshell*main*printtofile.fromVert: filenamelabel --*printdialogshell*main*printtofile.fromHoriz: printtoprinter --*printdialogshell*main*printtofile.label: Print to File --*printdialogshell*main*printtofile.tip: Save print job in a file -- --! Print job options dialog --*printdialogshell*setup*geometry: 600x400 --*printdialogshell*setup*title: Print: Print job options --*printdialogshell*setup*ok.fromVert: list --*printdialogshell*setup*ok.label: OK --*printdialogshell*setup*ok.tip: Commit changes --*printdialogshell*setup*cancel.fromHoriz: ok --*printdialogshell*setup*cancel.fromVert: list --*printdialogshell*setup*cancel.label: Cancel --*printdialogshell*setup*cancel.tip: Cancel and reset to defaults --*printdialogshell*setup*paperlist.tip: Select paper size --*printdialogshell*setup*resolutionlist.fromHoriz: paperlist --*printdialogshell*setup*resolutionlist.tip: Select page resolution --*printdialogshell*setup*orientationlist.fromHoriz: resolutionlist --*printdialogshell*setup*orientationlist.tip: Select page orientation --*printdialogshell*setup*plexlist.fromHoriz: orientationlist --*printdialogshell*setup*plexlist.tip: Select page plex mode (simplex, duplex, etc.) --*printdialogshell*setup*colorspacelist.fromHoriz: plexlist --*printdialogshell*setup*colorspacelist.tip: Select color space (color, grayscale, CYMK, etc.) --*printdialogshell*setup*jobcopieslabel.fromVert: paperlist --*printdialogshell*setup*jobcopieslabel.tip: Set number of job copies --*printdialogshell*setup*jobcopieslabel.label: Job Copies: --*printdialogshell*setup*jobcopies.fromHoriz: jobcopieslabel --*printdialogshell*setup*jobcopies.fromVert: paperlist --*printdialogshell*setup*jobcopies.tip: Set number of job copies -- --! Printer selection --*printdialogshell*printerselection*geometry: 400x150 --*printdialogshell*printerselection*title: Print: Select printer --*printdialogshell*printerselection*ok.fromVert: list --*printdialogshell*printerselection*ok.label: OK --*printdialogshell*printerselection*ok.tip: Switch printer --*printdialogshell*printerselection*cancel.fromHoriz: ok --*printdialogshell*printerselection*cancel.fromVert: list --*printdialogshell*printerselection*cancel.label: Cancel --*printdialogshell*printerselection*cancel.tip: Cancel printer selection --*printdialogshell*printerselection*list.tip: Select printer name from list -- --! Select job file --*printdialogshell*selectfile*geometry: 400x80 --*printdialogshell*selectfile*title: Print: Select job file --*printdialogshell*selectfile*dialog.label: Select Filename: -- --! EOF. diff --git a/debian/patches/02_xedit_manpage_typos.diff b/debian/patches/02_xedit_manpage_typos.diff deleted file mode 100644 index f20b400..0000000 --- a/debian/patches/02_xedit_manpage_typos.diff +++ /dev/null @@ -1,22 +0,0 @@ -Index: xbase-clients/xedit/xedit.man -=================================================================== ---- xbase-clients.orig/xedit/xedit.man 2006-02-18 14:56:14.000000000 -0500 -+++ xbase-clients/xedit/xedit.man 2006-02-26 20:37:32.000000000 -0500 -@@ -291,7 +291,7 @@ - .B autoReplace (\fPClass \fBReplace) - This resource is useful to automatically correct common misspelling errors, but - can also be used to create simple macros. The format is --\fI{non-blanks}{blanks}[{string}]\fP. Fields are separeted by newlines. -+\fI{non-blanks}{blanks}[{string}]\fP. Fields are separated by newlines. - Example of use: - \" - .br -@@ -308,7 +308,7 @@ - when you type that words. - .TP 8 - .B ispell.dictionaries (\fPClass \fBispell.Dictionary) --Specifies a list of dictionary names, separeted by spaces, available to the -+Specifies a list of dictionary names, separated by spaces, available to the - ispell program. The default value is \fI"american americamed+ english"\fP. - .TP 8 - .B ispell.dictionary (\fPClass \fBispell.Dictionary) diff --git a/debian/patches/03_xconsole_implicit_pointer_conversion.diff b/debian/patches/03_xconsole_implicit_pointer_conversion.diff deleted file mode 100644 index 2cc8903..0000000 --- a/debian/patches/03_xconsole_implicit_pointer_conversion.diff +++ /dev/null @@ -1,16 +0,0 @@ ---- - xconsole/xconsole.c | 1 + - 1 file changed, 1 insertion(+) - -Index: x11-apps/xconsole/xconsole.c -=================================================================== ---- x11-apps.orig/xconsole/xconsole.c 2009-07-27 18:42:39.000000000 +0200 -+++ x11-apps/xconsole/xconsole.c 2009-12-06 11:57:56.000000000 +0100 -@@ -32,6 +32,7 @@ - #include "config.h" - #endif - -+#define _XOPEN_SOURCE - #include - #include - #include diff --git a/debian/patches/05_xmore_fix_segv_without_xprint.diff b/debian/patches/05_xmore_fix_segv_without_xprint.diff deleted file mode 100644 index cbcc3d5..0000000 --- a/debian/patches/05_xmore_fix_segv_without_xprint.diff +++ /dev/null @@ -1,34 +0,0 @@ -This patch by Eugene Konev. - ---- - xmore/xmore.c | 9 ++++++++- - 1 file changed, 8 insertions(+), 1 deletion(-) - -Index: x11-apps/xmore/xmore.c -=================================================================== ---- x11-apps.orig/xmore/xmore.c 2009-12-06 11:58:01.000000000 +0100 -+++ x11-apps/xmore/xmore.c 2009-12-06 11:58:14.000000000 +0100 -@@ -150,7 +150,9 @@ - static void - printshellDestroyXtProc(Widget w, XtPointer client_data, XtPointer callData) - { -+#ifdef USE_XPRINT - XawPrintDialogClosePrinterConnection(printdialog, False); -+#endif - } - - #ifdef USE_XPRINT -@@ -302,7 +304,12 @@ - #endif - - n = 0; -- XtSetArg(args[n], XtNfromHoriz, printbutton); n++; -+#ifdef USE_XPRINT -+ XtSetArg(args[n], XtNfromHoriz, printbutton); -+#else -+ XtSetArg(args[n], XtNfromHoriz, NULL); -+#endif -+ n++; - XtSetArg(args[n], XtNfromVert, text); n++; - XtSetArg(args[n], XtNlabel, "Quit"); n++; - quitbutton = XtCreateManagedWidget("quit", commandWidgetClass, form, args, n); diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index e94bd24..0000000 --- a/debian/patches/series +++ /dev/null @@ -1,4 +0,0 @@ -01_xedit_mkdir_races.diff -#02_xedit_manpage_typos.diff -03_xconsole_implicit_pointer_conversion.diff -05_xmore_fix_segv_without_xprint.diff diff --git a/debian/rules b/debian/rules deleted file mode 100755 index abb6313..0000000 --- a/debian/rules +++ /dev/null @@ -1,114 +0,0 @@ -#!/usr/bin/make -f -# debian/rules for the Debian xutils 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 this to the name of the main shlib's binary package -PACKAGE = x11-apps - -include debian/xsfbs/xsfbs.mk - -# This package contains multiple modules as shipped by upstream. Each module is # contained in a subdirectory in the root dir of the package. You must list each -# subdirectory explicitly so that the build system knows what to build -# [soolim:20110111] : do not generate binaries not te be needed -DEF_SUBDIRS=bitmap ico oclock xcalc xclock xeyes xwd xwud -#DEF_SUBDIRS=bitmap ico oclock x11perf xbiff xcalc xclipboard xclock xconsole xcursorgen xditview xedit xeyes xgc xload xlogo xmag xman xmore xwd xwud -SUBDIRS=$(DEF_SUBDIRS) -BUILD_STAMPS = $(addprefix $(STAMP_DIR)/build-,$(SUBDIRS)) - -CFLAGS = -Wall -g -ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS))) - CFLAGS += -O0 -else - CFLAGS += -O2 -endif -ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) - NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) - MAKEFLAGS += -j$(NUMJOBS) -endif - -############################################################################# -# [soolim]: for xwd, do not check the multi vis. we cannot dump the window. -CFLAGS += -D_F_BLOCK_MULTI_VIS_ -############################################################################# - -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_HOST_GNU_TYPE) -ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE)) - confflags += --build=$(DEB_HOST_GNU_TYPE) -else - confflags += --build=$(DEB_HOST_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE) -endif - -build: build-stamp -build-stamp: $(BUILD_STAMPS) - >$@ - -$(STAMP_DIR)/build-%: $(STAMP_DIR)/genscripts $(STAMP_DIR)/patch - mkdir -p $*-obj-$(DEB_BUILD_GNU_TYPE) - - cd $*-obj-$(DEB_BUILD_GNU_TYPE) && \ - ../$*/configure --prefix=/usr --mandir=\$${prefix}/share/man \ - --infodir=\$${prefix}/share/info $(confflags) \ - --disable-xprint \ - --with-sysmanpath=/usr/man:/usr/share/man:/usr/local/man:/usr/local/share/man:/usr/X11R6/man:/opt/man \ - CFLAGS="$(CFLAGS)" \ - RSH=rsh \ - MANCONF="/etc/manpath.config" - cd $*-obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE) - >$@ - -clean: xsfclean - dh_testdir - dh_testroot - rm -f build-stamp - - 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 *-obj-* - - dh_clean - -install: build - dh_testdir - dh_testroot - dh_clean -k - dh_installdirs - - for FILE in $(SUBDIRS); do \ - cd "$$FILE"-obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install ; \ - cd ..; \ - done - -# Build architecture-dependent files here. -binary-arch: build install - dh_testdir - dh_testroot - -# dh_installdocs - dh_install --sourcedir=debian/tmp --list-missing -# dh_installmenu -# dh_installchangelogs - dh_link - dh_strip - dh_compress - dh_fixperms - dh_installdeb - dh_shlibdeps - dh_gencontrol - dh_md5sums - dh_builddeb - -# Build architecture-independent files here. -binary-indep: build install -# Nothing to do - -binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary install diff --git a/debian/watch.bitmap b/debian/watch.bitmap deleted file mode 100644 index c1ae0f1..0000000 --- a/debian/watch.bitmap +++ /dev/null @@ -1,2 +0,0 @@ -version=3 -http://xorg.freedesktop.org/releases/individual/app/ bitmap-(.*)\.tar\.gz diff --git a/debian/watch.ico b/debian/watch.ico deleted file mode 100644 index 78dbdd3..0000000 --- a/debian/watch.ico +++ /dev/null @@ -1,2 +0,0 @@ -version=3 -http://xorg.freedesktop.org/releases/individual/app/ ico-(.*)\.tar\.gz diff --git a/debian/watch.oclock b/debian/watch.oclock deleted file mode 100644 index 1650bce..0000000 --- a/debian/watch.oclock +++ /dev/null @@ -1,2 +0,0 @@ -version=3 -http://xorg.freedesktop.org/releases/individual/app/ oclock-(.*)\.tar\.gz diff --git a/debian/watch.x11perf b/debian/watch.x11perf deleted file mode 100644 index 5d1af0d..0000000 --- a/debian/watch.x11perf +++ /dev/null @@ -1,2 +0,0 @@ -version=3 -http://xorg.freedesktop.org/releases/individual/app/ x11perf-(.*)\.tar\.gz diff --git a/debian/watch.xbiff b/debian/watch.xbiff deleted file mode 100644 index cf308fc..0000000 --- a/debian/watch.xbiff +++ /dev/null @@ -1,2 +0,0 @@ -version=3 -http://xorg.freedesktop.org/releases/individual/app/ xbiff-(.*)\.tar\.gz diff --git a/debian/watch.xcalc b/debian/watch.xcalc deleted file mode 100644 index c201a3c..0000000 --- a/debian/watch.xcalc +++ /dev/null @@ -1,2 +0,0 @@ -version=3 -http://xorg.freedesktop.org/releases/individual/app/ xcalc-(.*)\.tar\.gz diff --git a/debian/watch.xclipboard b/debian/watch.xclipboard deleted file mode 100644 index 8e2a393..0000000 --- a/debian/watch.xclipboard +++ /dev/null @@ -1,2 +0,0 @@ -version=3 -http://xorg.freedesktop.org/releases/individual/app/ xclipboard-(.*)\.tar\.gz diff --git a/debian/watch.xclock b/debian/watch.xclock deleted file mode 100644 index 19c04c6..0000000 --- a/debian/watch.xclock +++ /dev/null @@ -1,2 +0,0 @@ -version=3 -http://xorg.freedesktop.org/releases/individual/app/ xclock-(.*)\.tar\.gz diff --git a/debian/watch.xconsole b/debian/watch.xconsole deleted file mode 100644 index 5f3dec2..0000000 --- a/debian/watch.xconsole +++ /dev/null @@ -1,2 +0,0 @@ -version=3 -http://xorg.freedesktop.org/releases/individual/app/ xconsole-(.*)\.tar\.gz diff --git a/debian/watch.xcursorgen b/debian/watch.xcursorgen deleted file mode 100644 index e0924df..0000000 --- a/debian/watch.xcursorgen +++ /dev/null @@ -1,2 +0,0 @@ -version=3 -http://xorg.freedesktop.org/releases/individual/app/ xcursorgen-(.*)\.tar\.gz diff --git a/debian/watch.xditview b/debian/watch.xditview deleted file mode 100644 index d8a1548..0000000 --- a/debian/watch.xditview +++ /dev/null @@ -1,2 +0,0 @@ -version=3 -http://xorg.freedesktop.org/releases/individual/app/ xditview-(.*)\.tar\.gz diff --git a/debian/watch.xedit b/debian/watch.xedit deleted file mode 100644 index 2586adc..0000000 --- a/debian/watch.xedit +++ /dev/null @@ -1,2 +0,0 @@ -version=3 -http://xorg.freedesktop.org/releases/individual/app/ xedit-(.*)\.tar\.gz diff --git a/debian/watch.xeyes b/debian/watch.xeyes deleted file mode 100644 index dbf235d..0000000 --- a/debian/watch.xeyes +++ /dev/null @@ -1,2 +0,0 @@ -version=3 -http://xorg.freedesktop.org/releases/individual/app/ xeyes-(.*)\.tar\.gz diff --git a/debian/watch.xgc b/debian/watch.xgc deleted file mode 100644 index 3df6bc8..0000000 --- a/debian/watch.xgc +++ /dev/null @@ -1,2 +0,0 @@ -version=3 -http://xorg.freedesktop.org/releases/individual/app/ xgc-(.*)\.tar\.gz diff --git a/debian/watch.xload b/debian/watch.xload deleted file mode 100644 index d87337e..0000000 --- a/debian/watch.xload +++ /dev/null @@ -1,2 +0,0 @@ -version=3 -http://xorg.freedesktop.org/releases/individual/app/ xload-(.*)\.tar\.gz diff --git a/debian/watch.xlogo b/debian/watch.xlogo deleted file mode 100644 index cb50a3e..0000000 --- a/debian/watch.xlogo +++ /dev/null @@ -1,2 +0,0 @@ -version=3 -http://xorg.freedesktop.org/releases/individual/app/ xlogo-(.*)\.tar\.gz diff --git a/debian/watch.xmag b/debian/watch.xmag deleted file mode 100644 index faa17c7..0000000 --- a/debian/watch.xmag +++ /dev/null @@ -1,2 +0,0 @@ -version=3 -http://xorg.freedesktop.org/releases/individual/app/ xmag-(.*)\.tar\.gz diff --git a/debian/watch.xman b/debian/watch.xman deleted file mode 100644 index 228becb..0000000 --- a/debian/watch.xman +++ /dev/null @@ -1,2 +0,0 @@ -version=3 -http://xorg.freedesktop.org/releases/individual/app/ xman-(.*)\.tar\.gz diff --git a/debian/watch.xmore b/debian/watch.xmore deleted file mode 100644 index b445dae..0000000 --- a/debian/watch.xmore +++ /dev/null @@ -1,2 +0,0 @@ -version=3 -http://xorg.freedesktop.org/releases/individual/app/ xmore-(.*)\.tar\.gz diff --git a/debian/watch.xwd b/debian/watch.xwd deleted file mode 100644 index 5221a50..0000000 --- a/debian/watch.xwd +++ /dev/null @@ -1,2 +0,0 @@ -version=3 -http://xorg.freedesktop.org/releases/individual/app/ xwd-(.*)\.tar\.gz diff --git a/debian/watch.xwud b/debian/watch.xwud deleted file mode 100644 index fe8ee18..0000000 --- a/debian/watch.xwud +++ /dev/null @@ -1,2 +0,0 @@ -version=3 -http://xorg.freedesktop.org/releases/individual/app/ xwud-(.*)\.tar\.gz diff --git a/debian/x11-apps.install b/debian/x11-apps.install deleted file mode 100644 index faa5799..0000000 --- a/debian/x11-apps.install +++ /dev/null @@ -1,3 +0,0 @@ -usr/bin/* -usr/include/X11/bitmaps/* -etc/X11/app-defaults/* diff --git a/debian/x11-apps.menu b/debian/x11-apps.menu deleted file mode 100644 index c19eac5..0000000 --- a/debian/x11-apps.menu +++ /dev/null @@ -1,97 +0,0 @@ -?package(x11-apps):\ - needs="x11"\ - section="Games/Toys"\ - hints="Clocks"\ - longtitle="Oclock: analog clock for X"\ - title="Oclock"\ - command="oclock" -?package(x11-apps):\ - needs="x11"\ - section="Applications/Network/Communication"\ - hints="Mail"\ - longtitle="Xbiff: mailbox flag for X"\ - title="Xbiff"\ - command="xbiff" -?package(x11-apps):\ - needs="x11"\ - section="Applications/Science/Mathematics"\ - hints="Calculators"\ - longtitle="Xcalc: scientific calculator for X"\ - title="Xcalc"\ - command="xcalc" -?package(x11-apps):\ - needs="x11"\ - section="Applications/System/Administration"\ - longtitle="Xclipboard: clipboard for text cut and paste operations in X"\ - title="Xclipboard"\ - command="xclipboard" -?package(x11-apps):\ - needs="x11"\ - section="Games/Toys"\ - hints="Clocks"\ - longtitle="Xclock (analog): analog clock for X"\ - title="Xclock (analog)"\ - command="xclock -analog" -?package(x11-apps):\ - needs="x11"\ - section="Games/Toys"\ - hints="Clocks"\ - longtitle="Xclock (digital): digital clock for X"\ - title="Xclock (digital)"\ - command="xclock -digital -update 1" -?package(x11-apps):\ - needs="x11"\ - section="Applications/System/Monitoring"\ - longtitle="Xconsole: monitor system console messages with X"\ - title="Xconsole"\ - command="xconsole -file /dev/xconsole" -?package(x11-apps):\ - needs="x11"\ - section="Applications/Viewers"\ - hints="Troff"\ - longtitle="Xditview: a ditroff file viewer for X"\ - title="Xditview"\ - command="xditview" -?package(x11-apps):\ - needs="x11"\ - section="Applications/Editors"\ - longtitle="Xedit: a simple text editor for X"\ - title="Xedit"\ - command="xedit" -?package(x11-apps):\ - needs="x11"\ - section="Games/Toys"\ - longtitle="Xeyes: demo in which a pair of eyes follow the mouse pointer in X"\ - title="Xeyes"\ - command="xeyes" -?package(x11-apps):\ - needs="x11"\ - section="Applications/System/Monitoring"\ - longtitle="Xload: system load average display for X"\ - title="Xload"\ - command="xload" -?package(x11-apps):\ - needs="x11"\ - section="Games/Toys"\ - longtitle="Xlogo: demo which displays the X logo"\ - title="Xlogo"\ - command="xlogo" -?package(x11-apps):\ - needs="x11"\ - section="Applications/Accessibility"\ - longtitle="Xmag: magnify parts of the X screen"\ - title="Xmag"\ - command="xmag" -?package(x11-apps):\ - needs="x11"\ - section="Help"\ - longtitle="Xman: manual page browser for X"\ - title="Xman"\ - command="xman" -?package(x11-apps):\ - needs="x11"\ - section="Applications/Graphics"\ - hints="Screenshot"\ - longtitle="X Window Snapshot: take snapshot of any X window (xwd|xwud)"\ - title="X Window Snapshot"\ - command="xwd | xwud" diff --git a/debian/xsfbs/repack.sh b/debian/xsfbs/repack.sh deleted file mode 100755 index 5935cc9..0000000 --- a/debian/xsfbs/repack.sh +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/sh - -set -e - -if ! [ -d debian/prune ]; then - exit 0 -fi - -if [ "x$1" != x--upstream-version ]; then - exit 1 -fi - -version="$2" -filename="$3" - -if [ -z "$version" ] || ! [ -f "$filename" ]; then - exit 1 -fi - -dir="$(pwd)" -tempdir="$(mktemp -d)" - -cd "$tempdir" -tar xf "$dir/$filename" -cat "$dir"/debian/prune/* | while read file; do rm -f */$file; done - -tar czf "$dir/$filename" * -cd "$dir" -rm -rf "$tempdir" -echo "Done pruning upstream tarball" - -exit 0 diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk deleted file mode 100755 index f0f8953..0000000 --- a/debian/xsfbs/xsfbs.mk +++ /dev/null @@ -1,293 +0,0 @@ -#!/usr/bin/make -f - -# Debian X Strike Force Build System (XSFBS): Make portion - -# Copyright 1996 Stephen Early -# Copyright 1997 Mark Eichin -# Copyright 1998-2005, 2007 Branden Robinson -# Copyright 2005 David Nusinow -# -# Licensed under the GNU General Public License, version 2. See the file -# /usr/share/common-licenses/GPL or . - -# Originally by Stephen Early -# Modified by Mark W. Eichin -# Modified by Adam Heath -# Modified by Branden Robinson -# Modified by Fabio Massimo Di Nitto -# Modified by David Nusinow -# Acknowledgements to Manoj Srivastava. - -# Pass $(DH_OPTIONS) into the environment for debhelper's benefit. -export DH_OPTIONS - -# force quilt to not use ~/.quiltrc and to use debian/patches -QUILT = QUILT_PATCHES=debian/patches quilt --quiltrc /dev/null - -# Set up parameters for the upstream build environment. - -# Determine (source) package name from Debian changelog. -SOURCE_NAME:=$(shell dpkg-parsechangelog -ldebian/changelog \ - | grep '^Source:' | awk '{print $$2}') - -# Determine package version from Debian changelog. -SOURCE_VERSION:=$(shell dpkg-parsechangelog -ldebian/changelog \ - | grep '^Version:' | awk '{print $$2}') - -# Determine upstream version number. -UPSTREAM_VERSION:=$(shell echo $(SOURCE_VERSION) | sed 's/-.*//') - -# Determine the source version without the epoch for make-orig-tar-gz -NO_EPOCH_VER:=$(shell echo $(UPSTREAM_VERSION) | sed 's/^.://') - -# Figure out who's building this package. -BUILDER:=$(shell echo $${DEBEMAIL:-$${EMAIL:-$$(echo $$LOGNAME@$$(cat /etc/mailname 2>/dev/null))}}) - -# Find out if this is an official build; an official build has nothing but -# digits, dots, and/or the codename of a release in the Debian part of the -# version number. Anything else indicates an unofficial build. -OFFICIAL_BUILD:=$(shell VERSION=$(SOURCE_VERSION); if ! expr "$$(echo $${VERSION\#\#*-} | sed 's/\(woody\|sarge\|etch\|lenny\)//g')" : ".*[^0-9.].*" >/dev/null 2>&1; then echo yes; fi) - -# Set up parameters for the Debian build environment. - -# Determine our architecture. -BUILD_ARCH:=$(shell dpkg-architecture -qDEB_BUILD_ARCH) -# Work around some old-time dpkg braindamage. -BUILD_ARCH:=$(subst i486,i386,$(BUILD_ARCH)) -# The DEB_HOST_ARCH variable may be set per the Debian cross-compilation policy. -ifdef DEB_HOST_ARCH - ARCH:=$(DEB_HOST_ARCH) -else - # dpkg-cross sets the ARCH environment variable; if set, use it. - ifdef ARCH - ARCH:=$(ARCH) - else - ARCH:=$(BUILD_ARCH) - endif -endif - -# $(STAMP_DIR) houses stamp files for complex targets. -STAMP_DIR:=stampdir - -# $(DEBTREEDIR) is where all install rules are told (via $(DESTDIR)) to place -# their files. -DEBTREEDIR:=$(CURDIR)/debian/tmp - -# All "important" targets have four lines: -# 1) A target name that is invoked by a package-building tool or the user. -# This consists of a dependency on a "$(STAMP_DIR)/"-prefixed counterpart. -# 2) A line delcaring 1) as a phony target (".PHONY:"). -# 3) A "$(STAMP_DIR)/"-prefixed target which does the actual work, and may -# depend on other targets. -# 4) A line declaring 3) as a member of the $(stampdir_targets) variable; the -# "$(STAMP_DIR)/" prefix is omitted. -# -# This indirection is needed so that the "stamp" files that signify when a rule -# is done can be located in a separate "stampdir". Recall that make has no way -# to know when a goal has been met for a phony target (like "build" or -# "install"). -# -# At the end of each "$(STAMP_DIR)/" target, be sure to run the command ">$@" -# so that the target will not be run again. Removing the file will make Make -# run the target over. - -# All phony targets should be declared as dependencies of .PHONY, even if they -# do not have "($STAMP_DIR)/"-prefixed counterparts. - -# Define a harmless default rule to keep things from going nuts by accident. -.PHONY: default -default: - -# Set up the $(STAMP_DIR) directory. -.PHONY: stampdir -stampdir_targets+=stampdir -stampdir: $(STAMP_DIR)/stampdir -$(STAMP_DIR)/stampdir: - mkdir $(STAMP_DIR) - >$@ - -# Set up the package build directory as quilt expects to find it. -.PHONY: prepare -stampdir_targets+=prepare -prepare: $(STAMP_DIR)/prepare -$(STAMP_DIR)/prepare: $(STAMP_DIR)/log $(STAMP_DIR)/genscripts - >$@ - -.PHONY: log -stampdir_targets+=log -log: $(STAMP_DIR)/log -$(STAMP_DIR)/log: $(STAMP_DIR)/stampdir - mkdir -p $(STAMP_DIR)/log - -# Apply all patches to the upstream source. -.PHONY: patch -stampdir_targets+=patch -patch: $(STAMP_DIR)/patch -$(STAMP_DIR)/patch: $(STAMP_DIR)/prepare - if ! [ `which quilt` ]; then \ - echo "Couldn't find quilt. Please install it or add it to the build-depends for this package."; \ - exit 1; \ - fi; \ - if $(QUILT) next >/dev/null 2>&1; then \ - echo -n "Applying patches..."; \ - if $(QUILT) push -a -v >$(STAMP_DIR)/log/patch 2>&1; then \ - cat $(STAMP_DIR)/log/patch; \ - echo "successful."; \ - else \ - cat $(STAMP_DIR)/log/patch; \ - echo "failed! (check $(STAMP_DIR)/log/patch for details)"; \ - exit 1; \ - fi; \ - else \ - echo "No patches to apply"; \ - fi; \ - >$@ - -# Revert all patches to the upstream source. -.PHONY: unpatch -unpatch: $(STAMP_DIR)/log - rm -f $(STAMP_DIR)/patch - @echo -n "Unapplying patches..."; \ - if $(QUILT) applied >/dev/null 2>/dev/null; then \ - if $(QUILT) pop -a -v >$(STAMP_DIR)/log/unpatch 2>&1; then \ - cat $(STAMP_DIR)/log/unpatch; \ - echo "successful."; \ - else \ - cat $(STAMP_DIR)/log/unpatch; \ - echo "failed! (check $(STAMP_DIR)/log/unpatch for details)"; \ - exit 1; \ - fi; \ - else \ - echo "nothing to do."; \ - fi - -# Clean the generated maintainer scripts. -.PHONY: cleanscripts -cleanscripts: - rm -f $(STAMP_DIR)/genscripts - rm -f debian/*.config \ - debian/*.postinst \ - debian/*.postrm \ - debian/*.preinst \ - debian/*.prerm - -# Clean the package build tree. -.PHONY: xsfclean -xsfclean: cleanscripts unpatch - dh_testdir - rm -rf .pc - rm -rf $(STAMP_DIR) $(SOURCE_DIR) - rm -rf imports - dh_clean debian/shlibs.local \ - debian/po/pothead - -# Generate the debconf templates POT file header. -debian/po/pothead: debian/po/pothead.in - sed -e 's/SOURCE_VERSION/$(SOURCE_VERSION)/' \ - -e 's/DATE/$(shell date "+%F %X%z"/)' <$< >$@ - -# Update POT and PO files. -.PHONY: updatepo -updatepo: debian/po/pothead - debian/scripts/debconf-updatepo --pot-header=pothead --verbose - -# Remove files from the upstream source tree that we don't need, or which have -# licensing problems. It must be run before creating the .orig.tar.gz. -# -# Note: This rule is for Debian package maintainers' convenience, and is not -# needed for conventional build scenarios. -.PHONY: prune-upstream-tree -prune-upstream-tree: - # Ensure we're in the correct directory. - dh_testdir - grep -rvh '^#' debian/prune/ | xargs --no-run-if-empty rm -rf - -# Verify that there are no offsets or fuzz in the patches we apply. -# -# Note: This rule is for Debian package maintainers' convenience, and is not -# needed for conventional build scenarios. -.PHONY: patch-audit -patch-audit: prepare unpatch - @echo -n "Auditing patches..."; \ - >$(STAMP_DIR)/log/patch; \ - FUZZY=; \ - while [ -n "$$($(QUILT) next)" ]; do \ - RESULT=$$($(QUILT) push -v | tee -a $(STAMP_DIR)/log/patch | grep ^Hunk | sed 's/^Hunk.*\(succeeded\|FAILED\).*/\1/');\ - case "$$RESULT" in \ - succeeded) \ - echo "fuzzy patch: $$($(QUILT) top)" \ - | tee -a $(STAMP_DIR)/log/$$($(QUILT) top); \ - FUZZY=yes; \ - ;; \ - FAILED) \ - echo "broken patch: $$($(QUILT) next)" \ - | tee -a $(STAMP_DIR)/log/$$($(QUILT) next); \ - exit 1; \ - ;; \ - esac; \ - done; \ - if [ -n "$$FUZZY" ]; then \ - echo "there were fuzzy patches; please fix."; \ - exit 1; \ - else \ - echo "done."; \ - fi - -# Generate the maintainer scripts. -.PHONY: genscripts -stampdir_targets+=genscripts -genscripts: $(STAMP_DIR)/genscripts -$(STAMP_DIR)/genscripts: $(STAMP_DIR)/stampdir - for FILE in debian/*.config.in \ - debian/*.postinst.in \ - debian/*.postrm.in \ - debian/*.preinst.in \ - debian/*.prerm.in; do \ - if [ -e "$$FILE" ]; then \ - MAINTSCRIPT=$$(echo $$FILE | sed 's/.in$$//'); \ - sed -n '1,/^#INCLUDE_SHELL_LIB#$$/p' <$$FILE \ - | sed -e '/^#INCLUDE_SHELL_LIB#$$/d' >$$MAINTSCRIPT.tmp; \ - cat debian/xsfbs/xsfbs.sh >>$$MAINTSCRIPT.tmp; \ - sed -n '/^#INCLUDE_SHELL_LIB#$$/,$$p' <$$FILE \ - | sed -e '/^#INCLUDE_SHELL_LIB#$$/d' >>$$MAINTSCRIPT.tmp; \ - sed -e 's/@SOURCE_VERSION@/$(SOURCE_VERSION)/' \ - -e 's/@OFFICIAL_BUILD@/$(OFFICIAL_BUILD)/' \ - -e 's/@DEFAULT_DCRESOLUTIONS@/$(DEFAULT_DCRESOLUTIONS)/' \ - <$$MAINTSCRIPT.tmp >$$MAINTSCRIPT; \ - rm $$MAINTSCRIPT.tmp; \ - fi; \ - done - # Validate syntax of generated shell scripts. - #sh debian/scripts/validate-posix-sh debian/*.config \ - # debian/*.postinst \ - # debian/*.postrm \ - # debian/*.preinst \ - # debian/*.prerm - >$@ - -# Generate the shlibs.local file. -debian/shlibs.local: - cat debian/*.shlibs >$@ - -SERVERMINVERS = $(shell cat /usr/share/xserver-xorg/serverminver 2>/dev/null) -VIDEOABI = $(shell cat /usr/share/xserver-xorg/videoabiver 2>/dev/null) -INPUTABI = $(shell cat /usr/share/xserver-xorg/inputabiver 2>/dev/null) -SERVER_DEPENDS = xserver-xorg-core (>= $(SERVERMINVERS)) -VIDDRIVER_PROVIDES = xserver-xorg-video-$(VIDEOABI) -INPDRIVER_PROVIDES = xserver-xorg-input-$(INPUTABI) -ifeq ($(PACKAGE),) -PACKAGE=$(shell awk '/^Package:/ { print $$2; exit }' < debian/control) -endif - -.PHONY: serverabi -serverabi: install -ifeq ($(SERVERMINVERS),) - @echo error: xserver-xorg-dev needs to be installed - @exit 1 -else - echo "xserver:Depends=$(SERVER_DEPENDS)" >> debian/$(PACKAGE).substvars - echo "xviddriver:Provides=$(VIDDRIVER_PROVIDES)" >> debian/$(PACKAGE).substvars - echo "xinpdriver:Provides=$(INPDRIVER_PROVIDES)" >> debian/$(PACKAGE).substvars -endif - -# vim:set noet ai sts=8 sw=8 tw=0: diff --git a/debian/xsfbs/xsfbs.sh b/debian/xsfbs/xsfbs.sh deleted file mode 100644 index 781826f..0000000 --- a/debian/xsfbs/xsfbs.sh +++ /dev/null @@ -1,853 +0,0 @@ -# $Id$ - -# This is the X Strike Force shell library for X Window System package -# maintainer scripts. It serves to define shell functions commonly used by -# such packages, and performs some error checking necessary for proper operation -# of those functions. By itself, it does not "do" much; the maintainer scripts -# invoke the functions defined here to accomplish package installation and -# removal tasks. - -# If you are reading this within a Debian package maintainer script (e.g., -# /var/lib/dpkg)info/PACKAGE.{config,preinst,postinst,prerm,postrm}), you can -# skip past this library by scanning forward in this file to the string -# "GOBSTOPPER". - -SOURCE_VERSION=@SOURCE_VERSION@ -OFFICIAL_BUILD=@OFFICIAL_BUILD@ - -# Use special abnormal exit codes so that problems with this library are more -# easily tracked down. -SHELL_LIB_INTERNAL_ERROR=86 -SHELL_LIB_THROWN_ERROR=74 -SHELL_LIB_USAGE_ERROR=99 - -# old -> new variable names -if [ -z "$DEBUG_XORG_PACKAGE" ] && [ -n "$DEBUG_XFREE86_PACKAGE" ]; then - DEBUG_XORG_PACKAGE="$DEBUG_XFREE86_PACKAGE" -fi -if [ -z "$DEBUG_XORG_DEBCONF" ] && [ -n "$DEBUG_XFREE86_DEBCONF" ]; then - DEBUG_XORG_DEBCONF="$DEBUG_XFREE86_DEBCONF" -fi - -# initial sanity checks -if [ -z "$THIS_PACKAGE" ]; then - cat >&2 < on the World Wide Web for -instructions, read the file /usr/share/doc/debian/bug-reporting.txt from the -"doc-debian" package, or install the "reportbug" package and use the command of -the same name to file a report against version $SOURCE_VERSION of this package. -EOF - exit $SHELL_LIB_USAGE_ERROR -fi - -if [ -z "$THIS_SCRIPT" ]; then - cat >&2 < on the World Wide Web for -instructions, read the file /usr/share/doc/debian/bug-reporting.txt from the -"doc-debian" package, or install the "reportbug" package and use the command of -the same name to file a report against version $SOURCE_VERSION of the -"$THIS_PACKAGE" package. -EOF - exit $SHELL_LIB_USAGE_ERROR -fi - -if [ "$1" = "reconfigure" ] || [ -n "$DEBCONF_RECONFIGURE" ]; then - RECONFIGURE="true" -else - RECONFIGURE= -fi - -if ([ "$1" = "install" ] || [ "$1" = "configure" ]) && [ -z "$2" ]; then - FIRSTINST="yes" -fi - -if [ -z "$RECONFIGURE" ] && [ -z "$FIRSTINST" ]; then - UPGRADE="yes" -fi - -trap "message;\ - message \"Received signal. Aborting $THIS_PACKAGE package $THIS_SCRIPT script.\";\ - message;\ - exit 1" HUP INT QUIT TERM - -reject_nondigits () { - # syntax: reject_nondigits [ operand ... ] - # - # scan operands (typically shell variables whose values cannot be trusted) for - # characters other than decimal digits and barf if any are found - while [ -n "$1" ]; do - # does the operand contain anything but digits? - if ! expr "$1" : "[[:digit:]]\+$" > /dev/null 2>&1; then - # can't use die(), because it wraps message() which wraps this function - echo "$THIS_PACKAGE $THIS_SCRIPT error: reject_nondigits() encountered" \ - "possibly malicious garbage \"$1\"" >&2 - exit $SHELL_LIB_THROWN_ERROR - fi - shift - done -} - -reject_whitespace () { - # syntax: reject_whitespace [ operand ] - # - # scan operand (typically a shell variable whose value cannot be trusted) for - # whitespace characters and barf if any are found - if [ -n "$1" ]; then - # does the operand contain any whitespace? - if expr "$1" : "[[:space:]]" > /dev/null 2>&1; then - # can't use die(), because I want to avoid forward references - echo "$THIS_PACKAGE $THIS_SCRIPT error: reject_whitespace() encountered" \ - "possibly malicious garbage \"$1\"" >&2 - exit $SHELL_LIB_THROWN_ERROR - fi - fi -} - -reject_unlikely_path_chars () { - # syntax: reject_unlikely_path_chars [ operand ... ] - # - # scan operands (typically shell variables whose values cannot be trusted) for - # characters unlikely to be seen in a path and which the shell might - # interpret and barf if any are found - while [ -n "$1" ]; do - # does the operand contain any funny characters? - if expr "$1" : '.*[!$&()*;<>?|].*' > /dev/null 2>&1; then - # can't use die(), because I want to avoid forward references - echo "$THIS_PACKAGE $THIS_SCRIPT error: reject_unlikely_path_chars()" \ - "encountered possibly malicious garbage \"$1\"" >&2 - exit $SHELL_LIB_THROWN_ERROR - fi - shift - done -} - -# 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 - -message () { - # pretty-print messages of arbitrary length - reject_nondigits "$COLUMNS" - echo "$*" | fmt -t -w ${COLUMNS:-$DEFCOLUMNS} >&2 -} - -observe () { - # syntax: observe message ... - # - # issue observational message suitable for logging someday when support for - # it exists in dpkg - if [ -n "$DEBUG_XORG_PACKAGE" ]; then - message "$THIS_PACKAGE $THIS_SCRIPT note: $*" - fi -} - -warn () { - # syntax: warn message ... - # - # issue warning message suitable for logging someday when support for - # it exists in dpkg; also send to standard error - message "$THIS_PACKAGE $THIS_SCRIPT warning: $*" -} - -die () { - # syntax: die message ... - # - # exit script with error message - message "$THIS_PACKAGE $THIS_SCRIPT error: $*" - exit $SHELL_LIB_THROWN_ERROR -} - -internal_error () { - # exit script with error; essentially a "THIS SHOULD NEVER HAPPEN" message - message "internal error: $*" - if [ -n "$OFFICIAL_BUILD" ]; then - message "Please report a bug in the $THIS_SCRIPT script of the" \ - "$THIS_PACKAGE package, version $SOURCE_VERSION to the Debian Bug" \ - "Tracking System. Include all messages above that mention the" \ - "$THIS_PACKAGE package. Visit " \ - " on the World Wide Web for" \ - "instructions, read the file" \ - "/usr/share/doc/debian/bug-reporting.txt from the doc-debian" \ - "package, or install the reportbug package and use the command of" \ - "the same name to file a report." - fi - exit $SHELL_LIB_INTERNAL_ERROR -} - -usage_error () { - message "usage error: $*" - message "Please report a bug in the $THIS_SCRIPT script of the" \ - "$THIS_PACKAGE package, version $SOURCE_VERSION to the Debian Bug" \ - "Tracking System. Include all messages above that mention the" \ - "$THIS_PACKAGE package. Visit " \ - " on the World Wide Web for" \ - "instructions, read the file" \ - "/usr/share/doc/debian/bug-reporting.txt from the doc-debian" \ - "package, or install the reportbug package and use the command of" \ - "the same name to file a report." - exit $SHELL_LIB_USAGE_ERROR -} - - -maplink () { - # returns what symlink should point to; i.e., what the "sane" answer is - # Keep this in sync with the debian/*.links files. - # This is only needed for symlinks to directories. - # - # XXX: Most of these look wrong in the X11R7 world and need to be fixed. - # If we've stopped using this function, fixing it might enable us to re-enable - # it again and catch more errors. - case "$1" in - /etc/X11/xkb/compiled) echo /var/lib/xkb ;; - /etc/X11/xkb/xkbcomp) echo /usr/X11R6/bin/xkbcomp ;; - /usr/X11R6/lib/X11/app-defaults) echo /etc/X11/app-defaults ;; - /usr/X11R6/lib/X11/fs) echo /etc/X11/fs ;; - /usr/X11R6/lib/X11/lbxproxy) echo /etc/X11/lbxproxy ;; - /usr/X11R6/lib/X11/proxymngr) echo /etc/X11/proxymngr ;; - /usr/X11R6/lib/X11/rstart) echo /etc/X11/rstart ;; - /usr/X11R6/lib/X11/twm) echo /etc/X11/twm ;; - /usr/X11R6/lib/X11/xdm) echo /etc/X11/xdm ;; - /usr/X11R6/lib/X11/xinit) echo /etc/X11/xinit ;; - /usr/X11R6/lib/X11/xkb) echo /etc/X11/xkb ;; - /usr/X11R6/lib/X11/xserver) echo /etc/X11/xserver ;; - /usr/X11R6/lib/X11/xsm) echo /etc/X11/xsm ;; - /usr/bin/X11) echo ../X11R6/bin ;; - /usr/bin/rstartd) echo ../X11R6/bin/rstartd ;; - /usr/include/X11) echo ../X11R6/include/X11 ;; - /usr/lib/X11) echo ../X11R6/lib/X11 ;; - *) internal_error "maplink() called with unknown path \"$1\"" ;; - esac -} - -analyze_path () { - # given a supplied set of pathnames, break each one up by directory and do an - # ls -dl on each component, cumulatively; i.e. - # analyze_path /usr/X11R6/bin -> ls -dl /usr /usr/X11R6 /usr/X11R6/bin - # Thanks to Randolph Chung for this clever hack. - - local f g - - while [ -n "$1" ]; do - reject_whitespace "$1" - g= - message "Analyzing $1:" - for f in $(echo "$1" | tr / \ ); do - if [ -e /$g$f ]; then - ls -dl /$g$f /$g$f.dpkg-* 2> /dev/null || true - g=$g$f/ - else - message "/$g$f: nonexistent; directory contents of /$g:" - ls -l /$g - break - fi - done - shift - done -} - -find_culprits () { - local f p dpkg_info_dir possible_culprits smoking_guns bad_packages package \ - msg - - reject_whitespace "$1" - message "Searching for overlapping packages..." - dpkg_info_dir=/var/lib/dpkg/info - if [ -d $dpkg_info_dir ]; then - if [ "$(echo $dpkg_info_dir/*.list)" != "$dpkg_info_dir/*.list" ]; then - possible_culprits=$(ls -1 $dpkg_info_dir/*.list | egrep -v \ - "(xbase-clients|x11-common|xfs|xlibs)") - if [ -n "$possible_culprits" ]; then - smoking_guns=$(grep -l "$1" $possible_culprits || true) - if [ -n "$smoking_guns" ]; then - bad_packages=$(printf "\\n") - for f in $smoking_guns; do - # too bad you can't nest parameter expansion voodoo - p=${f%*.list} # strip off the trailing ".list" - package=${p##*/} # strip off the directories - bad_packages=$(printf "%s\n%s" "$bad_packages" "$package") - done - msg=$(cat < /dev/null 2>&1; then - shortcmd=${cmd##*/} - observe "running $shortcmd in $dir font directory" - cmd_opts= - if [ "$shortcmd" = "update-fonts-alias" ]; then - cmd_opts=--x11r7-layout - fi - if [ "$shortcmd" = "update-fonts-dir" ]; then - cmd_opts=--x11r7-layout - fi - if [ "$shortcmd" = "update-fonts-scale" ]; then - cmd_opts=--x11r7-layout - fi - $cmd $cmd_opts $dir || warn "$cmd $cmd_opts $dir" \ - "failed; font directory data may not" \ - "be up to date" - else - warn "$cmd not found; not updating corresponding $dir font" \ - "directory data" - fi - done - else - warn "$dir is not a directory; not updating font directory data" - fi - done -} - -remove_conffile_prepare () { - # syntax: remove_conffile_prepare filename official_md5sum ... - # - # Check a conffile "filename" against a list of canonical MD5 checksums. - # If the file's current MD5 checksum matches one of the "official_md5sum" - # operands provided, then prepare the conffile for removal from the system. - # We defer actual deletion until the package is configured so that we can - # roll this operation back if package installation fails. - # - # Call this function from a preinst script in the event $1 is "upgrade" or - # "install" and verify $2 to ensure the package is being upgraded from a - # version (or installed over a version removed-but-not-purged) prior to the - # one in which the conffile was obsoleted. - - local conffile current_checksum - - # validate arguments - if [ $# -lt 2 ]; then - usage_error "remove_conffile_prepare() called with wrong number of" \ - "arguments; expected at least 2, got $#" - exit $SHELL_LIB_USAGE_ERROR - fi - - conffile="$1" - shift - - # does the conffile even exist? - if [ -e "$conffile" ]; then - # calculate its checksum - current_checksum=$(md5sum < "$conffile" | sed 's/[[:space:]].*//') - # compare it to each supplied checksum - while [ -n "$1" ]; do - if [ "$current_checksum" = "$1" ]; then - # we found a match; move the confffile and stop looking - observe "preparing obsolete conffile $conffile for removal" - mv "$conffile" "$conffile.$THIS_PACKAGE-tmp" - break - fi - shift - done - fi -} - -remove_conffile_lookup () { - # syntax: remove_conffile_lookup package filename - # - # Lookup the md5sum of a conffile in dpkg's database, and prepare for removal - # if it matches the actual file's md5sum. - # - # Call this function when you would call remove_conffile_prepare but only - # want to check against dpkg's status database instead of known checksums. - - local package conffile old_md5sum - - # validate arguments - if [ $# -ne 2 ]; then - usage_error "remove_conffile_lookup() called with wrong number of" \ - "arguments; expected 1, got $#" - exit $SHELL_LIB_USAGE_ERROR - fi - - package="$1" - conffile="$2" - - if ! [ -e "$conffile" ]; then - return - fi - old_md5sum="$(dpkg-query -W -f='${Conffiles}' "$package" | \ - awk '{ if (match($0, "^ '"$conffile"' ")) print $2}')" - if [ -n "$old_md5sum" ]; then - remove_conffile_prepare "$conffile" "$old_md5sum" - fi -} - -remove_conffile_commit () { - # syntax: remove_conffile_commit filename - # - # Complete the removal of a conffile "filename" that has become obsolete. - # - # Call this function from a postinst script after having used - # remove_conffile_prepare() in the preinst. - - local conffile - - # validate arguments - if [ $# -ne 1 ]; then - usage_error "remove_conffile_commit() called with wrong number of" \ - "arguments; expected 1, got $#" - exit $SHELL_LIB_USAGE_ERROR - fi - - conffile="$1" - - # if the temporary file created by remove_conffile_prepare() exists, remove it - if [ -e "$conffile.$THIS_PACKAGE-tmp" ]; then - observe "committing removal of obsolete conffile $conffile" - rm "$conffile.$THIS_PACKAGE-tmp" - fi -} - -remove_conffile_rollback () { - # syntax: remove_conffile_rollback filename - # - # Roll back the removal of a conffile "filename". - # - # Call this function from a postrm script in the event $1 is "abort-upgrade" - # or "abort-install" is after having used remove_conffile_prepare() in the - # preinst. - - local conffile - - # validate arguments - if [ $# -ne 1 ]; then - usage_error "remove_conffile_rollback() called with wrong number of" \ - "arguments; expected 1, got $#" - exit $SHELL_LIB_USAGE_ERROR - fi - - conffile="$1" - - # if the temporary file created by remove_conffile_prepare() exists, move it - # back - if [ -e "$conffile.$THIS_PACKAGE-tmp" ]; then - observe "rolling back removal of obsolete conffile $conffile" - mv "$conffile.$THIS_PACKAGE-tmp" "$conffile" - fi -} - -replace_conffile_with_symlink_prepare () { - # syntax: replace_conffile_with_symlink_prepare oldfilename newfilename \ - # official_md5sum ... - # - # Check a conffile "oldfilename" against a list of canonical MD5 checksums. - # If the file's current MD5 checksum matches one of the "official_md5sum" - # operands provided, then prepare the conffile for removal from the system. - # We defer actual deletion until the package is configured so that we can - # roll this operation back if package installation fails. Otherwise copy it - # to newfilename and let dpkg handle it through conffiles mechanism. - # - # Call this function from a preinst script in the event $1 is "upgrade" or - # "install" and verify $2 to ensure the package is being upgraded from a - # version (or installed over a version removed-but-not-purged) prior to the - # one in which the conffile was obsoleted. - - local conffile current_checksum - - # validate arguments - if [ $# -lt 3 ]; then - usage_error "replace_conffile_with_symlink_prepare() called with wrong" \ - " number of arguments; expected at least 3, got $#" - exit $SHELL_LIB_USAGE_ERROR - fi - - oldconffile="$1" - shift - newconffile="$1" - shift - - remove_conffile_prepare "$_oldconffile" "$@" - # If $oldconffile still exists, then md5sums didn't match. - # Copy it to new one. - if [ -f "$oldconffile" ]; then - cp "$oldconffile" "$newconffile" - fi - -} - -replace_conffile_with_symlink_commit () { - # syntax: replace_conffile_with_symlink_commit oldfilename - # - # Complete the removal of a conffile "oldfilename" that has been - # replaced by a symlink. - # - # Call this function from a postinst script after having used - # replace_conffile_with_symlink_prepare() in the preinst. - - local conffile - - # validate arguments - if [ $# -ne 1 ]; then - usage_error "replace_conffile_with_symlink_commit() called with wrong" \ - "number of arguments; expected 1, got $#" - exit $SHELL_LIB_USAGE_ERROR - fi - - conffile="$1" - - remove_conffile_commit "$conffile" -} - -replace_conffile_with_symlink_rollback () { - # syntax: replace_conffile_with_symlink_rollback oldfilename newfilename - # - # Roll back the replacing of a conffile "oldfilename" with symlink to - # "newfilename". - # - # Call this function from a postrm script in the event $1 is "abort-upgrade" - # or "abort-install" and verify $2 to ensure the package failed to upgrade - # from a version (or install over a version removed-but-not-purged) prior - # to the one in which the conffile was obsoleted. - # You should have used replace_conffile_with_symlink_prepare() in the - # preinst. - - local conffile - - # validate arguments - if [ $# -ne 2 ]; then - usage_error "replace_conffile_with_symlink_rollback() called with wrong" \ - "number of arguments; expected 2, got $#" - exit $SHELL_LIB_USAGE_ERROR - fi - - oldconffile="$1" - newconffile="$2" - - remove_conffile_rollback "$_oldconffile" - if [ -f "$newconffile" ]; then - rm "$newconffile" - fi -} - -run () { - # syntax: run command [ argument ... ] - # - # Run specified command with optional arguments and report its exit status. - # Useful for commands whose exit status may be nonzero, but still acceptable, - # or commands whose failure is not fatal to us. - # - # NOTE: Do *not* use this function with db_get or db_metaget commands; in - # those cases the return value of the debconf command *must* be checked - # before the string returned by debconf is used for anything. - - local retval - - # validate arguments - if [ $# -lt 1 ]; then - usage_error "run() called with wrong number of arguments; expected at" \ - "least 1, got $#" - exit $SHELL_LIB_USAGE_ERROR - fi - - "$@" || retval=$? - - if [ ${retval:-0} -ne 0 ]; then - observe "command \"$*\" exited with status $retval" - fi -} - -make_symlink_sane () { - # syntax: make_symlink_sane symlink target - # - # Ensure that the symbolic link symlink exists, and points to target. - # - # If symlink does not exist, create it and point it at target. - # - # If symlink exists but is not a symbolic link, back it up. - # - # If symlink exists, is a symbolic link, but points to the wrong location, fix - # it. - # - # If symlink exists, is a symbolic link, and already points to target, do - # nothing. - # - # This function wouldn't be needed if ln had an -I, --idempotent option. - - # Validate arguments. - if [ $# -ne 2 ]; then - usage_error "make_symlink_sane() called with wrong number of arguments;" \ - "expected 2, got $#" - exit $SHELL_LIB_USAGE_ERROR - fi - - # We could just use the positional parameters as-is, but that makes things - # harder to follow. - local symlink target - - symlink="$1" - target="$2" - - if [ -L "$symlink" ] && [ "$(readlink "$symlink")" = "$target" ]; then - observe "link from $symlink to $target already exists" - else - observe "creating symbolic link from $symlink to $target" - mkdir -p "${target%/*}" "${symlink%/*}" - ln -s -b -S ".dpkg-old" "$target" "$symlink" - fi -} - -migrate_dir_to_symlink () { - # syntax: migrate_dir_to_symlink old_location new_location - # - # Per Debian Policy section 6.5.4, "A directory will never be replaced by a - # symbolic link to a directory or vice versa; instead, the existing state - # (symlink or not) will be left alone and dpkg will follow the symlink if - # there is one." - # - # We have to do it ourselves. - # - # This function moves the contents of old_location, a directory, into - # new_location, a directory, then makes old_location a symbolic link to - # new_location. - # - # old_location need not exist, but if it does, it must be a directory (or a - # symlink to a directory). If it is not, it is backed up. If new_location - # exists already and is not a directory, it is backed up. - # - # This function should be called from a package's preinst so that other - # packages unpacked after this one --- but before this package's postinst runs - # --- are unpacked into new_location even if their payloads contain - # old_location filespecs. - - # Validate arguments. - if [ $# -ne 2 ]; then - usage_error "migrate_dir_to_symlink() called with wrong number of" - "arguments; expected 2, got $#" - exit $SHELL_LIB_USAGE_ERROR - fi - - # We could just use the positional parameters as-is, but that makes things - # harder to follow. - local new old - - old="$1" - new="$2" - - # Is old location a symlink? - if [ -L "$old" ]; then - # Does it already point to new location? - if [ "$(readlink "$old")" = "$new" ]; then - # Nothing to do; migration has already been done. - observe "migration of $old to $new already done" - return 0 - else - # Back it up. - warn "backing up symbolic link $old as $old.dpkg-old" - mv -b "$old" "$old.dpkg-old" - fi - fi - - # Does old location exist, but is not a directory? - if [ -e "$old" ] && ! [ -d "$old" ]; then - # Back it up. - warn "backing up non-directory $old as $old.dpkg-old" - mv -b "$old" "$old.dpkg-old" - fi - - observe "migrating $old to $new" - - # Is new location a symlink? - if [ -L "$new" ]; then - # Does it point the wrong way, i.e., back to where we're migrating from? - if [ "$(readlink "$new")" = "$old" ]; then - # Get rid of it. - observe "removing symbolic link $new which points to $old" - rm "$new" - else - # Back it up. - warn "backing up symbolic link $new as $new.dpkg-old" - mv -b "$new" "$new.dpkg-old" - fi - fi - - # Does new location exist, but is not a directory? - if [ -e "$new" ] && ! [ -d "$new" ]; then - warn "backing up non-directory $new as $new.dpkg-old" - mv -b "$new" "$new.dpkg-old" - fi - - # Create new directory if it does not yet exist. - if ! [ -e "$new" ]; then - observe "creating $new" - mkdir -p "$new" - fi - - # Copy files in old location to new location. Back up any filenames that - # already exist in the new location with the extension ".dpkg-old". - observe "copying files from $old to $new" - if ! (cd "$old" && cp -a -b -S ".dpkg-old" . "$new"); then - die "error(s) encountered while copying files from $old to $new" - fi - - # Remove files at old location. - observe "removing $old" - rm -r "$old" - - # Create symlink from old location to new location. - make_symlink_sane "$old" "$new" -} - -# vim:set ai et sw=2 ts=2 tw=80: - -# GOBSTOPPER: The X Strike Force shell library ends here. diff --git a/luit/Makefile.am b/luit/Makefile.am old mode 100644 new mode 100755 index 8069670..c174bad --- a/luit/Makefile.am +++ b/luit/Makefile.am @@ -26,8 +26,11 @@ AM_CFLAGS = \ $(CWARNFLAGS) \ $(LUIT_CFLAGS) \ $(OS_CFLAGS) \ - -DLOCALE_ALIAS_FILE=\"$(LOCALEALIASFILE)\" - + -DLOCALE_ALIAS_FILE=\"$(LOCALEALIASFILE)\" \ + -fPIE +AM_LDFLAGS = \ + $(LUIT_LDFLAGS) \ + -pie luit_LDADD = $(LUIT_LIBS) luit_SOURCES = \ diff --git a/oclock/Makefile.am b/oclock/Makefile.am old mode 100644 new mode 100755 index f4eadc8..96702c3 --- a/oclock/Makefile.am +++ b/oclock/Makefile.am @@ -21,7 +21,8 @@ bin_PROGRAMS = oclock -AM_CFLAGS = $(OCLOCK_CFLAGS) $(CWARNFLAGS) +AM_CFLAGS = $(OCLOCK_CFLAGS) -fPIE +AM_LDFLAGS = $(OCLOCK_LDFLAGS) -pie oclock_LDADD = $(OCLOCK_LIBS) -lm oclock_SOURCES = \ diff --git a/packaging/xorg-x11-apps.spec b/packaging/xorg-x11-apps.spec index 90ee9b9..412a9e5 100644 --- a/packaging/xorg-x11-apps.spec +++ b/packaging/xorg-x11-apps.spec @@ -1,10 +1,10 @@ -%define _unpackaged_files_terminate_build 0 +%define _unpackaged_files_terminate_build 0 Summary: X.Org X11 applications Name: xorg-x11-apps # NOTE: The package version should be set to the X11 major release from which # the OS release is based upon. -Version: 7.6 +Version: 7.6.2 Release: 5 License: MIT Group: User Interface/X @@ -50,8 +50,6 @@ BuildRequires: libX11-devel BuildRequires: libXmu-devel BuildRequires: libXext-devel BuildRequires: libXt-devel -BuildRequires: libXaw-devel -BuildRequires: libXpm-devel BuildRequires: libXft-devel BuildRequires: libXrender-devel BuildRequires: libxkbfile-devel @@ -62,10 +60,11 @@ BuildRequires: libXi-devel >= 1.2 BuildRequires: libXxf86vm-devel BuildRequires: xorg-x11-xbitmaps -Provides: luit oclock x11perf xclipboard xclock xconsole xcursorgen -Provides: xeyes xload xlogo xmag xmessage xpr xwd xwud -Provides: xfd xfontsel xvidtune -#Provides: xbiff +#Provides: luit oclock x11perf xclipboard xclock xconsole xcursorgen +#Provides: xeyes xload xlogo xmag xmessage xpr xwd xwud +#Provides: xfd xfontsel xvidtune +#Provides: xbiff +Provides: xcursorgen xeyes xload xwd xwud # NOTE: xwd, xwud, luit used to be in these. #Obsoletes: XFree86, xorg-x11 @@ -78,7 +77,8 @@ Provides: xfd xfontsel xvidtune %description A collection of common X Window System applications. -%define apps luit oclock x11perf xclipboard xclock xconsole xcursorgen xeyes xload xlogo xmag xmessage xpr xwd xwud xfd xfontsel xvidtune +#%define apps luit oclock x11perf xclipboard xclock xconsole xcursorgen xeyes xload xlogo xmag xmessage xpr xwd xwud xfd xfontsel xvidtune +%define apps xeyes xwd xwud %prep %setup -q @@ -90,12 +90,12 @@ A collection of common X Window System applications. %build # Build all apps { -CFLAGS="${CFLAGS} -D_F_BLOCK_MULTI_VIS_" -for app in luit oclock x11perf xclipboard xclock xconsole xcursorgen xeyes xload xlogo xmag xmessage xpr xwd xwud xfd xfontsel xvidtune ; do +CFLAGS="${CFLAGS} -D_F_BLOCK_MULTI_VIS_" +for app in %{apps} ; do pushd $app sed -i '/XAW_/ s/)/, xaw7)/; /XAW_/ s/XAW_CHECK_XPRINT_SUPPORT/PKG_CHECK_MODULES/' configure.ac autoreconf -v --install - %configure --disable-xprint + %configure --disable-xprint make popd done @@ -103,9 +103,12 @@ done %install rm -rf $RPM_BUILD_ROOT +mkdir -p %{buildroot}/usr/share/license +cp -af COPYING %{buildroot}/usr/share/license/%{name} + # Install all apps { -for app in luit oclock x11perf xclipboard xclock xconsole xcursorgen xeyes xload xlogo xmag xmessage xpr xwd xwud xfd xfontsel xvidtune ; do +for app in %{apps} ; do pushd $app make install DESTDIR=$RPM_BUILD_ROOT popd @@ -118,46 +121,8 @@ done rm -rf $RPM_BUILD_ROOT %files +%manifest xorg-x11-apps.manifest %defattr(-,root,root,-) %{_bindir}/* -#%{_bindir}/luit -#%{_bindir}/oclock -#%{_bindir}/x11perf -#%{_bindir}/x11perfcomp -#%{_bindir}/xbiff -#%{_bindir}/xclipboard -#%{_bindir}/xclock -#%{_bindir}/xconsole -#%{_bindir}/xcursorgen -#%{_bindir}/xcutsel -#%{_bindir}/xdpr -#%{_bindir}/xeyes -#%{_bindir}/xfd -#%{_bindir}/xfontsel -#%{_bindir}/xload -#%{_bindir}/xlogo -#%{_bindir}/xmag -#%{_bindir}/xmessage -#%{_bindir}/xpr -#%{_bindir}/xvidtune -#%{_bindir}/xwd -#%{_bindir}/xwud -#%{_datadir}/X11/app-defaults/Clock-color -#%{_datadir}/X11/app-defaults/XClipboard -#%{_datadir}/X11/app-defaults/XClock -#%{_datadir}/X11/app-defaults/XClock-color -#%{_datadir}/X11/app-defaults/XConsole -#%{_datadir}/X11/app-defaults/XFontSel -#%{_datadir}/X11/app-defaults/Xfd -#%{_datadir}/X11/app-defaults/XLoad -#%{_datadir}/X11/app-defaults/XLogo -#%{_datadir}/X11/app-defaults/XLogo-color -#%{_datadir}/X11/app-defaults/Xmag -#%{_datadir}/X11/app-defaults/Xmessage -#%{_datadir}/X11/app-defaults/Xmessage-color -#%{_datadir}/X11/app-defaults/Xvidtune -#%dir %{_datadir}/X11/x11perfcomp -#%{_datadir}/X11/x11perfcomp/Xmark -#%{_datadir}/X11/x11perfcomp/fillblnk -#%{_datadir}/X11/x11perfcomp/perfboth -#%{_datadir}/X11/x11perfcomp/perfratio \ No newline at end of file +/usr/share/license/%{name} + diff --git a/x11perf/Makefile.am b/x11perf/Makefile.am old mode 100644 new mode 100755 index c14391c..d157af4 --- a/x11perf/Makefile.am +++ b/x11perf/Makefile.am @@ -28,7 +28,8 @@ LIBPATH = $(libdir)/X11/x11perfcomp x11perfcompdir = $(LIBPATH) dist_x11perfcomp_SCRIPTS = fillblnk perfboth perfratio Xmark -AM_CFLAGS = $(CWARNFLAGS) $(XEXT_CFLAGS) $(XFT_CFLAGS) $(XRENDER_CFLAGS) $(X11PERF_CFLAGS) +AM_CFLAGS = $(CWARNFLAGS) $(XEXT_CFLAGS) $(XFT_CFLAGS) $(XRENDER_CFLAGS) $(X11PERF_CFLAGS) -fPIE +AM_LDFLAGS = $(X11PERF_LDFLAGS) -pie x11perf_LDADD = $(XEXT_LIBS) $(XFT_LIBS) $(XRENDER_LIBS) $(X11PERF_LIBS) -lm x11perf_SOURCES = \ diff --git a/xbiff/Makefile.am b/xbiff/Makefile.am old mode 100644 new mode 100755 index b49c553..ebc29ee --- a/xbiff/Makefile.am +++ b/xbiff/Makefile.am @@ -21,7 +21,8 @@ bin_PROGRAMS = xbiff -AM_CFLAGS = $(CWARNFLAGS) $(XBIFF_CFLAGS) -D_BSD_SOURCE +AM_CFLAGS = $(CWARNFLAGS) $(XBIFF_CFLAGS) -D_BSD_SOURCE -fPIE +AM_LDFLAGS = $(XBIFF_LDFLAGS) -pie xbiff_LDADD = $(XBIFF_LIBS) xbiff_SOURCES = \ diff --git a/xclipboard/Makefile.am b/xclipboard/Makefile.am old mode 100644 new mode 100755 index c8a12ae..f58b713 --- a/xclipboard/Makefile.am +++ b/xclipboard/Makefile.am @@ -21,7 +21,8 @@ bin_PROGRAMS = xclipboard xcutsel -AM_CFLAGS = $(CWARNFLAGS) $(XCLIPBOARD_CFLAGS) +AM_CFLAGS = $(CWARNFLAGS) $(XCLIPBOARD_CFLAGS) -fPIE +AM_LDFLAGS = $(XCLIPBOARD_LDFLAGS) -pie # xclipboard diff --git a/xclock/Makefile.am b/xclock/Makefile.am old mode 100644 new mode 100755 index 0f43976..ff8df60 --- a/xclock/Makefile.am +++ b/xclock/Makefile.am @@ -21,7 +21,8 @@ bin_PROGRAMS = xclock -AM_CFLAGS = $(CWARNFLAGS) $(XCLOCK_CFLAGS) +AM_CFLAGS = $(CWARNFLAGS) $(XCLOCK_CFLAGS) -fPIE +AM_LDFLAGS = $(XCLOCK_LDFLAGS) -pie xclock_LDADD = $(XCLOCK_LIBS) xclock_SOURCES = \ diff --git a/xconsole/Makefile.am b/xconsole/Makefile.am old mode 100644 new mode 100755 index 5e9d16f..85fde44 --- a/xconsole/Makefile.am +++ b/xconsole/Makefile.am @@ -21,7 +21,8 @@ bin_PROGRAMS = xconsole -AM_CFLAGS = $(XCONSOLE_CFLAGS) $(CWARNFLAGS) +AM_CFLAGS = $(XCONSOLE_CFLAGS) $(CWARNFLAGS) -fPIE +AM_LDFLAGS = $(XCONSOLE_LDFLAGS) -pie xconsole_LDADD = $(XCONSOLE_LIBS) xconsole_SOURCES = \ diff --git a/xcursorgen/Makefile.am b/xcursorgen/Makefile.am old mode 100644 new mode 100755 index 75e7a33..72d4b10 --- a/xcursorgen/Makefile.am +++ b/xcursorgen/Makefile.am @@ -2,7 +2,8 @@ bin_PROGRAMS = xcursorgen xcursorgen_SOURCES = xcursorgen.c -AM_CFLAGS = $(CWARNFLAGS) $(XCURSORGEN_CFLAGS) +AM_CFLAGS = $(CWARNFLAGS) $(XCURSORGEN_CFLAGS) -fPIe +AM_LDFLAGS = $(XCURSORGEN_LDFLAGS) -pie xcursorgen_LDADD = $(XCURSORGEN_LIBS) diff --git a/xeyes/Makefile.am b/xeyes/Makefile.am old mode 100644 new mode 100755 index 8dbfcf1..9e21cef --- a/xeyes/Makefile.am +++ b/xeyes/Makefile.am @@ -21,7 +21,8 @@ bin_PROGRAMS = xeyes -AM_CFLAGS = $(XEYES_CFLAGS) $(XRENDER_CFLAGS) $(CWARNFLAGS) +AM_CFLAGS = $(XEYES_CFLAGS) $(XRENDER_CFLAGS) $(CWARNFLAGS) -fPIE +AM_LDFLAGS = $(XRENDER_LDFLAGS) -pie xeyes_LDADD = $(XEYES_LIBS) $(XRENDER_LIBS) -lm xeyes_SOURCES = \ diff --git a/xfd/Makefile.am b/xfd/Makefile.am old mode 100644 new mode 100755 index 60f089a..6bf01f2 --- a/xfd/Makefile.am +++ b/xfd/Makefile.am @@ -21,7 +21,8 @@ bin_PROGRAMS = xfd -AM_CFLAGS = $(XFD_CFLAGS) $(CWARNFLAGS) -DXRENDER -D_BSD_SOURCE +AM_CFLAGS = $(XFD_CFLAGS) $(CWARNFLAGS) -DXRENDER -D_BSD_SOURCE -fPIE +AM_LDFLAGS = &(XFD_LDFLAGS) -pie xfd_LDADD = $(XFD_LIBS) ACLOCAL_AMFLAGS = -I m4 diff --git a/xfontsel/Makefile.am b/xfontsel/Makefile.am old mode 100644 new mode 100755 index c030c97..b76368c --- a/xfontsel/Makefile.am +++ b/xfontsel/Makefile.am @@ -21,7 +21,9 @@ bin_PROGRAMS = xfontsel -AM_CFLAGS = $(XFONTSEL_CFLAGS) $(CWARNFLAGS) +AM_CFLAGS = $(XFONTSEL_CFLAGS) $(CWARNFLAGS) -fPIE +AM_LDFLAGS = $(XFONTSEL_LDFLAGS) -pie + xfontsel_LDADD = $(XFONTSEL_LIBS) xfontsel_SOURCES = \ diff --git a/xload/Makefile.am b/xload/Makefile.am old mode 100644 new mode 100755 index f7f4ee0..c0a6447 --- a/xload/Makefile.am +++ b/xload/Makefile.am @@ -21,7 +21,8 @@ bin_PROGRAMS = xload -AM_CFLAGS = $(CWARNFLAGS) $(XLOAD_CFLAGS) +AM_CFLAGS = $(CWARNFLAGS) $(XLOAD_CFLAGS) -fPIE +AM_LDFLAGS = $(XLOAD_LDFLAGS) -pie xload_LDADD = $(XLOAD_LIBS) ACLOCAL_AMFLAGS = -I m4 diff --git a/xlogo/Makefile.am b/xlogo/Makefile.am old mode 100644 new mode 100755 index fa8729e..d1f783b --- a/xlogo/Makefile.am +++ b/xlogo/Makefile.am @@ -20,7 +20,9 @@ bin_PROGRAMS = xlogo -AM_CFLAGS = $(XLOGO_CFLAGS) $(CWARNFLAGS) +AM_CFLAGS = $(XLOGO_CFLAGS) $(CWARNFLAGS) -fPIE +AM_LDFLAGS = $(XLOGO_LDFLAGS) -pie + xlogo_LDADD = $(XLOGO_LIBS) xlogo_SOURCES = \ diff --git a/xmag/Makefile.am b/xmag/Makefile.am old mode 100644 new mode 100755 index b52bebc..afa4ceb --- a/xmag/Makefile.am +++ b/xmag/Makefile.am @@ -21,7 +21,9 @@ bin_PROGRAMS = xmag -AM_CFLAGS = $(XMAG_CFLAGS) $(CWARNFLAGS) +AM_CFLAGS = $(XMAG_CFLAGS) $(CWARNFLAGS) -fPIE +AM_LDFLAGS = $(XMAG_LDFLAGS) -pie + xmag_LDADD = $(XMAG_LIBS) -lm xmag_SOURCES = \ diff --git a/xmessage/Makefile.am b/xmessage/Makefile.am old mode 100644 new mode 100755 index 8ce9c63..64d35d6 --- a/xmessage/Makefile.am +++ b/xmessage/Makefile.am @@ -21,7 +21,9 @@ bin_PROGRAMS = xmessage -AM_CFLAGS = $(CWARNFLAGS) $(XMESSAGE_CFLAGS) +AM_CFLAGS = $(CWARNFLAGS) $(XMESSAGE_CFLAGS) -fPIE +AM_LDFLAGS = $(XMESSAGE_LDFLAGS) -pie + xmessage_LDADD = $(XMESSAGE_LIBS) xmessage_SOURCES = \ diff --git a/xorg-x11-apps.manifest b/xorg-x11-apps.manifest new file mode 100644 index 0000000..7f541e8 --- /dev/null +++ b/xorg-x11-apps.manifest @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/xpr/Makefile.am b/xpr/Makefile.am old mode 100644 new mode 100755 index 77f60fc..f87915a --- a/xpr/Makefile.am +++ b/xpr/Makefile.am @@ -21,7 +21,8 @@ bin_PROGRAMS = xpr -AM_CFLAGS = $(CWARNFLAGS) $(XPR_CFLAGS) -DNOINLINE +AM_CFLAGS = $(CWARNFLAGS) $(XPR_CFLAGS) -DNOINLINE -fPIE +AM_LDFLAGS = $(XPR_LDFLAGS) -pie xpr_LDADD = $(XPR_LIBS) -lm xpr_SOURCES = \ diff --git a/xvidtune/Makefile.am b/xvidtune/Makefile.am old mode 100644 new mode 100755 index cc5c3a4..36d0f25 --- a/xvidtune/Makefile.am +++ b/xvidtune/Makefile.am @@ -22,7 +22,9 @@ bin_PROGRAMS = xvidtune -AM_CFLAGS = $(CWARNFLAGS) $(XVIDTUNE_CFLAGS) +AM_CFLAGS = $(CWARNFLAGS) $(XVIDTUNE_CFLAGS) -fPIE +AM_LDFLAGS = $(XVIDTUNE_LDFLAGS) -pie + xvidtune_LDADD = $(XVIDTUNE_LIBS) xvidtune_SOURCES = \ diff --git a/xwd/Makefile.am b/xwd/Makefile.am old mode 100644 new mode 100755 index 311425b..db0b135 --- a/xwd/Makefile.am +++ b/xwd/Makefile.am @@ -21,7 +21,9 @@ bin_PROGRAMS = xwd -AM_CFLAGS = $(CWARNFLAGS) $(XWD_CFLAGS) +AM_CFLAGS = $(CWARNFLAGS) $(XWD_CFLAGS) -fPIE +AM_LDFLAGS = $(XWD_LDFLAGS) -pie + xwd_LDADD = $(XWD_LIBS) xwd_SOURCES = \ diff --git a/xwud/Makefile.am b/xwud/Makefile.am old mode 100644 new mode 100755 index e2eb5b0..2c42138 --- a/xwud/Makefile.am +++ b/xwud/Makefile.am @@ -21,7 +21,9 @@ bin_PROGRAMS = xwud -AM_CFLAGS = $(CWARNFLAGS) $(XWUD_CFLAGS) +AM_CFLAGS = $(CWARNFLAGS) $(XWUD_CFLAGS) -fPIE +AM_LDFLAGS = $(XWUD_LDFLAGS) -pie + xwud_LDADD = $(XWUD_LIBS) xwud_SOURCES = \ -- 2.7.4