diff options
53 files changed, 724 insertions, 2556 deletions
@@ -0,0 +1,566 @@ +[x11-xserver-utils/xkill] +Copyright 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-xserver-utils/iceauth] +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. + + +[x11-xserver-utils/xmodmap] +Copyright (c) 1987, 2010, 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. + +Copyright 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-xserver-utils/xset] +Copyright 1985, 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-xserver-utils/xrandr] +Copyright © 2001 Keith Packard, member of The XFree86 Project, Inc. +Copyright © 2002 Hewlett Packard Company, Inc. +Copyright © 2006 Intel Corporation + +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that copyright +notice and this permission notice appear in supporting documentation, and +that the name of the 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-xserver-utils/xgamma] +Copyright 1999 by 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. + +------------------------------------------------------------------------------ +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. + +[x11-xserver-utils/xrefresh] +Copyright 1987, 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. + + +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. + +[x11-xserver-utils/xsetpointer] +Copyright 1995 by Frederic Lepied, France. <fred@sugix.frmug.fr.net> + +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation, and that the name of Frederic Lepied not be used in +advertising or publicity pertaining to distribution of the software without +specific, written prior permission. Frederic Lepied makes no +representations about the suitability of this software for any purpose. It +is provided "as is" without express or implied warranty. + +FREDERIC LEPIED DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO +EVENT SHALL FREDERIC LEPIED BE LIABLE FOR ANY SPECIAL, INDIRECT OR +CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, +DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER +TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +PERFORMANCE OF THIS SOFTWARE. + +[x11-xserver-utils/xinput] +Copyright 1996-1997 by Frederic Lepied, France. <Frederic.Lepied@sugix.frmug.org> + +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation, and that the name of the authors not be used in +advertising or publicity pertaining to distribution of the software without +specific, written prior permission. The authors make no +representations about the suitability of this software for any purpose. It +is provided "as is" without express or implied warranty. + +THE AUTHORS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO +EVENT SHALL THE AUTHORS BE LIABLE FOR ANY SPECIAL, INDIRECT OR +CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, +DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER +TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +PERFORMANCE OF THIS SOFTWARE. + +Copyright © 2007 Peter Hutterer +Copyright © 2009 Red Hat, 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 (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-xserver-utils/xstdcmap] +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-xserver-utils/xhost] +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. + +Copyright 1985, 1986, 1987, 1998 The Open Group + +All rights reserved. + +Permission is hereby granted, free of charge, to any person obtaining a +copy of this software and associated documentation files (the +"Software"), to deal in the Software without restriction, including +without limitation the rights to use, copy, modify, merge, publish, +distribute, and/or sell copies of the Software, and to permit persons +to whom the Software is furnished to do so, provided that the above +copyright notice(s) and this permission notice appear in all copies of +the Software and that both the above copyright notice(s) and this +permission notice appear in supporting documentation. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT +OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR +HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL +INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING +FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, +NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION +WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + +Except as contained in this notice, the name of a copyright holder +shall not be used in advertising or otherwise to promote the sale, use +or other dealings in this Software without prior written authorization +of the copyright holder. + +X Window System is a trademark of The Open Group. + + +[x11-xserver-utils/xsetroot] +Copyright 1987, 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-xserver-utils/sessreg] +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. + +Copyright (c) 2005, 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-xserver-utils/xsetmode] +Copyright 1995 by Frederic Lepied, France. <fred@sugix.frmug.fr.net> + +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation, and that the name of Frederic Lepied not be used in +advertising or publicity pertaining to distribution of the software without +specific, written prior permission. Frederic Lepied makes no +representations about the suitability of this software for any purpose. It +is provided "as is" without express or implied warranty. + +FREDERIC LEPIED DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO +EVENT SHALL FREDERIC LEPIED BE LIABLE FOR ANY SPECIAL, INDIRECT OR +CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, +DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER +TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +PERFORMANCE OF THIS SOFTWARE. + +[x11-xserver-utils/xrdb] + + COPYRIGHT 1987, 1991 + DIGITAL EQUIPMENT CORPORATION + MAYNARD, MASSACHUSETTS + MASSACHUSETTS INSTITUTE OF TECHNOLOGY + CAMBRIDGE, 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 1991, Digital Equipment Corporation. +Copyright 1991, 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-xserver-utils/rgb] +Copyright 1985, 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. + +Copyright (c) 1994, 2008, 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. + diff --git a/debian/README.source b/debian/README.source deleted file mode 100644 index b09a1ab..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 using this -"upstream-*" branch in the Debian git repository but it is actually -copied from upstream tarballs directly. - -Due to X.org being highly modular, packaging all X.org applications -as their own independent packages would have created too many Debian -packages. For this reason, some X.org applications have been grouped -into larger packages: xutils, xutils-dev, x11-apps, x11-session-utils, -x11-utils, x11-xfs-utils, x11-xkb-utils, x11-xserver-utils. -Most packages, including the X.org server itself and all libraries -and drivers are, however maintained independently. - -The Debian packaging is added by creating the "debian-*" git branch -which contains the aforementioned "upstream-*" branch plus the debian/ -repository files. -When a patch has to be applied to the Debian package, two solutions -are involved: -* If the patch is available in one of the upstream branches, it - may be git'cherry-picked into the Debian repository. In this - case, it appears directly in the .diff.gz. -* Otherwise, the patch is added to debian/patches/ which is managed - with quilt as documented in /usr/share/doc/quilt/README.source. - -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 100755 index 3bb3814..0000000 --- a/debian/changelog +++ /dev/null @@ -1,568 +0,0 @@ -x11-xserver-utils (7.5+2slp2) unstable; urgency=low - - * [X11R7.6] upgrade package - * Git: 165.213.180.234:slp/pkgs/xorg/util/x11-xserver-utils - * Tag: x11-xserver-utils_7.5+2slp2 - - -- SooChan Lim <sc1.lim@samsung.com> Tue, 11 Jan 2011 17:43:16 +0900 - -x11-xserver-utils (7.5+2ubuntu1) maverick; urgency=low - - * Merge from debian unstable. Remaining Ubuntu changes: - - 101_xset_spellfix.patch: Spelling fix in help docs. - - -- Robert Hooker <sarvatt@ubuntu.com> Mon, 09 Aug 2010 10:24:12 -0400 - -x11-xserver-utils (7.5+2) unstable; urgency=low - - [ Julien Cristau ] - * Rename the build directory to not include DEB_BUILD_GNU_TYPE for no - good reason. Thanks, Colin Watson! - * Remove myself from Uploaders - * debian/rules: add get-tarballs rule. - * xvidtune 1.0.2. - * Drop XS- prefix from Vcs-* control fields. - * Drop Pre-Depends on x11-common, only needed for upgrades from sarge. - - [ Cyril Brulebois ] - * xrandr 1.3.3. - + Fix segmentation fault on ?œxrandr --transform none??(closes: #579542). - * sessreg 1.0.6. - * Add myself to Uploaders. - - -- Cyril Brulebois <kibi@debian.org> Sat, 24 Jul 2010 16:27:24 +0200 - -x11-xserver-utils (7.5+1ubuntu2) lucid; urgency=low - - * Add 101_xset_spellfix.patch: Spelling fix in help docs - (LP: #426152) - - -- Bryce Harrington <bryce@ubuntu.com> Wed, 17 Mar 2010 15:23:57 -0700 - -x11-xserver-utils (7.5+1ubuntu1) lucid; urgency=low - - * Merge from Debian. Remaining Ubuntu changes: - - Add 100_xrandr-output.patch: When using --scale or --transform, verify - a valid output parameter is used; crashes otherwise. - - -- Bryce Harrington <bryce@ubuntu.com> Fri, 08 Jan 2010 18:38:47 -0800 - -x11-xserver-utils (7.5+1) unstable; urgency=low - - [ Julien Cristau ] - * Update xsetroot config.{guess,sub} for avr32 support (closes: #535715). - * Add README.source from xsfbs, and bump Standards-Version to 3.8.2. - * Remove xtrap (closes: #547547). - * Drop libxxf86misc-dev from Build-Depends. It's optional for xset, and - recent X servers don't support this extension anymore. - * Make 01_sessreg_implement_hostname_hashing.diff apply with -p1 instead of - -p0. - - [ Brice Goglin ] - * iceauth 1.0.3. - * sessreg 1.0.5. - * xcmsdb 1.0.2. - * xgamma 1.0.3. - * xhost 1.0.3. - * xmodmap 1.0.4. - + fix XKeysymDB path in manpage, obsoleting 02_xmodmap_manpage.diff - * xrandr 1.3.2. - * xrdb 1.0.6. - * xrefresh 1.0.3. - * xset 1.1.0. - + Fix some typos in the manpage, closes: #525255. - + Avoid warning from "xset r rate" when XF86Misc extension is not present, - closes: #526028. - * xsetroot 1.0.3. - * Suggests: xorg-docs-core since some manpages reference it in their - SEE ALSO section. Thanks Vincent Lefevre. Closes: #541220. - * Refresh patches. - - -- Brice Goglin <bgoglin@debian.org> Sun, 06 Dec 2009 20:41:37 +0100 - -x11-xserver-utils (7.4+2ubuntu3) karmic; urgency=low - - * 100_xrandr-output.patch: Refresh patch to apply cleanly, fixing - FTBFS. LP: #432079 - - -- Michael Terry <michael.terry@canonical.com> Thu, 17 Sep 2009 15:46:30 -0400 - -x11-xserver-utils (7.4+2ubuntu2) karmic; urgency=low - - * 100_xrandr-output.patch: Replace with patch sent upstream. - (LP: #354715) - - -- Bryce Harrington <bryce@ubuntu.com> Wed, 02 Sep 2009 02:15:48 -0700 - -x11-xserver-utils (7.4+2ubuntu1) karmic; urgency=low - - * Add 100_xrandr-output.patch: When using --scale or --transform, verify - a valid output parameter is used; crashes otherwise. - (LP: #354715) - - -- Bryce Harrington <bryce@ubuntu.com> Wed, 02 Sep 2009 01:18:10 -0700 - -x11-xserver-utils (7.4-3slp2) unstable; urgency=low - - * Fix Git repository and modify maintainer info - * Git: 165.213.180.234:/git/slp/pkgs/xorg/util/x11-xserver-utils - * Tag: x11-xserver-utils_7.4-3slp2 - - -- Sung-Jin Park <sj76.park@samsung.com> Thu, 02 Dec 2010 11:33:56 +0900 - -x11-xserver-utils (7.4-2slp2) unstable; urgency=low - - * update maintainer - * Git: 165.213.180.234:/git/slp2.0/slp2.0-pkgs/X11 - * Tag: x11-xserver-utils_7.4-2slp2 - - -- Sung-Jin Park <sj76.park@samsung.com> Wed, 21 Apr 2010 10:29:11 +0900 - -x11-xserver-utils (7.4-1slp2) unstable; urgency=low - - * Change revision - - -- Sung-Jin Park <sj76.park@samsung.com> Thu, 25 Mar 2010 19:18:05 +0900 - -x11-xserver-utils (7.4+4) unstable; urgency=low - - * Fix debian/contrl file to replace xmodmap and xsetroot with this package - - -- Sung-Jin Park <sj76.park@samsung.com> Tue, 08 Dec 2009 19:59:54 +0900 - -x11-xserver-utils (7.4+3) unstable; urgency=low - - * Import debian package - - -- Sung-Jin Park <sj76.park@samsung.com> Tue, 08 Dec 2009 15:30:09 +0900 - -x11-xserver-utils (7.4+2) unstable; urgency=low - - * xrandr 1.3. - * Upload to unstable. - - -- Julien Cristau <jcristau@debian.org> Mon, 06 Apr 2009 18:38:39 +0200 - -x11-xserver-utils (7.4+1) experimental; urgency=low - - * 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. - * rgb 1.0.3. - * Update debian/copyright from rgb's COPYING. - * sessreg 1.0.4. - * Add sessreg copyright and license to debian/copyright, from sessreg's - COPYING. - * xrandr 1.2.99.4. - * Drop all xrandr patches (included upstream). - * Refresh 01_sessreg_implement_hostname_hashing.diff. - * Bump libxrandr-dev build-dep to 2:1.2.99.3. - * Drop -1 debian revisions from build-deps to make lintian happy. - * Sanitize order of dh_installdeb, dh_shlibdeps and dh_makeshlibs in - debian/rules binary-arch (thanks, lintian!). - * Add Suggests on nickle and cairo-5c for the new xkeystone script. - - -- Julien Cristau <jcristau@debian.org> Sun, 01 Feb 2009 16:06:42 +0100 - -x11-xserver-utils (7.3+5) unstable; urgency=low - - * xrandr: Fix for 64bit: feed a pointer to the right size variable to - scanf(). - * xrandr: update the manpage. - * xrandr: manpage typo fixes. - (all patches from upstream git) - - -- Julien Cristau <jcristau@debian.org> Fri, 15 Aug 2008 22:02:17 +0200 - -x11-xserver-utils (7.3+4) unstable; urgency=low - - * xrandr: move outputs among CRTCs as necessary (closes: #486142). - * debian/rules, xsfbs: fix rule dependencies. - - -- Julien Cristau <jcristau@debian.org> Sat, 02 Aug 2008 17:24:30 +0200 - -x11-xserver-utils (7.3+3) unstable; urgency=low - - * xrdb 1.0.5 - + Prevent cpp from prefixing errors with <stdin> when the xrdb input is a - file (closes: #458246) - * xset 1.0.4 - * xrandr 1.2.3 - * update debian/copyright with information from xrandr's COPYING file. - - -- Julien Cristau <jcristau@debian.org> Sun, 01 Jun 2008 14:03:26 +0200 - -x11-xserver-utils (7.3+2) unstable; urgency=low - - [ Timo Aaltonen ] - * control: add libxxf86misc-dev to build-depends, it's useful for xset. - - [ Julien Cristau ] - * Preventively relax Replaces on xutils and xbase-clients so those packages - can still be updated if needed (e.g. in stable updates). - - -- Julien Cristau <jcristau@debian.org> Mon, 03 Dec 2007 20:07:36 +0100 - -x11-xserver-utils (7.3+1) unstable; urgency=low - - [ Julien Cristau ] - * iceauth 1.0.2. - + removes blank line in the manpage (closes: #25285). - * xmodmap 1.0.3. - + manpage updated to state that -pm is the default (closes: #236198) - * xgamma 1.0.2. - + the manpage now explains how to print the gamma value more clearly - (closes: #296021). - * xsetroot 1.0.2. - * xrdb 1.0.4. - + fixes manpage typo (closes: #276286). - * Add upstream URL to debian/copyright, and update it from xgamma's COPYING - file. - - [ Brice Goglin ] - * Add menu entries for xrefresh and xvidtune. - * sessreg 1.0.3. - * xset 1.0.3. - * Add myself to Uploaders, and remove Branden with his permission. - - -- Brice Goglin <bgoglin@debian.org> Fri, 17 Aug 2007 09:58:34 +0200 - -x11-xserver-utils (7.2+3) experimental; urgency=low - - * xhost 1.0.2. - + fixes typo in man page (closes: #232384). - * Build with -I.git so the source package doesn't contain the whole git - repo. - * Silence lintian by using + instead of - in the version number. - - -- Julien Cristau <jcristau@debian.org> Tue, 17 Jul 2007 18:59:33 +0200 - -x11-xserver-utils (7.2-2) experimental; urgency=low - - * Add xrandr 1.2.2. - + fixes xrandr(1), and thus closes: #430122. - - -- Julien Cristau <jcristau@debian.org> Fri, 06 Jul 2007 22:38:18 +0200 - -x11-xserver-utils (7.2-1) experimental; urgency=low - - * Change versioning scheme, base it on the latest X katamari release. - * Add xrandr 1.2.1. - - -- Julien Cristau <jcristau@debian.org> Thu, 21 Jun 2007 16:20:45 +0100 - -x11-xserver-utils (0.1) experimental; urgency=low - - [ Timo Aaltonen ] - * Split xbase-clients, new versioning. - * Included packages: - - iceauth 1.0.1 - - rgb 1.0.1 (from xutils) - - sessreg 1.0.0 (from xutils) - - xcmsdb 1.0.1 - - xgamma 1.0.1 - - xhost 1.0.1 - - xmodmap 1.0.2 - - xrandr 1.2.0 - - xrdb 1.0.3 - - xrefresh 1.0.2 - - xset 1.0.2 - - xsetmode 1.0.0 - - xsetpointer 1.0.1 - - xsetroot 1.0.1 - - xstdcmap 1.0.1 - - xtrap 1.0.2 - - xvidtune 1.0.1 - * debian/control: - - Rename Package and Source. - - Remove unnecessary Build-Deps. - - Modify description. - - Replaces: xbase-clients (<= 1:7.2.ds2-3), xutils (<=1:7.1.ds.3-1) - to make upgrades smoother. - - C/R: <all the included packages> to work around old Ubuntu - packaging. - * debian/copyright: Leave only copyright notices that relate to - this package. FIXME:*rgb, sessreg missing* - * debian/x11-xserver-utils.install, rules: Edit to reflect new - packaging. - * debian/x11-xserver-utils.dirs: Remove. - * debian/local/: Remove. - * debian/patches: Delete patches which do not relate to this package. - - [ Julien Cristau ] - * autoreconf to bring in new versions of config.{guess,sub}. - - -- Julien Cristau <jcristau@debian.org> Wed, 30 May 2007 20:06:23 +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 <jcristau@debian.org> 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 <jcristau@debian.org> 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 <jcristau@debian.org> 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 <jcristau@debian.org> 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 <celejar@gmail.com> 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 <jcristau@debian.org> 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 <julien.cristau@ens-lyon.org> 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 <julien.cristau@ens-lyon.org> 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 <barbier@debian.org> 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 <dannf@debian.org> 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 <dnusinow@debian.org> 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 <dnusinow@debian.org> 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 <dnusinow@debian.org> 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 <dnusinow@debian.org> 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 <dnusinow@debian.org> 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 <dnusinow@debian.org> 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 <dnusinow@debian.org> 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 <dnusinow@debian.org> 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 <dnusinow@debian.org> 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 <dnusinow@debian.org> 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 <dnusinow@debian.org> 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 100755 index dc47e4c..0000000 --- a/debian/control +++ /dev/null @@ -1,64 +0,0 @@ -Source: x11-xserver-utils -Section: x11 -Priority: optional -Maintainer: Sung-Jin Park <sj76.park@samsung.com>, Sangjin Lee <lsj119@samsung.com>, Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com> -#XSBC-Original-Maintainer: Debian X Strike Force <debian-x@lists.debian.org> -Uploaders: SooChan Lim <sc1.lim@samung.com>, Sung-Jin Park <sj76.park@samsung.com>, David Nusinow <dnusinow@debian.org>, Brice Goglin <bgoglin@debian.org>, Cyril Brulebois <kibi@debian.org> -Build-Depends: debhelper (>= 5.0.0), pkg-config, libx11-dev (>= 2:1.0.0), - libxaw7-dev (>= 1:1.0.1), libxext-dev (>= 1:1.0.0), - libxi-dev (>= 1:1.0.0-3), libxmuu-dev (>= 1:1.0.1), - libxrandr-dev (>= 2:1.2.99.3), libxt-dev (>= 1:1.0.0), - libxxf86vm-dev (>= 1:1.0.0), xbitmaps, quilt, - x11proto-input-dev (>= 1.4), libxcursor-dev, x11-common, xutils-dev (>= 1:7.5-1slp2+1) -# Reasons for build-depends: -# debhelper for the packaging, pkg-config needed by configure scripts -# Individual apps: -# iceauth: x11proto-core-dev, libice-dev -# xcmsdb: libx11-dev -# xgamma: libx11-dev, libxxf86vm-dev -# xhost: libx11-dev, libxmuu-dev, libxau-dev -# xmodmap: libx11-dev -# xrandr: libxrandr-dev (>= 2:1.2.0), libxrender, libx11 -# xrdb: libxmuu-dev, libx11-dev -# xrefresh: libx11-dev -# xset: libxmuu-dev, libx11-dev, libxext-dev, -# (libxxf86misc-dev), (libxfontcache-dev) -# xsetmode: libxi-dev, libx11-dev -# xsetpointer: libxi-dev, libx11-dev, x11proto-input-dev (>= 1.4) -# xsetroot: libxmuu-dev, libx11-dev, xbitmaps -# xstdcmap: libxmu-dev, libx11-dev -# xvidtune: libxaw7-dev, libxxf86vm-dev, libxt-dev -Standards-Version: 3.8.2 -Vcs-Git: git://git.debian.org/git/pkg-xorg/app/x11-xserver-utils -Vcs-Browser: http://git.debian.org/?p=pkg-xorg/app/x11-xserver-utils.git - -Package: x11-xserver-utils -Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends} -#Depends: ${shlibs:Depends}, ${misc:Depends}, cpp -Conflicts: iceauth, sessreg, xgamma, xhost, xmodmap, xrandr, xrdb, xrefresh, xrgb, xset, xsetmode, xsetpointer, xsetroot, xstdcmap, xvidtune -Replaces: xbase-clients (<< 1:7.3), xutils (<< 1:7.2), iceauth, sessreg, xgamma, xhost, xmodmap, xrandr, xrdb, xrefresh, xrgb, xset, xsetmode, xsetpointer, xsetroot, xstdcmap, xvidtune -Suggests: nickle, cairo-5c, xorg-docs-core -Description: X server utilities - An X client is a program that interfaces with an X server (almost always via - the X libraries), and thus with some input and output hardware like a - graphics card, monitor, keyboard, and pointing device (such as a mouse). - . - This package provides a miscellaneous assortment of X Server utilities - that ship with the X Window System, including: - - iceauth, a tool for manipulating ICE protocol authorization records; - - rgb; - - sessreg, a simple program for managing utmp/wtmp entries; - - xcmsdb, a device color characteristic utility for the X Color Management - System; - - xgamma, a tool for querying and setting a monitor's gamma correction; - - xhost, a very dangerous program that you should never use; - - xmodmap, a utility for modifying keymaps and pointer button mappings in X; - - xrandr, a command-line interface to the RandR extension; - - xrdb, a tool to manage the X server resource database; - - xrefresh, a tool that forces a redraw of the X screen; - - xset, a tool for setting miscellaneous X server parameters; - - xsetmode and xsetpointer, tools for handling X Input devices; - - xsetroot, a tool for tailoring the appearance of the root window; - - xstdcmap, a utility to selectively define standard colormap properties; - - xvidtune, a tool for customizing X server modelines for your monitor. diff --git a/debian/copyright b/debian/copyright deleted file mode 100644 index a0f74a2..0000000 --- a/debian/copyright +++ /dev/null @@ -1,470 +0,0 @@ -The contents of this package were downloaded from -http://xorg.freedesktop.org/releases/individual/app/ -It contains the iceauth, rgb, sessreg, xcmsdb, xgamma, xhost, xmodmap, xrandr, -xrdb, xrefresh, xset, xsetmode, xsetpointer, xsetroot, xstdcmap and xvidtune -applications. - -iceauth: - 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. - * * - * Original Author of "xauth" : Jim Fulton, MIT X Consortium - * Modified into "iceauth" : Ralph Mor, X Consortium - */ - -rgb: - Copyright 1985, 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. - - Copyright 1994, 2008 Sun Microsystems, Inc. All rights reserved. - - Permission is hereby granted, free of charge, to any person obtaining a - copy of this software and associated documentation files (the - "Software"), to deal in the Software without restriction, including - without limitation the rights to use, copy, modify, merge, publish, - distribute, and/or sell copies of the Software, and to permit persons - to whom the Software is furnished to do so, provided that the above - copyright notice(s) and this permission notice appear in all copies of - the Software and that both the above copyright notice(s) and this - permission notice appear in supporting documentation. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS - OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT - OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR - HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL - INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING - FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, - NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION - WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - - Except as contained in this notice, the name of a copyright holder - shall not be used in advertising or otherwise to promote the sale, use - or other dealings in this Software without prior written authorization - of the copyright holder. - -sessreg: - 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. - -xcmsdb: - (c) Copyright 1990 Tektronix Inc. - 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 Tektronix not be used - in advertising or publicity pertaining to distribution of the software - without specific, written prior permission. - - Tektronix disclaims all warranties with regard to this software, including - all implied warranties of merchantability and fitness, in no event shall - Tektronix 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. - -xgamma: - Copyright 1999 by 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. - - Written by David Bateman - - ------------------------------------------------------------------------------ - 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. - -xhost: - Copyright 1985, 1986, 1987, 1998 The Open Group Copyright 2004 Sun Microsystems, Inc. - - All rights reserved. - - Permission is hereby granted, free of charge, to any person obtaining a - copy of this software and associated documentation files (the - "Software"), to deal in the Software without restriction, including - without limitation the rights to use, copy, modify, merge, publish, - distribute, and/or sell copies of the Software, and to permit persons - to whom the Software is furnished to do so, provided that the above - copyright notice(s) and this permission notice appear in all copies of - the Software and that both the above copyright notice(s) and this - permission notice appear in supporting documentation. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS - OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT - OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR - HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL - INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING - FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, - NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION - WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - - Except as contained in this notice, the name of a copyright holder - shall not be used in advertising or otherwise to promote the sale, use - or other dealings in this Software without prior written authorization - of the copyright holder. - -xmodmap: - Copyright 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. - -xrandr: - Copyright © 2001 Keith Packard, member of The XFree86 Project, Inc. - Copyright © 2002 Hewlett Packard Company, Inc. - Copyright © 2006 Intel Corporation - - Permission to use, copy, modify, distribute, and sell this software and its - documentation for any purpose is hereby granted without fee, provided that - the above copyright notice appear in all copies and that both that copyright - notice and this permission notice appear in supporting documentation, and - that the name of the 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. - -xrdb: - COPYRIGHT 1987, 1991 - DIGITAL EQUIPMENT CORPORATION - MAYNARD, MASSACHUSETTS - MASSACHUSETTS INSTITUTE OF TECHNOLOGY - CAMBRIDGE, 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. - -xrefresh: - Copyright 1987, 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. - - - 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. - -xset: - Copyright 1985, 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. - -xsetmode: - Copyright 1995 by Frederic Lepied, France. <fred@sugix.frmug.fr.net> - - Permission to use, copy, modify, distribute, and sell this software and its - documentation for any purpose is hereby granted without fee, provided that - the above copyright notice appear in all copies and that both that - copyright notice and this permission notice appear in supporting - documentation, and that the name of Frederic Lepied not be used in - advertising or publicity pertaining to distribution of the software without - specific, written prior permission. Frederic Lepied makes no - representations about the suitability of this software for any purpose. It - is provided "as is" without express or implied warranty. - - FREDERIC LEPIED DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, - INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO - EVENT SHALL FREDERIC LEPIED BE LIABLE FOR ANY SPECIAL, INDIRECT OR - CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, - DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER - TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - PERFORMANCE OF THIS SOFTWARE. - -xsetpointer: - Copyright 1995 by Frederic Lepied, France. <fred@sugix.frmug.fr.net> - - Permission to use, copy, modify, distribute, and sell this software and its - documentation for any purpose is hereby granted without fee, provided that - the above copyright notice appear in all copies and that both that - copyright notice and this permission notice appear in supporting - documentation, and that the name of Frederic Lepied not be used in - advertising or publicity pertaining to distribution of the software without - specific, written prior permission. Frederic Lepied makes no - representations about the suitability of this software for any purpose. It - is provided "as is" without express or implied warranty. - - FREDERIC LEPIED DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, - INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO - EVENT SHALL FREDERIC LEPIED BE LIABLE FOR ANY SPECIAL, INDIRECT OR - CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, - DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER - TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - PERFORMANCE OF THIS SOFTWARE. - -xsetroot: - 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. - */ - * Author: Mark Lillibridge, MIT Project Athena - * 11-Jun-87 - -xstdcmap: - 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: Donna Converse, MIT X Consortium - -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. diff --git a/debian/patches/01_sessreg_implement_hostname_hashing.diff b/debian/patches/01_sessreg_implement_hostname_hashing.diff deleted file mode 100644 index 887a54c..0000000 --- a/debian/patches/01_sessreg_implement_hostname_hashing.diff +++ /dev/null @@ -1,208 +0,0 @@ -$Id: 085_sessreg_implement_hostname_hashing.diff 689 2005-10-19 22:11:30Z dnusinow $ - -The sessreg program assumes that hostnames in utmp entries are unique in -the last four characters. When two entries are "test:0" and "fist:0", for -example, this assumption fails. - -Rectify this problem by hashing the entire hostname field from the utmp -entry, so that we can tell unlike hostnames apart with much greater -reliability. There is still a possiblility of one hash collision in 2^32. - -This patch by Maximiliano Curia and Damián Viano, using a public-domain -hash algorithm by Bob Jenkins. - -Not submitted to XFree86. - ---- - sessreg/sessreg.c | 164 ++++++++++++++++++++++++++++++++++++++++++++++++++---- - 1 file changed, 152 insertions(+), 12 deletions(-) - -Index: a/sessreg/sessreg.c -=================================================================== ---- a/sessreg/sessreg.c.orig 2009-12-06 13:02:16.000000000 +0100 -+++ b/sessreg/sessreg.c 2009-12-06 13:30:49.000000000 +0100 -@@ -97,6 +97,18 @@ - const char *host, Time_t date, int addp); - #endif - -+#ifdef SYSV -+/* used for hashing ut_id */ -+typedef unsigned long int ub4; /* unsigned 4-byte quantities */ -+typedef unsigned char ub1; /* unsigned 1-byte quantities */ -+ -+#define hashsize(n) ((ub4)1<<(n)) -+#define hashmask(n) (hashsize(n)-1) -+ -+ub4 hash(register ub1 *k, register ub4 length, register ub4 initval); -+ -+#endif -+ - static int wflag, uflag, lflag; - static char *wtmp_file, *utmp_file, *line; - #ifdef USE_UTMPX -@@ -385,21 +397,23 @@ - bzero (u->ut_name, sizeof (u->ut_name)); - #ifdef SYSV - if (line) { -- int i; - /* -- * this is a bit crufty, but -- * follows the apparent conventions in -- * the ttys file. ut_id is only 4 bytes -- * long, and the last 4 bytes of the line -- * name are written into it, left justified. -+ * The ut_id is 4 bytes long. We make a hash of the line -+ * received, preceding it by ":" to prevent clashing with -+ * other ut_ids. - */ -- i = strlen (line); -- if (i >= sizeof (u->ut_id)) -- i -= sizeof (u->ut_id); -- else -- i = 0; -- (void) strncpy (u->ut_id, line + i, sizeof (u->ut_id)); -+ ub4 h; -+ u->ut_id[0]=':'; -+ h = hash(line, strlen(line),0x9e3779b9); -+ h = (h & hashmask((sizeof(u->ut_id)-sizeof(char))*8)); -+ (void) strncpy (u->ut_id + 1,(char *) &h, sizeof (u->ut_id)-sizeof(char)); - } else -+ /* -+ * From utmp(5): -+ * Clearing ut_id may result in race conditions leading to corrupted -+ * utmp entries and and potential security holes. -+ */ -+ /* TODO: CHECK this */ - bzero (u->ut_id, sizeof (u->ut_id)); - if (addp) { - u->ut_pid = getppid (); -@@ -638,3 +652,129 @@ - return freeslot; - } - #endif -+ -+#ifdef SYSV -+/* -+-------------------------------------------------------------------- -+mix -- mix 3 32-bit values reversibly. -+For every delta with one or two bits set, and the deltas of all three -+ high bits or all three low bits, whether the original value of a,b,c -+ is almost all zero or is uniformly distributed, -+* If mix() is run forward or backward, at least 32 bits in a,b,c -+ have at least 1/4 probability of changing. -+* If mix() is run forward, every bit of c will change between 1/3 and -+ 2/3 of the time. (Well, 22/100 and 78/100 for some 2-bit deltas.) -+mix() was built out of 36 single-cycle latency instructions in a -+ structure that could supported 2x parallelism, like so: -+ a -= b; -+ a -= c; x = (c>>13); -+ b -= c; a ^= x; -+ b -= a; x = (a<<8); -+ c -= a; b ^= x; -+ c -= b; x = (b>>13); -+ ... -+ Unfortunately, superscalar Pentiums and Sparcs can't take advantage -+ of that parallelism. They've also turned some of those single-cycle -+ latency instructions into multi-cycle latency instructions. Still, -+ this is the fastest good hash I could find. There were about 2^^68 -+ to choose from. I only looked at a billion or so. -+-------------------------------------------------------------------- -+*/ -+#define mix(a,b,c) \ -+{ \ -+ a -= b; a -= c; a ^= (c>>13); \ -+ b -= c; b -= a; b ^= (a<<8); \ -+ c -= a; c -= b; c ^= (b>>13); \ -+ a -= b; a -= c; a ^= (c>>12); \ -+ b -= c; b -= a; b ^= (a<<16); \ -+ c -= a; c -= b; c ^= (b>>5); \ -+ a -= b; a -= c; a ^= (c>>3); \ -+ b -= c; b -= a; b ^= (a<<10); \ -+ c -= a; c -= b; c ^= (b>>15); \ -+} -+ -+/* -+-------------------------------------------------------------------- -+hash() -- hash a variable-length key into a 32-bit value -+ k : the key (the unaligned variable-length array of bytes) -+ len : the length of the key, counting by bytes -+ initval : can be any 4-byte value -+Returns a 32-bit value. Every bit of the key affects every bit of -+the return value. Every 1-bit and 2-bit delta achieves avalanche. -+About 6*len+35 instructions. -+ -+The best hash table sizes are powers of 2. There is no need to do -+mod a prime (mod is sooo slow!). If you need less than 32 bits, -+use a bitmask. For example, if you need only 10 bits, do -+ h = (h & hashmask(10)); -+In which case, the hash table should have hashsize(10) elements. -+ -+If you are hashing n strings (ub1 **)k, do it like this: -+ for (i=0, h=0; i<n; ++i) h = hash( k[i], len[i], h); -+ -+By Bob Jenkins, 1996. bob_jenkins@burtleburtle.net. You may use this -+code any way you wish, private, educational, or commercial. It's free. -+ -+[On 27 May 2004, Bob Jenkins further clarified the above statement. -+ -+ From: Bob Jenkins <bob_jenkins@burtleburtle.net> -+ Date: Thu, 27 May 2004 22:33:06 -0700 -+ To: Margarita Manterola <marga@marga.com.ar> -+ Subject: Re: Hash function -+ -+ The algorithm is public domain. I ask that I be referenced as the -+ source of the algorithm, but I can't enforce that, since being public -+ domain means I've reserved no rights at all. -+ -+-- Branden Robinson, 2004-06-06] -+ -+See http://burtleburtle.net/bob/hash/evahash.html -+Use for hash table lookup, or anything where one collision in 2^^32 is -+acceptable. Do NOT use for cryptographic purposes. -+-------------------------------------------------------------------- -+*/ -+ -+ub4 -+hash(register ub1 *k, register ub4 length, register ub4 initval) -+{ -+ register ub4 a,b,c,len; -+ -+ /* Set up the internal state */ -+ len = length; -+ a = b = 0x9e3779b9; /* the golden ratio; an arbitrary value */ -+ c = initval; /* the previous hash value */ -+ -+ /*---------------------------------------- handle most of the key */ -+ while (len >= 12) -+ { -+ a += (k[0] +((ub4)k[1]<<8) +((ub4)k[2]<<16) +((ub4)k[3]<<24)); -+ b += (k[4] +((ub4)k[5]<<8) +((ub4)k[6]<<16) +((ub4)k[7]<<24)); -+ c += (k[8] +((ub4)k[9]<<8) +((ub4)k[10]<<16)+((ub4)k[11]<<24)); -+ mix(a,b,c); -+ k += 12; len -= 12; -+ } -+ -+ /*------------------------------------- handle the last 11 bytes */ -+ c += length; -+ switch(len) /* all the case statements fall through */ -+ { -+ case 11: c+=((ub4)k[10]<<24); -+ case 10: c+=((ub4)k[9]<<16); -+ case 9 : c+=((ub4)k[8]<<8); -+ /* the first byte of c is reserved for the length */ -+ case 8 : b+=((ub4)k[7]<<24); -+ case 7 : b+=((ub4)k[6]<<16); -+ case 6 : b+=((ub4)k[5]<<8); -+ case 5 : b+=k[4]; -+ case 4 : a+=((ub4)k[3]<<24); -+ case 3 : a+=((ub4)k[2]<<16); -+ case 2 : a+=((ub4)k[1]<<8); -+ case 1 : a+=k[0]; -+ /* case 0: nothing left to add */ -+ } -+ mix(a,b,c); -+ /*-------------------------------------------- report the result */ -+ return c; -+} -+ -+#endif diff --git a/debian/patches/101_xset_spellfix.patch b/debian/patches/101_xset_spellfix.patch deleted file mode 100644 index c378593..0000000 --- a/debian/patches/101_xset_spellfix.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -Nurp x11-xserver-utils-7.4+2ubuntu3/xset/xset.c working/xset/xset.c ---- x11-xserver-utils-7.4+2ubuntu3/xset/xset.c 2009-02-01 05:04:01.000000000 -0800 -+++ working/xset/xset.c 2010-03-15 19:02:50.000000000 -0700 -@@ -1554,8 +1554,8 @@ usage(char *fmt, ...) - #ifdef FONTCACHE - fprintf(stderr, " To control font cache:\n"); - fprintf(stderr, "\t fc [hi-mark [low-mark [balance]]]\n"); -- fprintf(stderr, "\t both mark values spcecified in KB\n"); -- fprintf(stderr, "\t balance value spcecified in percent (10 - 90)\n"); -+ fprintf(stderr, "\t both mark values specified in KB\n"); -+ fprintf(stderr, "\t balance value specified in percent (10 - 90)\n"); - fprintf(stderr, " Show font cache statistics:\n"); - fprintf(stderr, "\t fc s\n"); - #endif diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index 8ed6665..0000000 --- a/debian/patches/series +++ /dev/null @@ -1,2 +0,0 @@ -01_sessreg_implement_hostname_hashing.diff -101_xset_spellfix.patch diff --git a/debian/rules b/debian/rules deleted file mode 100755 index 51eb2b2..0000000 --- a/debian/rules +++ /dev/null @@ -1,116 +0,0 @@ -#!/usr/bin/make -f -# debian/rules for the Debian xutils package. -# Copyright © 2004 Scott James Remnant <scott@netsplit.com> -# Copyright © 2005 Daniel Stone <daniel@fooishbar.org> -# Copyright © 2005 David Nusinow <dnusinow@debian.org> - -# 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-xserver-utils - -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 -DEF_SUBDIRS=iceauth rgb sessreg xcmsdb xgamma xhost xmodmap xrandr xrdb xrefresh xset xsetmode xsetpointer xsetroot xstdcmap xvidtune -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 - -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 -$(STAMP_DIR)/build-%: $(STAMP_DIR)/genscripts - dh_testdir - 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 \ - 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 -Xrgb.txt --list-missing -# dh_installmenu -# dh_installchangelogs - dh_link - dh_strip - dh_compress - dh_fixperms - dh_makeshlibs - dh_shlibdeps - dh_installdeb - 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 - -.PHONY: get-tarballs -get-tarballs: $(addprefix get-tarball-,$(SUBDIRS)) - -.PHONY: get-tarball-% -get-tarball-%: - uscan --no-conf --download --no-symlink --destdir . --package $* --upstream-version $(shell awk -F = '/^PACKAGE_VERSION=/ { print $$2 }' < $*/configure || echo 0) --watchfile debian/watch.$* || test $$? = 1 diff --git a/debian/watch.iceauth b/debian/watch.iceauth deleted file mode 100644 index b898bfa..0000000 --- a/debian/watch.iceauth +++ /dev/null @@ -1,2 +0,0 @@ -version=3 -http://xorg.freedesktop.org/releases/individual/app/ iceauth-(.*)\.tar\.gz diff --git a/debian/watch.rgb b/debian/watch.rgb deleted file mode 100644 index 87c158a..0000000 --- a/debian/watch.rgb +++ /dev/null @@ -1,2 +0,0 @@ -version=3 -http://xorg.freedesktop.org/releases/individual/app/ rgb-(.*)\.tar\.gz diff --git a/debian/watch.sessreg b/debian/watch.sessreg deleted file mode 100644 index 4122c12..0000000 --- a/debian/watch.sessreg +++ /dev/null @@ -1,2 +0,0 @@ -version=3 -http://xorg.freedesktop.org/releases/individual/app/ sessreg-(.*)\.tar\.gz diff --git a/debian/watch.xcmsdb b/debian/watch.xcmsdb deleted file mode 100644 index aa25c7b..0000000 --- a/debian/watch.xcmsdb +++ /dev/null @@ -1,2 +0,0 @@ -version=3 -http://xorg.freedesktop.org/releases/individual/app/ xcmsdb-(.*)\.tar\.gz diff --git a/debian/watch.xgamma b/debian/watch.xgamma deleted file mode 100644 index 73377d0..0000000 --- a/debian/watch.xgamma +++ /dev/null @@ -1,2 +0,0 @@ -version=3 -http://xorg.freedesktop.org/releases/individual/app/ xgamma-(.*)\.tar\.gz diff --git a/debian/watch.xhost b/debian/watch.xhost deleted file mode 100644 index 5d54d6b..0000000 --- a/debian/watch.xhost +++ /dev/null @@ -1,2 +0,0 @@ -version=3 -http://xorg.freedesktop.org/releases/individual/app/ xhost-(.*)\.tar\.gz diff --git a/debian/watch.xmodmap b/debian/watch.xmodmap deleted file mode 100644 index 8ecb2a7..0000000 --- a/debian/watch.xmodmap +++ /dev/null @@ -1,2 +0,0 @@ -version=3 -http://xorg.freedesktop.org/releases/individual/app/ xmodmap-(.*)\.tar\.gz diff --git a/debian/watch.xrandr b/debian/watch.xrandr deleted file mode 100644 index 00c7bf8..0000000 --- a/debian/watch.xrandr +++ /dev/null @@ -1,2 +0,0 @@ -version=3 -http://xorg.freedesktop.org/releases/individual/app/ xrandr-(.*)\.tar\.gz diff --git a/debian/watch.xrdb b/debian/watch.xrdb deleted file mode 100644 index 1a6c16c..0000000 --- a/debian/watch.xrdb +++ /dev/null @@ -1,2 +0,0 @@ -version=3 -http://xorg.freedesktop.org/releases/individual/app/ xrdb-(.*)\.tar\.gz diff --git a/debian/watch.xrefresh b/debian/watch.xrefresh deleted file mode 100644 index df63dfd..0000000 --- a/debian/watch.xrefresh +++ /dev/null @@ -1,2 +0,0 @@ -version=3 -http://xorg.freedesktop.org/releases/individual/app/ xrefresh-(.*)\.tar\.gz diff --git a/debian/watch.xset b/debian/watch.xset deleted file mode 100644 index d77e228..0000000 --- a/debian/watch.xset +++ /dev/null @@ -1,2 +0,0 @@ -version=3 -http://xorg.freedesktop.org/releases/individual/app/ xset-(.*)\.tar\.gz diff --git a/debian/watch.xsetmode b/debian/watch.xsetmode deleted file mode 100644 index 3462413..0000000 --- a/debian/watch.xsetmode +++ /dev/null @@ -1,2 +0,0 @@ -version=3 -http://xorg.freedesktop.org/releases/individual/app/ xsetmode-(.*)\.tar\.gz diff --git a/debian/watch.xsetpointer b/debian/watch.xsetpointer deleted file mode 100644 index 1657b20..0000000 --- a/debian/watch.xsetpointer +++ /dev/null @@ -1,2 +0,0 @@ -version=3 -http://xorg.freedesktop.org/releases/individual/app/ xsetpointer-(.*)\.tar\.gz diff --git a/debian/watch.xsetroot b/debian/watch.xsetroot deleted file mode 100644 index 71e6ff5..0000000 --- a/debian/watch.xsetroot +++ /dev/null @@ -1,2 +0,0 @@ -version=3 -http://xorg.freedesktop.org/releases/individual/app/ xsetroot-(.*)\.tar\.gz diff --git a/debian/watch.xstdcmap b/debian/watch.xstdcmap deleted file mode 100644 index c5b6a2a..0000000 --- a/debian/watch.xstdcmap +++ /dev/null @@ -1,2 +0,0 @@ -version=3 -http://xorg.freedesktop.org/releases/individual/app/ xstdcmap-(.*)\.tar\.gz diff --git a/debian/watch.xvidtune b/debian/watch.xvidtune deleted file mode 100644 index 5775c25..0000000 --- a/debian/watch.xvidtune +++ /dev/null @@ -1,2 +0,0 @@ -version=3 -http://xorg.freedesktop.org/releases/individual/app/ xvidtune-(.*)\.tar\.gz diff --git a/debian/x11-xserver-utils.install b/debian/x11-xserver-utils.install deleted file mode 100644 index ae49884..0000000 --- a/debian/x11-xserver-utils.install +++ /dev/null @@ -1,3 +0,0 @@ -usr/bin/* -usr/share/man/man1/* -etc/X11/app-defaults/* diff --git a/debian/x11-xserver-utils.menu b/debian/x11-xserver-utils.menu deleted file mode 100644 index aae235e..0000000 --- a/debian/x11-xserver-utils.menu +++ /dev/null @@ -1,13 +0,0 @@ -?package(x11-xserver-utils):\ - needs="x11"\ - section="Applications/System/Administration"\ - longtitle="Xrefresh: redraw X screen"\ - title="Xrefresh"\ - command="xrefresh" -?package(x11-xserver-utils):\ - needs="x11"\ - section="Applications/System/Hardware"\ - hints="Config"\ - longtitle="Xvidtune: tool for customizing X server modelines"\ - title="Xvidtune"\ - command="xvidtune" 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 3c59c20..0000000 --- a/debian/xsfbs/xsfbs.mk +++ /dev/null @@ -1,285 +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 <http://www.gnu.org/copyleft/gpl.txt>. - -# Originally by Stephen Early <sde1000@debian.org> -# Modified by Mark W. Eichin <eichin@kitten.gen.ma.us> -# Modified by Adam Heath <doogie@debian.org> -# Modified by Branden Robinson <branden@debian.org> -# Modified by Fabio Massimo Di Nitto <fabbione@fabbione.net> -# Modified by David Nusinow <dnusinow@debian.org> -# 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)/logdir $(STAMP_DIR)/genscripts - >$@ - -.PHONY: logdir -stampdir_targets+=logdir -logdir: $(STAMP_DIR)/logdir -$(STAMP_DIR)/logdir: $(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)/logdir - 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) - dh_clean - -# 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)/' \ - <$$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 - >$@ - -# Compute dependencies for drivers -# -VIDEODEP = $(shell cat /usr/share/xserver-xorg/videodrvdep 2>/dev/null) -INPUTDEP = $(shell cat /usr/share/xserver-xorg/xinputdep 2>/dev/null) - -# these two can be removed post-squeeze -VIDEOABI = $(shell cat /usr/share/xserver-xorg/videoabiver 2>/dev/null) -INPUTABI = $(shell cat /usr/share/xserver-xorg/inputabiver 2>/dev/null) -VIDDRIVER_PROVIDES = xserver-xorg-video-$(VIDEOABI), xorg-driver-video -INPDRIVER_PROVIDES = xserver-xorg-input-$(INPUTABI), xorg-driver-input - -ifeq ($(PACKAGE),) -PACKAGE=$(shell awk '/^Package:/ { print $$2; exit }' < debian/control) -endif - -.PHONY: serverabi -serverabi: install -ifeq ($(VIDEODEP),) - @echo 'error: xserver-xorg-dev >= 1.7.6.901 needs to be installed' - @exit 1 -else - echo "xviddriver:Depends=$(VIDEODEP)" >> debian/$(PACKAGE).substvars - echo "xinpdriver:Depends=$(INPUTDEP)" >> debian/$(PACKAGE).substvars - # the following is there for compatibility... - echo "xviddriver:Provides=$(VIDDRIVER_PROVIDES)" >> debian/$(PACKAGE).substvars - echo "xinpdriver:Provides=$(INPDRIVER_PROVIDES)" >> debian/$(PACKAGE).substvars - echo "xserver:Depends=$(VIDEODEP), $(INPUTDEP)" >> 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 813fd8d..0000000 --- a/debian/xsfbs/xsfbs.sh +++ /dev/null @@ -1,622 +0,0 @@ -# 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 <<EOF -Error: package maintainer script attempted to use shell library without -definining \$THIS_PACKAGE shell variable. Please report the package name, -version, and the text of this error message to the Debian Bug Tracking System. -Visit <http://www.debian.org/Bugs/Reporting> 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 <<EOF -Error: package maintainer script attempted to use shell library without -definining \$THIS_SCRIPT shell variable. Please report the package name, -version, and the text of this error message to the Debian Bug Tracking System. -Visit <http://www.debian.org/Bugs/Reporting> 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_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 " \ - "<http://www.debian.org/Bugs/Reporting> 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 " \ - "<http://www.debian.org/Bugs/Reporting> 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 -} - -font_update () { - # run $UPDATECMDS in $FONTDIRS - - local dir cmd shortcmd x_font_dir_prefix - - x_font_dir_prefix="/usr/share/fonts/X11" - - if [ -z "$UPDATECMDS" ]; then - usage_error "font_update() called but \$UPDATECMDS not set" - fi - if [ -z "$FONTDIRS" ]; then - usage_error "font_update() called but \$FONTDIRS not set" - fi - - reject_unlikely_path_chars "$UPDATECMDS" - reject_unlikely_path_chars "$FONTDIRS" - - for dir in $FONTDIRS; do - if [ -d "$x_font_dir_prefix/$dir" ]; then - for cmd in $UPDATECMDS; do - if which "$cmd" > /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/iceauth/Makefile.am b/iceauth/Makefile.am index c2f068e..e70db64 100644..100755 --- a/iceauth/Makefile.am +++ b/iceauth/Makefile.am @@ -22,7 +22,8 @@ SUBDIRS = man bin_PROGRAMS = iceauth -AM_CFLAGS = $(CWARNFLAGS) $(ICEAUTH_CFLAGS) +AM_CFLAGS = $(CWARNFLAGS) $(ICEAUTH_CFLAGS) -fPIE +AM_LDFLAGS = $(ICEAUTH_LDFLAGS) -pie iceauth_LDADD = $(ICEAUTH_LIBS) iceauth_SOURCES = \ diff --git a/packaging/xmodmap.service b/packaging/xmodmap.service new file mode 100644 index 0000000..70120ec --- /dev/null +++ b/packaging/xmodmap.service @@ -0,0 +1,13 @@ +[Unit] +Description=Load X keyboard modifier maps +ConditionPathExists=/etc/X11/Xmodmap +After=xorg.target +Requires=xorg.target +Before=e17_early.service + +[Service] +Type=oneshot +ExecStart=/usr/bin/xmodmap /etc/X11/Xmodmap + +[Install] +WantedBy=core-efl.target diff --git a/packaging/xorg-x11-server-utils.spec b/packaging/xorg-x11-server-utils.spec index e7b2829..6eedac7 100644..100755 --- a/packaging/xorg-x11-server-utils.spec +++ b/packaging/xorg-x11-server-utils.spec @@ -1,4 +1,4 @@ -%define _unpackaged_files_terminate_build 0 +%define _unpackaged_files_terminate_build 0 %define pkgname server-utils # doesn't work yet, needs more nickle bindings @@ -6,12 +6,15 @@ Summary: X.Org X11 X server utilities Name: xorg-x11-server-utils -Version: 7.5 +Version: 7.5.1 Release: 12 License: MIT Group: User Interface/X URL: http://www.x.org -Source: %{name}-%{version}.tar.gz +Source0: %{name}-%{version}.tar.gz +Source2: xrdb.service +Source3: xset-autorepeat-lb.service +Source4: xset-autorepeat-i386.service # NOTE: Each upstream tarball has its own "PatchN" section, taken from # multiplying the "SourceN" line times 100. Please keep them in this @@ -19,13 +22,13 @@ Source: %{name}-%{version}.tar.gz # so that they don't have to be split in half when submitting upstream. # # iceauth section -#Patch0: +#Patch0: BuildRequires: xorg-x11-xutils-dev #BuildRequires: pkgconfig(xorg-macros) BuildRequires: pkgconfig(xmu) pkgconfig(xext) pkgconfig(xrandr) BuildRequires: pkgconfig(xxf86vm) pkgconfig(xrender) pkgconfig(xi) -BuildRequires: pkgconfig(xt) pkgconfig(xpm) +BuildRequires: pkgconfig(xt) # xsetroot requires xbitmaps-devel (which was renamed now) BuildRequires: xorg-x11-xbitmaps # xsetroot @@ -39,8 +42,9 @@ BuildRequires: libXinerama-devel # a) universally useful and b) don't require Xaw #Conflicts: xorg-x11-apps < 7.6-4 -%define DEF_SUBDIRS iceauth rgb sessreg xgamma xhost xkill xmodmap xrandr xrdb xrefresh xset xsetmode xsetpointer xsetroot xstdcmap +%define DEF_SUBDIRS xkill xrandr xrdb xset Provides: %{DEF_SUBDIRS} +Provides: x11-xserver-utils = %{version} %description A collection of utilities used to tweak and query the runtime configuration @@ -56,25 +60,49 @@ Requires: nickle Utility to perform keystone adjustments on X screens. %endif +%package lb +Summary: Device-specific files for Lunchbox +Group: User Interface/X +Requires: %{name} = %{version} +Provides: x11-xserver-utils-lb = %{version} + +%description lb +This package provides files for the X server utilities package that are +specific to Lunchbox devices. + +%package i386 +Summary: Device-specific files for i386 +Group: User Interface/X +Requires: %{name} = %{version} +Provides: x11-xserver-utils-i386 = %{version} + +%description i386 +This package provides files for the X server utilities package that are +specific to i386/emulator devices. + + %prep %setup -q %build # Build all apps +export CFLAGS+=" -D_GNU_SOURCE" { for app in %{DEF_SUBDIRS}; do pushd $app - %configure \ + %reconfigure \ --disable-xprint \ RSH=rsh \ MANCONF="/etc/manpath.config" - make + make popd 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 %{DEF_SUBDIRS} ; do @@ -84,49 +112,41 @@ rm -rf $RPM_BUILD_ROOT done } +mkdir -p %{buildroot}%{_libdir}/systemd/user/core-efl.target.wants +install -m 0644 %SOURCE2 %{buildroot}%{_libdir}/systemd/user/ +install -m 0644 %SOURCE3 %{buildroot}%{_libdir}/systemd/user/ +install -m 0644 %SOURCE4 %{buildroot}%{_libdir}/systemd/user/ +ln -s ../xrdb.service %{buildroot}%{_libdir}/systemd/user/core-efl.target.wants/xrdb.service +ln -s ../xset-autorepeat-lb.service %{buildroot}%{_libdir}/systemd/user/core-efl.target.wants/xset-autorepeat-lb.service +ln -s ../xset-autorepeat-i386.service %{buildroot}%{_libdir}/systemd/user/core-efl.target.wants/xset-autorepeat-i386.service + %remove_docs %clean rm -rf $RPM_BUILD_ROOT %files +%manifest xorg-x11-server-utils.manifest %defattr(-,root,root,-) +/usr/share/license/%{name} %doc -%{_bindir}/iceauth -%{_bindir}/sessreg -%{_bindir}/showrgb -%{_bindir}/xgamma -%{_bindir}/xhost %{_bindir}/xkill -%{_bindir}/xmodmap %{_bindir}/xrandr %{_bindir}/xrdb -%{_bindir}/xrefresh %{_bindir}/xset -%{_bindir}/xsetmode -%{_bindir}/xsetpointer -%{_bindir}/xsetroot -%{_bindir}/xstdcmap -%{_datadir}/X11/rgb.txt -#%{_mandir}/man1/iceauth.1* -#%{_mandir}/man1/sessreg.1* -#%{_mandir}/man1/showrgb.1* -#%{_mandir}/man1/xgamma.1* -#%{_mandir}/man1/xhost.1* -#%{_mandir}/man1/xinput.1* -#%{_mandir}/man1/xkill.1* -#%{_mandir}/man1/xmodmap.1* -#%{_mandir}/man1/xrandr.1* -#%{_mandir}/man1/xrdb.1* -#%{_mandir}/man1/xrefresh.1* -#%{_mandir}/man1/xset.1* -#%{_mandir}/man1/xsetmode.1* -#%{_mandir}/man1/xsetpointer.1* -#%{_mandir}/man1/xsetroot.1* -#%{_mandir}/man1/xstdcmap.1* +%{_libdir}/systemd/user/xrdb.service +%{_libdir}/systemd/user/core-efl.target.wants/xrdb.service %if %{with_xkeystone} %files -n xkeystone %defattr(-,root,root,-) %{_bindir}/xkeystone %endif + +%files lb +%{_libdir}/systemd/user/xset-autorepeat-lb.service +%{_libdir}/systemd/user/core-efl.target.wants/xset-autorepeat-lb.service + +%files i386 +%{_libdir}/systemd/user/xset-autorepeat-i386.service +%{_libdir}/systemd/user/core-efl.target.wants/xset-autorepeat-i386.service diff --git a/packaging/xrdb.service b/packaging/xrdb.service new file mode 100644 index 0000000..c6692fd --- /dev/null +++ b/packaging/xrdb.service @@ -0,0 +1,13 @@ +[Unit] +Description=Load X Resource database +ConditionPathExists=/etc/X11/Xresources +After=xorg.target +Requires=xorg.target +Before=e17_early.service + +[Service] +Type=oneshot +ExecStart=/usr/bin/xrdb -load -nocpp /etc/X11/Xresources + +[Install] +WantedBy=core-efl.target diff --git a/packaging/xset-autorepeat-i386.service b/packaging/xset-autorepeat-i386.service new file mode 100644 index 0000000..4805dcb --- /dev/null +++ b/packaging/xset-autorepeat-i386.service @@ -0,0 +1,17 @@ +[Unit] +Description=Turn off AutoRepeat for specific device keys +After=xorg.target +Requires=xorg.target +Before=e17.service + +[Service] +Type=oneshot +# Keycodes: +# 122 = XF86AudioLowerVolume +# 123 = XF86AudioRaiseVolume +# 124 = XF86PowerOff +# 147 = XF86Phone +ExecStart=/usr/bin/xset -r 123 -r 122 -r 231 -r 177 -r 147 -r 166 -r 225 -r 124 -r 179 -r 220 -r 208 -r 209 -r 174 -r 171 -r 173 -r 176 -r 216 -r 234 + +[Install] +WantedBy=core-efl.target diff --git a/packaging/xset-autorepeat-lb.service b/packaging/xset-autorepeat-lb.service new file mode 100644 index 0000000..4805dcb --- /dev/null +++ b/packaging/xset-autorepeat-lb.service @@ -0,0 +1,17 @@ +[Unit] +Description=Turn off AutoRepeat for specific device keys +After=xorg.target +Requires=xorg.target +Before=e17.service + +[Service] +Type=oneshot +# Keycodes: +# 122 = XF86AudioLowerVolume +# 123 = XF86AudioRaiseVolume +# 124 = XF86PowerOff +# 147 = XF86Phone +ExecStart=/usr/bin/xset -r 123 -r 122 -r 231 -r 177 -r 147 -r 166 -r 225 -r 124 -r 179 -r 220 -r 208 -r 209 -r 174 -r 171 -r 173 -r 176 -r 216 -r 234 + +[Install] +WantedBy=core-efl.target diff --git a/rgb/Makefile.am b/rgb/Makefile.am index 938678b..fcfd272 100644 --- a/rgb/Makefile.am +++ b/rgb/Makefile.am @@ -38,7 +38,8 @@ endif rgbdir = $(db_dir) rgb_DATA = $(db_file).txt $(RGB_DB_FILES) RGB_DB_DEFINES = -DRGB_DB=\"$(db_dir)/$(db_file)\" -AM_CFLAGS = $(RGB_CFLAGS) $(RGB_DB_DEFINES) $(CWARNFLAGS) +AM_CFLAGS = $(RGB_CFLAGS) $(RGB_DB_DEFINES) $(CWARNFLAGS) -fPIE +AM_LDFLAGS = $(RGB_LDFLAGS) -pie EXTRA_DIST= \ rgb.txt \ diff --git a/sessreg/Makefile.am b/sessreg/Makefile.am index cddffd0..5545f31 100644..100755 --- a/sessreg/Makefile.am +++ b/sessreg/Makefile.am @@ -21,7 +21,8 @@ SUBDIRS = man bin_PROGRAMS = sessreg -AM_CFLAGS = $(CWARNFLAGS) $(SESSREG_CFLAGS) +AM_CFLAGS = $(CWARNFLAGS) $(SESSREG_CFLAGS) -fPIE +AM_LDFLAGS = $(SESSREG_LDFLAGS) -pie sessreg_SOURCES = \ sessreg.h \ diff --git a/xgamma/Makefile.am b/xgamma/Makefile.am index d0a11d5..4be8e54 100644..100755 --- a/xgamma/Makefile.am +++ b/xgamma/Makefile.am @@ -22,7 +22,8 @@ SUBDIRS = man bin_PROGRAMS = xgamma -AM_CFLAGS = $(CWARNFLAGS) $(XGAMMA_CFLAGS) +AM_CFLAGS = $(CWARNFLAGS) $(XGAMMA_CFLAGS) -fPIE +AM_LDFLAGS = $(XGAMMA_LDFLAGS) -pie xgamma_LDADD = $(XGAMMA_LIBS) xgamma_SOURCES = \ diff --git a/xhost/Makefile.am b/xhost/Makefile.am index fbbc0f1..74c714d 100644 --- a/xhost/Makefile.am +++ b/xhost/Makefile.am @@ -3,7 +3,8 @@ bin_PROGRAMS = xhost xhost_SOURCES = xhost.c -AM_CFLAGS = $(CWARNFLAGS) $(XHOST_CFLAGS) $(XAU_CFLAGS) +AM_CFLAGS = $(CWARNFLAGS) $(XHOST_CFLAGS) $(XAU_CFLAGS) -fPIE +AM_LDFLAGS = $(XAU_LDFLAGS) -pie xhost_LDADD = $(XHOST_LIBS) MAINTAINERCLEANFILES = ChangeLog INSTALL diff --git a/xinput/src/Makefile.am b/xinput/src/Makefile.am index 985207b..8427ab2 100644 --- a/xinput/src/Makefile.am +++ b/xinput/src/Makefile.am @@ -22,7 +22,8 @@ bin_PROGRAMS = xinput -AM_CFLAGS = $(XINPUT_CFLAGS) +AM_CFLAGS = $(XINPUT_CFLAGS) -fPIE +AM_LDFLAGS = $(XINPUT_LDFLAGS) -pie xinput_LDADD = $(XINPUT_LIBS) diff --git a/xkill/Makefile.am b/xkill/Makefile.am index 11b412d..31ce717 100644..100755 --- a/xkill/Makefile.am +++ b/xkill/Makefile.am @@ -21,7 +21,8 @@ bin_PROGRAMS = xkill -AM_CFLAGS = $(CWARNFLAGS) $(XKILL_CFLAGS) +AM_CFLAGS = $(CWARNFLAGS) $(XKILL_CFLAGS) -fPIE +AM_LDFLAGS = $(XKILL_LDFLAGS) -pie xkill_LDADD = $(XKILL_LIBS) xkill_SOURCES = \ diff --git a/xmodmap/Makefile.am b/xmodmap/Makefile.am index 527ee27..71ea9c0 100644..100755 --- a/xmodmap/Makefile.am +++ b/xmodmap/Makefile.am @@ -22,7 +22,8 @@ SUBDIRS=man bin_PROGRAMS = xmodmap -AM_CFLAGS = $(CWARNFLAGS) $(XMODMAP_CFLAGS) +AM_CFLAGS = $(CWARNFLAGS) $(XMODMAP_CFLAGS) -fPIE +AM_LDFLAGS = $(XMODMAP_LDFLAGS) -pie xmodmap_LDADD = $(XMODMAP_LIBS) xmodmap_SOURCES = \ diff --git a/xorg-x11-server-utils.manifest b/xorg-x11-server-utils.manifest new file mode 100644 index 0000000..7f541e8 --- /dev/null +++ b/xorg-x11-server-utils.manifest @@ -0,0 +1,9 @@ +<manifest> + <request> + <domain name="_"/> + </request> + <assign> + <filesystem path="/usr/bin/*" label="_" exec_label="none" /> + </assign> +</manifest> + diff --git a/xrandr/Makefile.am b/xrandr/Makefile.am index 4f1c5e7..b0ee7c8 100644..100755 --- a/xrandr/Makefile.am +++ b/xrandr/Makefile.am @@ -31,7 +31,8 @@ xkeystone: keystone.5c clean-local: rm -f xkeystone -AM_CFLAGS = $(XRANDR_CFLAGS) $(CWARNFLAGS) +AM_CFLAGS = $(XRANDR_CFLAGS) $(CWARNFLAGS) -fPIE +AM_LDFLAGS = $(XRANDR_LDFLAGS) -pie xrandr_LDADD = $(XRANDR_LIBS) xrandr_SOURCES = \ diff --git a/xrdb/Makefile.am b/xrdb/Makefile.am index 251261b..eb86884 100644..100755 --- a/xrdb/Makefile.am +++ b/xrdb/Makefile.am @@ -22,7 +22,8 @@ SUBDIRS = man bin_PROGRAMS = xrdb -AM_CFLAGS = $(CWARNFLAGS) $(XRDB_CFLAGS) +AM_CFLAGS = $(CWARNFLAGS) $(XRDB_CFLAGS) -fPIE +AM_LDFLAGS = $(XRDB_LDFLAGS) -pie xrdb_LDADD = $(XRDB_LIBS) xrdb_SOURCES = \ diff --git a/xrefresh/Makefile.am b/xrefresh/Makefile.am index 536da40..270b900 100644..100755 --- a/xrefresh/Makefile.am +++ b/xrefresh/Makefile.am @@ -21,7 +21,8 @@ bin_PROGRAMS = xrefresh -AM_CFLAGS = $(CWARNFLAGS) $(XREFRESH_CFLAGS) +AM_CFLAGS = $(CWARNFLAGS) $(XREFRESH_CFLAGS) -fPIE +AM_LDFLAGS = $(XREFRESH_LDFLAGS) -pie xrefresh_LDADD = $(XREFRESH_LIBS) xrefresh_SOURCES = \ diff --git a/xset/Makefile.am b/xset/Makefile.am index 613e980..458512e 100644..100755 --- a/xset/Makefile.am +++ b/xset/Makefile.am @@ -22,7 +22,8 @@ SUBDIRS = man bin_PROGRAMS = xset -AM_CFLAGS = $(XSET_CFLAGS) -D_BSD_SOURCE $(CWARNFLAGS) +AM_CFLAGS = $(XSET_CFLAGS) -D_BSD_SOURCE $(CWARNFLAGS) -fPIE +AM_LDFLAGS = $(XSET_LDFLAGS) -pie xset_LDADD = $(XSET_LIBS) xset_SOURCES = \ diff --git a/xsetmode/Makefile.am b/xsetmode/Makefile.am index 59000ec..10a1bab 100644..100755 --- a/xsetmode/Makefile.am +++ b/xsetmode/Makefile.am @@ -21,7 +21,8 @@ bin_PROGRAMS = xsetmode -xsetmode_CFLAGS = $(XSETMODE_CFLAGS) +xsetmode_CFLAGS = $(XSETMODE_CFLAGS) -fPIE +xsetmode_LDFLAGS = $(XSETMODE_LDFLAGS) -pie xsetmode_LDADD = $(XSETMODE_LIBS) xsetmode_SOURCES = \ diff --git a/xsetpointer/Makefile.am b/xsetpointer/Makefile.am index 24a33f8..aed962d 100644..100755 --- a/xsetpointer/Makefile.am +++ b/xsetpointer/Makefile.am @@ -21,7 +21,8 @@ bin_PROGRAMS = xsetpointer -xsetpointer_CFLAGS = $(XSETPOINTER_CFLAGS) +xsetpointer_CFLAGS = $(XSETPOINTER_CFLAGS) -fPIE +xsetpointer_LDFLAGS = $(XSETPOINTER_LDFLAGS) -pie xsetpointer_LDADD = $(XSETPOINTER_LIBS) xsetpointer_SOURCES = \ diff --git a/xsetroot/Makefile.am b/xsetroot/Makefile.am index 480c981..c192d24 100644..100755 --- a/xsetroot/Makefile.am +++ b/xsetroot/Makefile.am @@ -21,7 +21,8 @@ bin_PROGRAMS = xsetroot -AM_CFLAGS = $(CWARNFLAGS) $(XSETROOT_CFLAGS) +AM_CFLAGS = $(CWARNFLAGS) $(XSETROOT_CFLAGS) -fPIE +AM_LDFLAGS = $(XSETROOT_LDFLAGS) -pie xsetroot_LDADD = $(XSETROOT_LIBS) xsetroot_SOURCES = \ @@ -35,7 +36,7 @@ appmandir = $(APP_MAN_DIR) appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@) -EXTRA_DIST = $(appman_PRE) +EXTRA_DIST = $(appman_PRE) MAINTAINERCLEANFILES = ChangeLog INSTALL CLEANFILES = $(appman_DATA) diff --git a/xstdcmap/Makefile.am b/xstdcmap/Makefile.am index 7aaec10..16fa9ef 100644..100755 --- a/xstdcmap/Makefile.am +++ b/xstdcmap/Makefile.am @@ -21,7 +21,8 @@ bin_PROGRAMS = xstdcmap -AM_CFLAGS = $(XSTDCMAP_CFLAGS) -D_BSD_SOURCE $(CWARNFLAGS) +AM_CFLAGS = $(XSTDCMAP_CFLAGS) -D_BSD_SOURCE $(CWARNFLAGS) -pie +AM_LDFLAGS = $(XSTDCMAP_LDFLAGS) -pie xstdcmap_LDADD = $(XSTDCMAP_LIBS) xstdcmap_SOURCES = \ |