From 5d7df437baeb3638bc329f2f67556bb8c3da8910 Mon Sep 17 00:00:00 2001 From: "jk7744.park" Date: Tue, 8 Sep 2015 23:02:19 +0900 Subject: [PATCH] tizen 2.3.1 release --- COPYING | 297 ++++++++++++++++++++ debian/README.source | 73 ----- debian/changelog | 492 --------------------------------- debian/compat | 1 - debian/control | 68 ----- debian/copyright | 446 ------------------------------ debian/patches/series | 0 debian/rules | 110 -------- debian/watch.appres | 2 - debian/watch.editres | 2 - debian/watch.listres | 2 - debian/watch.luit | 2 - debian/watch.viewres | 2 - debian/watch.xdpyinfo | 2 - debian/watch.xdriinfo | 2 - debian/watch.xev | 2 - debian/watch.xfd | 2 - debian/watch.xfontsel | 2 - debian/watch.xkill | 2 - debian/watch.xlsatoms | 2 - debian/watch.xlsclients | 2 - debian/watch.xlsfonts | 2 - debian/watch.xmessage | 2 - debian/watch.xprop | 2 - debian/watch.xvinfo | 2 - debian/watch.xwininfo | 2 - debian/x11-utils.install | 3 - debian/x11-utils.menu | 25 -- debian/xsfbs/repack.sh | 32 --- debian/xsfbs/xsfbs.mk | 276 ------------------- debian/xsfbs/xsfbs.sh | 622 ------------------------------------------ packaging/xorg-x11-utils.spec | 14 +- xdpyinfo/Makefile.am | 6 +- xev/Makefile.am | 3 +- xlsatoms/Makefile.am | 3 +- xlsclients/Makefile.am | 3 +- xlsfonts/Makefile.am | 3 +- xorg-x11-utils.manifest | 8 + xprop/Makefile.am | 3 +- xvinfo/Makefile.am | 5 +- xwininfo/Makefile.am | 3 +- 41 files changed, 334 insertions(+), 2198 deletions(-) create mode 100644 COPYING delete mode 100644 debian/README.source delete mode 100755 debian/changelog delete mode 100644 debian/compat delete mode 100755 debian/control delete mode 100644 debian/copyright delete mode 100644 debian/patches/series delete mode 100755 debian/rules delete mode 100644 debian/watch.appres delete mode 100644 debian/watch.editres delete mode 100644 debian/watch.listres delete mode 100644 debian/watch.luit delete mode 100644 debian/watch.viewres delete mode 100644 debian/watch.xdpyinfo delete mode 100644 debian/watch.xdriinfo delete mode 100644 debian/watch.xev delete mode 100644 debian/watch.xfd delete mode 100644 debian/watch.xfontsel delete mode 100644 debian/watch.xkill delete mode 100644 debian/watch.xlsatoms delete mode 100644 debian/watch.xlsclients delete mode 100644 debian/watch.xlsfonts delete mode 100644 debian/watch.xmessage delete mode 100644 debian/watch.xprop delete mode 100644 debian/watch.xvinfo delete mode 100644 debian/watch.xwininfo delete mode 100644 debian/x11-utils.install delete mode 100644 debian/x11-utils.menu delete mode 100755 debian/xsfbs/repack.sh delete mode 100755 debian/xsfbs/xsfbs.mk delete mode 100644 debian/xsfbs/xsfbs.sh mode change 100644 => 100755 xdpyinfo/Makefile.am mode change 100644 => 100755 xev/Makefile.am mode change 100644 => 100755 xlsatoms/Makefile.am mode change 100644 => 100755 xlsclients/Makefile.am mode change 100644 => 100755 xlsfonts/Makefile.am create mode 100644 xorg-x11-utils.manifest mode change 100644 => 100755 xprop/Makefile.am mode change 100644 => 100755 xvinfo/Makefile.am mode change 100644 => 100755 xwininfo/Makefile.am diff --git a/COPYING b/COPYING new file mode 100644 index 0000000..d598caa --- /dev/null +++ b/COPYING @@ -0,0 +1,297 @@ +[x11-utils/edid-decode] +Copyright (c) 2011 Samsung Electronics Co., Ltd 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-utils/xev] +Copyright (c) 1988 X Consortium + +Permission is hereby granted, free of charge, to any person obtaining +a copy of this software and associated documentation files (the +"Software"), to deal in the Software without restriction, including +without limitation the rights to use, copy, modify, merge, publish, +distribute, sublicense, and/or sell copies of the Software, and to +permit persons to whom the Software is furnished to do so, subject to +the following conditions: + +The above copyright notice and this permission notice shall be included +in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +IN NO EVENT SHALL THE X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR +OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, +ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +OTHER DEALINGS IN THE SOFTWARE. + +Except as contained in this notice, the name of the X Consortium shall +not be used in advertising or otherwise to promote the sale, use or +other dealings in this Software without prior written authorization +from the X Consortium. + +[x11-utils/xprop] +Copyright 1990, 1998 The Open Group +Copyright (c) 2000 The XFree86 Project, Inc. + +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. + +The above copyright notice and this permission notice shall be included +in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR +OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, +ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +OTHER DEALINGS IN THE SOFTWARE. + +Except as contained in this notice, the name of The Open Group shall +not be used in advertising or otherwise to promote the sale, use or +other dealings in this Software without prior written authorization +from The Open Group. + +Copyright 2007 Kim woelders + +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that copyright +notice and this permission notice appear in supporting documentation, and +that the name of the copyright holders not be used in advertising or +publicity pertaining to distribution of the software without specific, +written prior permission. The copyright holders make no representations +about the suitability of this software for any purpose. It is provided "as +is" without express or implied warranty. + +THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO +EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR +CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, +DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER +TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE +OF THIS SOFTWARE. + +[x11-utils/xlsfonts] +This is a stub file. This package has not yet had its complete licensing +information compiled. Please see the individual source files for details on +your rights to use and modify this software. + +Please submit updated COPYING files to the Xorg bugzilla: + +https://bugs.freedesktop.org/enter_bug.cgi?product=xorg + +All licensing questions regarding this software should be directed at the +Xorg mailing list: + +http://lists.freedesktop.org/mailman/listinfo/xorg + +[x11-utils/xdpyinfo] +Copyright 1988, 1998 The Open Group +Copyright 2005 Hitachi, Ltd. + +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. + +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-utils/xvinfo] +XFree86 code without an explicit copyright is covered by the following copy- +right/license: + +Copyright (C) 1994-2003 The XFree86 Project, Inc. All Rights Reserved. + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is fur- +nished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FIT- +NESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +XFREE86 PROJECT BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER +IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CON- +NECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +Except as contained in this notice, the name of the XFree86 Project shall not +be used in advertising or otherwise to promote the sale, use or other deal- +ings in this Software without prior written authorization from the XFree86 +Project. + +[x11-utils/xlsatoms] +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-utils/xlsclients] +Copyright 1989, 1991, 1994, 1998 The Open Group +Copyright 2009 Open Text 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. + +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) 2009 Apple Inc. + +Permission is hereby granted, free of charge, to any person obtaining a +copy of this software and associated documentation files (the "Software"), +to deal in the Software without restriction, including without limitation +the rights to use, copy, modify, merge, publish, distribute, sublicense, +and/or sell copies of the Software, and to permit persons to whom the +Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +THE ABOVE LISTED COPYRIGHT HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR +OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, +ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +DEALINGS IN THE SOFTWARE. + +[x11-utils/xwininfo] +Copyright (c) 1999, 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 1987, 1993, 1998 The Open Group + +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. + +The above copyright notice and this permission notice shall be included +in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT +OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR +HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL +INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING +FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, +NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION +WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + +Except as contained in this notice, the name of a copyright holder +shall not be used in advertising or otherwise to promote the sale, use +or other dealings in this Software without prior written authorization +of the copyright holder. + +Copyright 2007 Kim woelders + +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that copyright +notice and this permission notice appear in supporting documentation, and +that the name of the copyright holders not be used in advertising or +publicity pertaining to distribution of the software without specific, +written prior permission. The copyright holders make no representations +about the suitability of this software for any purpose. It is provided "as +is" without express or implied warranty. + +THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO +EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR +CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, +DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER +TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE +OF THIS SOFTWARE. + diff --git a/debian/README.source b/debian/README.source deleted file mode 100644 index 34ab4bf..0000000 --- a/debian/README.source +++ /dev/null @@ -1,73 +0,0 @@ ------------------------------------------------------- -Quick Guide To Patching This Package For The Impatient ------------------------------------------------------- - -1. Make sure you have quilt installed -2. Unpack the package as usual with "dpkg-source -x" -3. Run the "patch" target in debian/rules -4. Create a new patch with "quilt new" (see quilt(1)) -5. Edit all the files you want to include in the patch with "quilt edit" - (see quilt(1)). -6. Write the patch with "quilt refresh" (see quilt(1)) -7. Run the "clean" target in debian/rules - -Alternatively, instead of using quilt directly, you can drop the patch in to -debian/patches and add the name of the patch to debian/patches/series. - ------------------------------------- -Guide To The X Strike Force Packages ------------------------------------- - -The X Strike Force team maintains X packages in git repositories on -git.debian.org in the pkg-xorg subdirectory. Most upstream packages -are actually maintained in git repositories as well, so they often -just need to be pulled into git.debian.org in a "upstream-*" branch. -Otherwise, the upstream sources are manually installed in the Debian -git repository. - -The .orig.tar.gz upstream source file could be generated this -"upstream-*" branch in the Debian git repository but it is actually -copied from upstream tarballs directly. - -Due to X.org being highly modular, packaging all X.org applications -as their own independent packages would have created too many Debian -packages. For this reason, some X.org applications have been grouped -into larger packages: xutils, xutils-dev, x11-apps, x11-session-utils, -x11-utils, x11-xfs-utils, x11-xkb-utils, x11-xserver-utils. -Most packages, including the X.org server itself and all libraries -and drivers are, however maintained independently. - -The Debian packaging is added by creating the "debian-*" git branch -which contains the aforementioned "upstream-*" branch plus the debian/ -repository files. -When a patch has to be applied to the Debian package, two solutions -are involved: -* If the patch is available in one of the upstream branches, it - may be git'cherry-picked into the Debian repository. In this - case, it appears directly in the .diff.gz. -* Otherwise, the patch is added to debian/patches/ which is managed - with quilt as documented in /usr/share/doc/quilt/README.source. - -quilt is actually invoked by the Debian X packaging through a larger -set of scripts called XSFBS. XSFBS brings some other X specific -features such as managing dependencies and conflicts due to the video -and input driver ABIs. -XSFBS itself is maintained in a separate repository at - git://git.debian.org/pkg-xorg/xsfbs.git -and it is pulled inside the other Debian X repositories when needed. - -The XSFBS patching system requires a build dependency on quilt. Also -a dependency on $(STAMP_DIR)/patch has to be added to debian/rules -so that the XSFBS patching occurs before the actual build. So the -very first target of the build (likely the one running autoreconf) -should depend on $(STAMP_DIR)/patch. It should also not depend on -anything so that parallel builds are correctly supported (nothing -should probably run while patching is being done). And finally, the -clean target should depend on the xsfclean target so that patches -are unapplied on clean. - -When the upstream sources contain some DFSG-nonfree files, they are -listed in text files in debian/prune/ in the "debian-*" branch of -the Debian repository. XSFBS' scripts then take care of removing -these listed files during the build so as to generate a modified -DFSG-free .orig.tar.gz tarball. diff --git a/debian/changelog b/debian/changelog deleted file mode 100755 index 4fae551..0000000 --- a/debian/changelog +++ /dev/null @@ -1,492 +0,0 @@ -x11-utils (7.5+6slp2) unstable; urgency=low - - * [x11-utils] Fix viewres, xfontsel, xfd and xmessage for gcc 4.5 - * Git: 165.213.180.234:slp/pkgs/xorg/util/x11-utils - * Tag: x11-utils_7.5+6slp2 - - -- Sung-Jin Park Tue, 29 Mar 2011 15:21:49 +0900 - -x11-utils (7.5+5slp2) unstable; urgency=low - - * [X11R7.6] work for the x11-utils - * Git: 165.213.180.234:slp/pkgs/xorg/util/x11-utils - * Tag: x11-utils_7.5+5slp2 - - -- SooChan Lim Tue, 11 Jan 2011 17:02:09 +0900 - -x11-utils (7.5+4) unstable; urgency=low - - * xlsatoms 1.1.0: uses libxcb instead of Xlib for lower latency. - * xlsclients 1.1.0: same story. - * debian/rules get-tarballs: download to the current directory. - * Drop 02_xev_flush_standard_output.diff. This was included in xev 1.0.4. - * xlsfonts 1.0.3 - - Drop 04_xlsfonts_do_not_spew_usage_on_connection_error.diff, applied - upstream. - - -- Julien Cristau Sat, 12 Jun 2010 02:02:53 +0200 - -x11-utils (7.5+3) unstable; urgency=low - - [ Brice Goglin ] - * luit 1.0.5. - + check for POLLERR|POLLHUP in WaitForInput, closes: #560787. - - [ Julien Cristau ] - * Pull newer xsfbs, adding README.source. - * Move dh_makeshlibs before dh_installdeb (not that we're building a shared - library, but this makes lintian happier). - * debian/rules: add get-tarballs target. - * Add watch files. - * Bump Standards-Version to 3.8.4. - - -- Julien Cristau Sat, 13 Mar 2010 00:53:32 +0100 - -x11-utils (7.5+2) unstable; urgency=low - - [ Brice Goglin ] - * listres 1.0.2. - * viewres 1.0.2. - * xmessage 1.0.3. - - [ Julien Cristau ] - * Rename the build directory to not include DEB_BUILD_GNU_TYPE for no - good reason. Thanks, Colin Watson! - * Remove myself from Uploaders - - -- Brice Goglin Sun, 07 Feb 2010 11:36:54 +0100 - -x11-utils (7.5+1) unstable; urgency=low - - [ Julien Cristau ] - * Update config.{guess,sub} for xmessage, adding avr32 support (closes: - #537532). - - [ Brice Goglin ] - * appres 1.0.2. - * editres 1.0.4. - * luit 1.0.4. - * xdpyinfo 1.1.0. - * xdriinfo 1.0.3. - * xev 1.0.4. - * xkill 1.0.2. - * xlsatoms 1.0.2. - * xlsclients 1.0.2. - * xprop 1.1.0. - + Fix -spy to flush stdout, closes: #538714. - + Drop 05_xprop_spy_exit_on_destroy.diff, applied upstream. - * xvinfo 1.1.0. - * xwininfo 1.0.5. - * Refresh patches. - - -- Brice Goglin Sun, 06 Dec 2009 21:20:22 +0100 - -x11-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-utils - * Tag: x11-utils_7.4-3slp2 - - -- Sung-Jin Park Thu, 02 Dec 2010 11:08:15 +0900 - -x11-utils (7.4-2slp2) unstable; urgency=low - - * update maintainer - * Git: 165.213.180.234:/git/slp2.0/slp2.0-pkgs/X11 - * Tag: x11-utils_7.4-2slp2 - - -- Sung-Jin Park Wed, 21 Apr 2010 10:23:40 +0900 - -x11-utils (7.4-1slp2) unstable; urgency=low - - * Change revision - - -- Sung-Jin Park Thu, 25 Mar 2010 18:46:52 +0900 - -x11-utils (7.4+2) unstable; urgency=low - - * Import debian package - - -- Sung-Jin Park Tue, 08 Dec 2009 16:05:33 +0900 - -x11-utils (7.4+1) unstable; urgency=low - - [ Brice Goglin ] - * xwininfo 1.0.4. - - [ Julien Cristau ] - * Add support for parallel=n in DEB_BUILD_OPTIONS, and for actually building - the apps in parallel. Install is still sequential, at least for now. - * Make patch 04_xlsfonts_do_not_spew_usage_on_connection_error.diff apply - with -p1. Update its upstream status. - - -- Julien Cristau Mon, 16 Feb 2009 00:35:40 +0100 - -x11-utils (7.3+2+nmu1) unstable; urgency=low - - * Non-maintainer upload. - * Make xprop -spy exit cleanly when target window is destroyed - (closes: #508126) - - -- Ben Hutchings Sat, 03 Jan 2009 22:22:40 +0000 - -x11-utils (7.3+2) unstable; urgency=low - - * Relax Replaces on xutils and xbase-clients to allow further updates. - * luit 1.0.3 - + looks for locale.alias in the right place (closes: #443892) - * Add copyright/license info for luit to debian/copyright, taken from - upstream's COPYING file. - * Drop patch for #291137, which is included in luit 1.0.3. - * xev 1.0.3 - * Refresh patches. - * xprop 1.0.4 - * update debian/copyright for xprop - * xdpyinfo 1.0.3 - + xdpyinfo.man now references other x*info programs (closes: #350313). - * Drop `-1' debian revisions from build-dependencies. - * Bump Standards-Version to 3.7.3. - * Drop the XS- prefix from Vcs-* control fields. - - -- Julien Cristau Fri, 30 May 2008 16:21:20 +0200 - -x11-utils (7.3+1) unstable; urgency=low - - [ Julien Cristau ] - * xmessage 1.0.2. - + Untabify message before inserting it (closes: #46892). Thanks, Kevin - Ryde! - * xprop 1.0.3. - - [ Brice Goglin ] - * Add upstream URL to debian/copyright. - * Add menu entries for editres, xev, xfontsel and xkill. - * xvinfo 1.0.2. - * xdriinfo 1.0.2. - + Drop 03_xvinfo_manpage_typo.diff, merged upstream. - * xwininfo 1.0.3. - * Add myself to Uploaders, and remove Branden with his permission. - - -- Brice Goglin Wed, 22 Aug 2007 08:25:17 +0200 - -x11-utils (0.1) experimental; urgency=low - - [ Timo Aaltonen ] - * Split xbase-clients, new versioning. - * Included packages: - - appres 1.0.1 - - editres 1.0.3 - - listres 1.0.1 - - luit 1.0.1 (from xutils) - - viewres 1.0.1 - - xdpyinfo 1.0.1 - - xdriinfo 1.0.1 - - xev 1.0.2 - - xfd 1.0.1 - - xfontsel 1.0.2 - - xkill 1.0.1 - - xlsatoms 1.0.1 - - xlsclients 1.0.1 - - xlsfonts 1.0.2 - - xmessage 1.0.1 - - xprop 1.0.2 - - xvinfo 1.0.1 - - xwininfo 1.0.2 - * 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: to work around old Ubuntu - packaging. - * debian/copyright: Leave only copyright notices that relate to - this package. FIXME:*luit missing* - * debian/x11-utils.install, rules: Edit to reflect new - packaging. - * debian/x11-utils.dirs: Remove. - * debian/local/: Remove. - * debian/patches: - - Delete patches which do not relate to this package. - - Add a patch for luit from xutils, and rename the patches to - start from 01. - - Edit 04_xlsfonts_do_not_spew_usage_on_connection_error.diff - to not try patch xwd. - - [ Julien Cristau ] - * Autoreconf everything to get updated config.{guess,sub}. - - -- Julien Cristau Wed, 30 May 2007 14:12:27 +0200 - -xbase-clients (1:7.2.ds2-3) unstable; urgency=low - - * Add patch to xsm's configure.ac to not override the user-provided RSH - variable, so we can drop the openssh build-dep (closes: #362787). - - -- Julien Cristau Wed, 09 May 2007 16:26:06 +0200 - -xbase-clients (1:7.2.ds2-2) unstable; urgency=low - - [ Julien Cristau ] - * Autoreconf with patches applied. - * Add build-dep on libxinerama-dev, so xdpyinfo is built with support for - the xinerama extension. - * Add patch 17_xmodmap_manpage.diff to make xmodmap(1) refer to - /usr/share/X11/XKeysymDB instead of /usr/lib/X11/XKeysymDB - (closes: #394077). Thanks, Joachim Breitner! - * Document each app's build-dependencies in debian/control for reference. - * Update long description: XKB configuration data is in xkb-data, bitmap - images in xbitmaps. - * Add XS-Vcs-* in debian/control. - * Upload to unstable. - - [ Brice Goglin ] - * Restore Depends: on cpp (got lost during modularization) - since xrdb needs it to process .Xdefaults. - Thanks Marcus C. Gottwald (closes: #413298). - * Remove mention of xf86cfg in package description. - Thanks Daniel Leidert (really closes: #362066). - - -- Julien Cristau Fri, 20 Apr 2007 22:00:14 +0200 - -xbase-clients (1:7.2.ds2-1) experimental; urgency=low - - * Update to xrandr 1.2.0. - * Build-dep on libxrandr 1.2.0. - * New patch to install beforelight's app-defaults file correctly. - - -- Julien Cristau Mon, 19 Feb 2007 10:46:11 +0100 - -xbase-clients (1:7.2.ds1-2) experimental; urgency=low - - * Build-dep on libpng12-dev instead of libpng-dev. xcursorgen requires - libpng12.pc, which is not available in libpng14-dev, despite it providing - libpng-dev and libpng12-dev, *sigh*. - - -- Julien Cristau Mon, 12 Feb 2007 05:35:18 +0100 - -xbase-clients (1:7.2.ds1-1) experimental; urgency=low - - * Patch setxkbmap(1) to refer to the correct location for xkb files, thanks - to Celejar for noticing. - * Update to appres 1.0.1. - * Update to beforelight 1.0.2. - * Update to bitmap 1.0.3. - * Update to editres 1.0.3. - * Update to setxkbmap 1.0.3. - * Update to xauth 1.0.2. - * Update to xdbedizzy 1.0.2. - + patch 16_xdbedizzy_fix_crash.diff dropped, included upstream. - + patch pkgconfig_naughtiness dropped, now unnecessary. - * Update to xedit 1.0.2. - * Update to xev 1.0.2. - * Update to xf86dga 1.0.2. - + relevant part dropped from 14_SECURITY_setuid.diff. - * Update to xfontsel 1.0.2. - * Update to xinit 1.0.3. - + relevant part dropped from 14_SECURITY_setuid.diff. - * Update to xkbcomp 1.0.3. - * Update to xlsfonts 1.0.2. - * Update to xmodmap 1.0.2. - * Update to xprop 1.0.2. - * Update to xrdb 1.0.3. - * Update to xsetpointer 1.0.1. - + Add build-dep on x11proto-input-dev >= 1.4. - * Update to xtrap 1.0.2. - * Modify patch 08_xlsfonts_do_not_spew_usage_on_connection_error.diff to - apply to xprop, xwd and xwininfo as well, since they all use a copy of - dsimple.c. - * Change my email address in debian/control. - - -- Julien Cristau Sun, 11 Feb 2007 15:42:54 +0100 - -xbase-clients (1:7.1.ds1-2) unstable; urgency=low - - * Add patch by Eugene Konev to fix xdbedizzy crash (closes: #365291). - - -- Julien Cristau Fri, 12 Jan 2007 17:54:07 +0100 - -xbase-clients (1:7.1.ds1-1) unstable; urgency=low - - * Add patch by Eugene Konev to fix xmore crash (closes: #365292). - * Remove version string from subdirectory names, thus new tarball, and - update patches to match. - * Define MANCONF when configuring xman, to make it look for man pages in the - right path instead of in /usr/man (closes: 404757). - * Remove Fabio from Uploaders with his permission, and add myself. - - -- Julien Cristau Mon, 8 Jan 2007 00:50:31 +0100 - -xbase-clients (1:7.1.ds-3) unstable; urgency=low - - [ Branden Robinson ] - * Patch xprop to stop segfaulting when deleted atoms are requested. - Committed upstream as git 47514347db811d002e7f3ca05d390565bc3ee5e5. - (Closes: #197526) - - [ Denis Barbier ] - * Acknowledge NMU, thanks dann frazier. (closes: #363198) - * The rsh program is required to build xsm. Replace Build-Depends: ssh | rsh - by Build-Depends: openssh-client | ssh - * Fix debian/rules so that xkbcomp look for XKB files in /usr/share/X11/xkb. - Thanks Steinar H. Gunderson (closes: #381884) - All XKB related programs share now the same build system, so factor - commands in debian/rules. - - -- Denis Barbier Sat, 12 Aug 2006 15:08:47 +0200 - -xbase-clients (1:7.1.ds-2.1) unstable; urgency=low - - * Non-maintainer upload. - * Fix implicit pointer conversion in xconsole.c (closes: #363198) - (Was fixed in 1:7.1.ds-1.1 NMU, but silently dropped in 1:7.1.ds-2 MU) - - -- dann frazier Sat, 29 Jul 2006 13:59:40 -0600 - -xbase-clients (1:7.1.ds-2) unstable; urgency=high - - * Security update. Fix for setuid privledge escalation vulernabilities in - xinit, xf86dga, and xload. See - http://lists.freedesktop.org/archives/xorg/2006-June/016146.html for the - full advisory. This package applies the patches for the 7.0 release of - those apps. - - -- David Nusinow Fri, 30 Jun 2006 01:10:17 -0400 - -xbase-clients (1:7.1.ds-1) unstable; urgency=low - - [ Steve Langasek ] - * Drop broken build-dependency on xprint-utils, no thanks to anonymous - someone. - * Pass --disable-xprint to invocations of configure instead, which is - the real fix for the symptoms described: we want the xbase-clients - package to consistently build *without* xprint support, instead of - autodetecting (and possibly failing) based on whether libxp-dev is - installed. Properly closes: #366275. - * Also call PKG_PROG_PKG_CONFIG explicitly from xdbebizzy's - configure.ac, since otherwise --disable-xprint leaves us without - PKG_CONFIG defined. - - [ David Nusinow ] - * This update should include all the apps released with X11R7.1. Version the - package to match this. - * Update bitmap to 1.0.2 - * Update xcursorgen to 1.0.1 - * Autoreconf everything in order to ensure that manpages have the proper - section - * Update 11_xkb_documentation_updates.diff to not use __manpagesuffix__ - imakeism - * Bump standards version to 3.7.2.0 - * Bump debhelper compat to 5 - - -- David Nusinow Sun, 11 Jun 2006 21:51:54 -0400 - -xbase-clients (1:7.0.1-2) unstable; urgency=low - - * Add xprint-utils to build-depends. Thanks anonymous someone. - (closes: #366275) - - -- David Nusinow Sun, 14 May 2006 22:57:13 -0400 - -xbase-clients (1:7.0.1-1) unstable; urgency=low - - * Move xserverrc back to this package from xserver-xorg-core. Thanks - Benjamin Mesing. (closes: #365022) - * Update smproxy to version 1.0.2 - * Update xhost to version 1.0.1 - * Update fstobdf to version 1.0.2 - * Update xdriinfo to version 1.0.1 - * Update xinit to version 1.0.2 - * Remove obsolete patch 03_startx_dummy.diff - * Update xkbevd to version 1.0.2 - * Update xman to version 1.0.2 - * Update xrefresh to version 1.0.2 - * Update xwininfo to version 1.0.2 - * Update xclock to version 1.0.2 - * Update xconsole to version 1.0.2 - * Update xkbcomp to version 1.0.2 - * Update xmodmap to version 1.0.1 - * Update xrandr to version 1.0.2 - * Update xrdb to version 1.0.2 - * Update xset to version 1.0.2 - - -- David Nusinow Tue, 2 May 2006 22:58:57 -0400 - -xbase-clients (1:7.0.0-5) unstable; urgency=low - - * Patch startx so that it points to /etc/X11/xinit for xserverrc and - xinitrc. Thanks Vasilis Vasaitis and Bastian Kleineidam. - * Move xserverrc back to /etc/X11/xinit - * Use --list-missing with dh_install - - -- David Nusinow Tue, 25 Apr 2006 21:37:22 -0400 - -xbase-clients (1:7.0.0-4) unstable; urgency=low - - * Add quilt to build-depends. - - -- David Nusinow Sat, 15 Apr 2006 19:49:02 -0400 - -xbase-clients (1:7.0.0-3) unstable; urgency=low - - * Remove mention of xorgconfig and xorgcfg in package description. Thanks - Daniel Leidert. (closes: #362066) - * Add 12_startx_paths.diff to use X11R7 paths for startx and xinit. Thanks - Arjan Opmeer. (closes: #357713) - * Add libxi-dev to build-depends - * Make xbase-clients explicitly pre-depend on x11-common >= 1:7.0.0, rather - than implicitly. Thanks Vasilis Vasaitis. (closes: #357713) - - -- David Nusinow Thu, 13 Apr 2006 22:39:46 -0400 - -xbase-clients (1:7.0.0-2) unstable; urgency=low - - * Upload to unstable - * Add build-depends on libgl1-mesa-dev, versioned build-depneds on - libdrender-dev, and re-version build-depend on libxft-dev. Thanks Frank - Lichtenheld. (closes: #361821) - - -- David Nusinow Mon, 10 Apr 2006 19:49:23 -0400 - -xbase-clients (1:7.0.0-1) experimental; urgency=low - - [ Denis Barbier ] - * Set XKB base path to /usr/share/X11/xkb. - - [ David Nusinow ] - * Update to x11perf 1.4.1 and setxkbmap 1.0.2 upstream releases - * Bump version number to match upstream's current katamari release - - -- David Nusinow Thu, 16 Mar 2006 23:06:15 -0500 - -xbase-clients (1:1.0.1-2) experimental; urgency=low - - * Add an empty /var/lib/xkb directory so that the server loads the correct - keymaps. Thanks Silvestre Zabala, Eugene Konev, and Daniel Stone. - (closes: #354130) - * Port patches from trunk - + general/014_startx_hostname_fix.diff - + general/015_startx_dummy_fix.diff - + general/073_xev_flush_standard_output.diff - + general/025c_bitmap_manpage_typo.diff - + general/025d_xedit_manpage_typos.diff - + general/025e_xvinfo_manpage_typo.diff - + general/099r_xlsfonts_do_not_spew_usage_on_connection_error.diff - + debian/902_debian_startx_manpage.diff - + debian/916_add_XKBPATH_env_variable.diff - + general/051_xkb_documentation_updates.diff - * Suggest mesa-utils, where glxinfo and glxgears have been moved. - Thanks Mike Hommey. (closes: #354246) - - -- David Nusinow Sat, 4 Mar 2006 18:59:20 -0500 - -xbase-clients (1:1.0.1-1) experimental; urgency=low - - [ David Nusinow ] - * First modular upload to Debian - - [ Eugene Konev ] - * Divide packages that we process in debian/rules by category so we can pass - the xkb packages the proper configure flags - - -- David Nusinow Sun, 19 Feb 2006 19:46:46 -0500 diff --git a/debian/compat b/debian/compat deleted file mode 100644 index 7ed6ff8..0000000 --- a/debian/compat +++ /dev/null @@ -1 +0,0 @@ -5 diff --git a/debian/control b/debian/control deleted file mode 100755 index 6ea51ff..0000000 --- a/debian/control +++ /dev/null @@ -1,68 +0,0 @@ -Source: x11-utils -Section: x11 -Priority: optional -Maintainer: Sung-Jin Park , Sangjin Lee , Debian X Strike Force -Uploaders: SooChan Lim , Sung-Jin Park , David Nusinow , Brice Goglin -Build-Depends: debhelper (>= 5.0.0), pkg-config, libx11-dev (>= 2:1.0.0), libxaw7-dev (>= 1:1.0.1), libxext-dev (>= 1:1.0.0), libxft-dev (>= 2.1.8.2-6), libxi-dev (>= 1:1.0.0-3), libxmuu-dev (>= 1:1.0.1), libxrender-dev (>= 1:0.9.0.2-2), libxt-dev (>= 1:1.0.0), libxtst-dev (>= 1:1.0.1), libxxf86dga-dev (>= 1:1.0.1), libxv-dev (>= 1:1.0.1), libxxf86vm-dev (>= 1:1.0.0), quilt, x11proto-input-dev (>= 1.4), libxinerama-dev (>= 1:1.0.1), libfontenc-dev, libxcb1-dev, libxcb-atom1-dev, xutils-dev (>= 1:7.5-1slp2+1), libxcb-shape0-dev -# Reasons for build-depends: -# debhelper for the packaging, pkg-config needed by configure scripts -# Individual apps: -# appres: libx11-dev, libxt-dev -# editres: libx11-dev, libxt-dev, libxmu-dev -# listres: libx11-dev, libxt-dev, libxmu-dev -# luit: libx11-dev, libfontenc-dev -# viewres: libxt-dev -# xdpyinfo: libxext-dev, libx11-dev, libxtst-dev, libxxf86vm-dev, -# libxxf86dga-dev, (libxxf86misc-dev,) libxi-dev, libxrender-dev, -# libxinerama-dev, libdmx-dev -# xdriinfo: libx11-dev, x11proto-gl-dev, libgl1-mesa-dev -# xev: libx11-dev -# xfd: libxaw7-dev, libfreetype2-dev, libfontconfig-dev, libxft-dev, libxt-dev -# xfontsel: libxaw7-dev, libxt-dev -# xkill: libx11-dev, libxmuu-dev -# xlsatoms: libxcb1-dev -# xlsclients: libxcb1-dev, libxcb-atom1-dev -# xlsfonts: libx11-dev -# xmessage: libxaw7-dev, libxt-dev -# xprop: libxmuu-dev, libx11-dev -# xvinfo: libxv-dev, libx11-dev -# xwininfo: libxmuu-dev, libxext-dev, libx11-dev -Standards-Version: 3.8.4 -Vcs-Git: git://git.debian.org/git/pkg-xorg/app/x11-utils -Vcs-Browser: http://git.debian.org/?p=pkg-xorg/app/x11-utils.git - -Package: x11-utils -Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends} -#Depends: ${shlibs:Depends}, ${misc:Depends}, cpp -Pre-Depends: x11-common (>= 1:7.0.0) -Conflicts: appres, editres, listres, luit, viewres, xdpyinfo, xdriinfo, xev, xfd, xfontsel, xkill, xlsatoms, xlsclients, xlsfonts, xmessage, xprop, xvinfo, xwininfo -Replaces: xbase-clients (<< 1:7.2.ds3), xutils (<< 1:7.2), appres, editres, listres, luit, viewres, xdpyinfo, xdriinfo, xev, xfd, xfontsel, xkill, xlsatoms, xlsclients, xlsfonts, xmessage, xprop, xvinfo, xwininfo -Suggests: mesa-utils -Description: X11 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 utilities - that ship with the X Window System, including: - - appres, editres, listres and viewres, which query the X resource database; - - luit, a filter that can be run between an arbitrary application and a - UTF-8 terminal emulator; - - xdpyinfo, a display information utility for X; - - xdriinfo, query configuration information of DRI drivers; - - xev, an X event displayer; - - xfd, a tool that displays all the glyphs in a given X font; - - xfontsel, a tool for browsing and selecting X fonts; - - xkill, a tool for terminating misbehaving X clients; - - xlsatoms, which lists interned atoms defined on an X server; - - xlsclients, which lists client applications running on an X display; - - xlsfonts, a server font list displayer; - - xmessage, a tool to display message or dialog boxes; - - xprop, a property displayer for X; - - xvinfo, an Xv extension information utility for X; - - xwininfo, a window information utility for X; - . - The editres and viewres programs use bitmap images provided by the - xbitmaps package. The luit program requires locale information from - the libx11-data package. diff --git a/debian/copyright b/debian/copyright deleted file mode 100644 index 05be090..0000000 --- a/debian/copyright +++ /dev/null @@ -1,446 +0,0 @@ -The contents of this package were downloaded from -http://xorg.freedesktop.org/releases/individual/app/ -It contains the appres, editres, listres, luit, viewres, xdpyinfo, -xdriinfo, xev, xfd, xfontsel, xkill, xlsatoms, xlsclients, xlsfonts, -xmessage, xprop, xvinfo and xwininfo applications. - -editres: - 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. - -listres: - Copyright (c) 1989 X Consortium - - Permission is hereby granted, free of charge, to any person obtaining a copy - of this software and associated documentation files (the "Software"), to deal - in the Software without restriction, including without limitation the rights - to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - copies of the Software, and to permit persons to whom the Software is - furnished to do so, subject to the following conditions: - - The above copyright notice and this permission notice shall be included in - all copies or substantial portions of the Software. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN - AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - - Except as contained in this notice, the name of the X Consortium shall not be - used in advertising or otherwise to promote the sale, use or other dealings - in this Software without prior written authorization from the X Consortium. - * * - * Author: Jim Fulton, MIT X Consortium - */ - -luit: - Copyright (c) 2001 by Juliusz Chroboczek - Copyright (c) 2002 by Tomohiro KUBOTA - - Permission is hereby granted, free of charge, to any person obtaining a copy - of this software and associated documentation files (the "Software"), to deal - in the Software without restriction, including without limitation the rights - to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - copies of the Software, and to permit persons to whom the Software is - furnished to do so, subject to the following conditions: - - The above copyright notice and this permission notice shall be included in - all copies or substantial portions of the Software. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - THE SOFTWARE. - -viewres: - Copyright (c) 1989 X Consortium - - Permission is hereby granted, free of charge, to any person obtaining a copy - of this software and associated documentation files (the "Software"), to deal - in the Software without restriction, including without limitation the rights - to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - copies of the Software, and to permit persons to whom the Software is - furnished to do so, subject to the following conditions: - - The above copyright notice and this permission notice shall be included in - all copies or substantial portions of the Software. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN - AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - - Except as contained in this notice, the name of the X Consortium shall not be - used in advertising or otherwise to promote the sale, use or other dealings - in this Software without prior written authorization from the X Consortium. - * * - * Author: Jim Fulton, MIT X Consortium - */ - -xdpyinfo: - Copyright 1988, 1998 The Open Group - Copyright 2005 Hitachi, Ltd. - - Permission to use, copy, modify, distribute, and sell this software and its - documentation for any purpose is hereby granted without fee, provided that - the above copyright notice appear in all copies and that both that - copyright notice and this permission notice appear in supporting - documentation. - - 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: Jim Fulton, MIT X Consortium - */ - -xev: - Copyright (c) 1988 X Consortium - - Permission is hereby granted, free of charge, to any person obtaining - a copy of this software and associated documentation files (the - "Software"), to deal in the Software without restriction, including - without limitation the rights to use, copy, modify, merge, publish, - distribute, sublicense, and/or sell copies of the Software, and to - permit persons to whom the Software is furnished to do so, subject to - the following conditions: - - The above copyright notice and this permission notice shall be included - in all copies or substantial portions of the Software. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS - OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. - IN NO EVENT SHALL THE X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR - OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, - ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR - OTHER DEALINGS IN THE SOFTWARE. - - Except as contained in this notice, the name of the X Consortium shall - not be used in advertising or otherwise to promote the sale, use or - other dealings in this Software without prior written authorization - from the X Consortium. - -xfd: - 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: Jim Fulton, MIT X Consortium - */ - -xfontsel: - Copyright (c) 1985-1989 X Consortium - - Permission is hereby granted, free of charge, to any person obtaining - a copy of this software and associated documentation files (the - "Software"), to deal in the Software without restriction, including - without limitation the rights to use, copy, modify, merge, publish, - distribute, sublicense, and/or sell copies of the Software, and to - permit persons to whom the Software is furnished to do so, subject to - the following conditions: - - The above copyright notice and this permission notice shall be included - in all copies or substantial portions of the Software. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS - OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. - IN NO EVENT SHALL THE X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR - OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, - ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR - OTHER DEALINGS IN THE SOFTWARE. - - Except as contained in this notice, the name of the X Consortium shall - not be used in advertising or otherwise to promote the sale, use or - other dealings in this Software without prior written authorization - from the X Consortium. - - Author: Ralph R. Swick, DEC/MIT Project Athena - one weekend in November, 1989 - Modified: Mark Leisher to deal with UCS sample text. - -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. - - Author: Jim Fulton, MIT X Consortium; Dana Chee, Bellcore - -xlsatoms: - Copyright 1989, 1998 The Open Group - Copyright 2009 Open Text 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. - - 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: Jim Fulton, MIT X Consortium - * Author: Peter Harris, Open Text Corporation - -xlsclients: - Copyright 1989, 1998 The Open Group - Copyright 2009 Open Text 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. - - 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: Jim Fulton, MIT X Consortium - * Author: Peter Harris, Open Text Corporation - */ - -xlsfonts: - 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. - -xmessage: - Copyright (c) 1988, 1991, 1994 X Consortium - - Permission is hereby granted, free of charge, to any person obtaining - a copy of this software and associated documentation files (the - "Software"), to deal in the Software without restriction, including - without limitation the rights to use, copy, modify, merge, publish, - distribute, sublicense, and/or sell copies of the Software, and to - permit persons to whom the Software is furnished to do so, subject to - the following conditions: - - The above copyright notice and this permission notice shall be included - in all copies or substantial portions of the Software. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS - OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. - IN NO EVENT SHALL THE X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR - OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, - ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR - OTHER DEALINGS IN THE SOFTWARE. - - Except as contained in this notice, the name of the X Consortium shall - not be used in advertising or otherwise to promote the sale, use or - other dealings in this Software without prior written authorization - from the X Consortium. - -xprop: - Copyright 1990, 1998 The Open Group - Copyright (c) 2000 The XFree86 Project, Inc. - - Permission to use, copy, modify, distribute, and sell this software and its - documentation for any purpose is hereby granted without fee, provided that - the above copyright notice appear in all copies and that both that - copyright notice and this permission notice appear in supporting - documentation. - - The above copyright notice and this permission notice shall be included - in all copies or substantial portions of the Software. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS - OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. - IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR - OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, - ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR - OTHER DEALINGS IN THE SOFTWARE. - - Except as contained in this notice, the name of The Open Group shall - not be used in advertising or otherwise to promote the sale, use or - other dealings in this Software without prior written authorization - from The Open Group. - - Copyright 2007 Kim woelders - - Permission to use, copy, modify, distribute, and sell this software and its - documentation for any purpose is hereby granted without fee, provided that - the above copyright notice appear in all copies and that both that copyright - notice and this permission notice appear in supporting documentation, and - that the name of the copyright holders not be used in advertising or - publicity pertaining to distribution of the software without specific, - written prior permission. The copyright holders make no representations - about the suitability of this software for any purpose. It is provided "as - is" without express or implied warranty. - - THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, - INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO - EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR - CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, - DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER - TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE - OF THIS SOFTWARE. - -xvinfo: - Copyright (C) 1994-2003 The XFree86 Project, Inc. All Rights Reserved. - - Permission is hereby granted, free of charge, to any person obtaining a copy - of this software and associated documentation files (the "Software"), to deal - in the Software without restriction, including without limitation the rights - to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - copies of the Software, and to permit persons to whom the Software is fur- - nished to do so, subject to the following conditions: - - The above copyright notice and this permission notice shall be included in - all copies or substantial portions of the Software. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FIT- - NESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - XFREE86 PROJECT BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CON- - NECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - - Except as contained in this notice, the name of the XFree86 Project shall not - be used in advertising or otherwise to promote the sale, use or other deal- - ings in this Software without prior written authorization from the XFree86 - Project. - -xwininfo: - Copyright 1987, 1998 The Open Group - Copyright 1999 Sun Microsystems, 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. - - 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 - 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. diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index e69de29..0000000 diff --git a/debian/rules b/debian/rules deleted file mode 100755 index 81c2c80..0000000 --- a/debian/rules +++ /dev/null @@ -1,110 +0,0 @@ -#!/usr/bin/make -f -# debian/rules for the Debian xutils package. -# Copyright © 2004 Scott James Remnant -# Copyright © 2005 Daniel Stone -# Copyright © 2005 David Nusinow - -# Uncomment this to turn on verbose mode. -#export DH_VERBOSE=1 - -# set this to the name of the main shlib's binary package -PACKAGE = x11-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=appres editres listres luit viewres xdpyinfo xev xfd xfontsel xkill xlsatoms xlsclients xlsfonts xmessage xprop xvinfo xwininfo -#DEF_SUBDIRS=appres editres listres luit viewres xdpyinfo xdriinfo xev xfd xfontsel xkill xlsatoms xlsclients xlsfonts xmessage xprop xvinfo xwininfo -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 - 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 --list-missing -# dh_installmenu -# dh_installchangelogs - dh_link - dh_strip - dh_compress - dh_fixperms - dh_makeshlibs - dh_installdeb - dh_shlibdeps - dh_makeshlibs - dh_gencontrol - dh_md5sums - dh_builddeb - -# Build architecture-independent files here. -binary-indep: build install -# Nothing to do - -binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary install diff --git a/debian/watch.appres b/debian/watch.appres deleted file mode 100644 index 4696f10..0000000 --- a/debian/watch.appres +++ /dev/null @@ -1,2 +0,0 @@ -version=3 -http://xorg.freedesktop.org/releases/individual/app/ appres-(.*)\.tar\.gz diff --git a/debian/watch.editres b/debian/watch.editres deleted file mode 100644 index fbd9cda..0000000 --- a/debian/watch.editres +++ /dev/null @@ -1,2 +0,0 @@ -version=3 -http://xorg.freedesktop.org/releases/individual/app/ editres-(.*)\.tar\.gz diff --git a/debian/watch.listres b/debian/watch.listres deleted file mode 100644 index 019487e..0000000 --- a/debian/watch.listres +++ /dev/null @@ -1,2 +0,0 @@ -version=3 -http://xorg.freedesktop.org/releases/individual/app/ listres-(.*)\.tar\.gz diff --git a/debian/watch.luit b/debian/watch.luit deleted file mode 100644 index ec1ccbb..0000000 --- a/debian/watch.luit +++ /dev/null @@ -1,2 +0,0 @@ -version=3 -http://xorg.freedesktop.org/releases/individual/app/ luit-(.*)\.tar\.gz diff --git a/debian/watch.viewres b/debian/watch.viewres deleted file mode 100644 index 459fb6d..0000000 --- a/debian/watch.viewres +++ /dev/null @@ -1,2 +0,0 @@ -version=3 -http://xorg.freedesktop.org/releases/individual/app/ viewres-(.*)\.tar\.gz diff --git a/debian/watch.xdpyinfo b/debian/watch.xdpyinfo deleted file mode 100644 index dc56db5..0000000 --- a/debian/watch.xdpyinfo +++ /dev/null @@ -1,2 +0,0 @@ -version=3 -http://xorg.freedesktop.org/releases/individual/app/ xdpyinfo-(.*)\.tar\.gz diff --git a/debian/watch.xdriinfo b/debian/watch.xdriinfo deleted file mode 100644 index e80131a..0000000 --- a/debian/watch.xdriinfo +++ /dev/null @@ -1,2 +0,0 @@ -version=3 -http://xorg.freedesktop.org/releases/individual/app/ xdriinfo-(.*)\.tar\.gz diff --git a/debian/watch.xev b/debian/watch.xev deleted file mode 100644 index b4c2cd1..0000000 --- a/debian/watch.xev +++ /dev/null @@ -1,2 +0,0 @@ -version=3 -http://xorg.freedesktop.org/releases/individual/app/ xev-(.*)\.tar\.gz diff --git a/debian/watch.xfd b/debian/watch.xfd deleted file mode 100644 index c461be0..0000000 --- a/debian/watch.xfd +++ /dev/null @@ -1,2 +0,0 @@ -version=3 -http://xorg.freedesktop.org/releases/individual/app/ xfd-(.*)\.tar\.gz diff --git a/debian/watch.xfontsel b/debian/watch.xfontsel deleted file mode 100644 index 3ee7f7f..0000000 --- a/debian/watch.xfontsel +++ /dev/null @@ -1,2 +0,0 @@ -version=3 -http://xorg.freedesktop.org/releases/individual/app/ xfontsel-(.*)\.tar\.gz diff --git a/debian/watch.xkill b/debian/watch.xkill deleted file mode 100644 index c0de4c4..0000000 --- a/debian/watch.xkill +++ /dev/null @@ -1,2 +0,0 @@ -version=3 -http://xorg.freedesktop.org/releases/individual/app/ xkill-(.*)\.tar\.gz diff --git a/debian/watch.xlsatoms b/debian/watch.xlsatoms deleted file mode 100644 index dbf7fcd..0000000 --- a/debian/watch.xlsatoms +++ /dev/null @@ -1,2 +0,0 @@ -version=3 -http://xorg.freedesktop.org/releases/individual/app/ xlsatoms-(.*)\.tar\.gz diff --git a/debian/watch.xlsclients b/debian/watch.xlsclients deleted file mode 100644 index e70c91e..0000000 --- a/debian/watch.xlsclients +++ /dev/null @@ -1,2 +0,0 @@ -version=3 -http://xorg.freedesktop.org/releases/individual/app/ xlsclients-(.*)\.tar\.gz diff --git a/debian/watch.xlsfonts b/debian/watch.xlsfonts deleted file mode 100644 index fc63c88..0000000 --- a/debian/watch.xlsfonts +++ /dev/null @@ -1,2 +0,0 @@ -version=3 -http://xorg.freedesktop.org/releases/individual/app/ xlsfonts-(.*)\.tar\.gz diff --git a/debian/watch.xmessage b/debian/watch.xmessage deleted file mode 100644 index ef6ca25..0000000 --- a/debian/watch.xmessage +++ /dev/null @@ -1,2 +0,0 @@ -version=3 -http://xorg.freedesktop.org/releases/individual/app/ xmessage-(.*)\.tar\.gz diff --git a/debian/watch.xprop b/debian/watch.xprop deleted file mode 100644 index 0855c80..0000000 --- a/debian/watch.xprop +++ /dev/null @@ -1,2 +0,0 @@ -version=3 -http://xorg.freedesktop.org/releases/individual/app/ xprop-(.*)\.tar\.gz diff --git a/debian/watch.xvinfo b/debian/watch.xvinfo deleted file mode 100644 index 9b9eb29..0000000 --- a/debian/watch.xvinfo +++ /dev/null @@ -1,2 +0,0 @@ -version=3 -http://xorg.freedesktop.org/releases/individual/app/ xvinfo-(.*)\.tar\.gz diff --git a/debian/watch.xwininfo b/debian/watch.xwininfo deleted file mode 100644 index dbf2c8d..0000000 --- a/debian/watch.xwininfo +++ /dev/null @@ -1,2 +0,0 @@ -version=3 -http://xorg.freedesktop.org/releases/individual/app/ xwininfo-(.*)\.tar\.gz diff --git a/debian/x11-utils.install b/debian/x11-utils.install deleted file mode 100644 index ae49884..0000000 --- a/debian/x11-utils.install +++ /dev/null @@ -1,3 +0,0 @@ -usr/bin/* -usr/share/man/man1/* -etc/X11/app-defaults/* diff --git a/debian/x11-utils.menu b/debian/x11-utils.menu deleted file mode 100644 index 0220761..0000000 --- a/debian/x11-utils.menu +++ /dev/null @@ -1,25 +0,0 @@ -?package(x11-utils):\ - needs="x11"\ - section="Applications/System/Administration"\ - longtitle="Editres: resource editor for X Toolkit applications"\ - title="Editres"\ - command="editres" -?package(x11-utils):\ - needs="x11"\ - section="Applications/System/Monitoring"\ - longtitle="Xev: display X events"\ - title="Xev"\ - command="x-terminal-emulator -e xev" -?package(x11-utils):\ - needs="x11"\ - section="Applications/System/Administration"\ - hints="Fonts"\ - longtitle="Xfontsel: font viewer/selector for X"\ - title="Xfontsel"\ - command="xfontsel" -?package(x11-utils):\ - needs="x11"\ - section="Applications/System/Administration"\ - longtitle="Xkill: tool to kill X clients by clicking on their windows"\ - title="Xkill"\ - command="xkill" 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 5e16b10..0000000 --- a/debian/xsfbs/xsfbs.mk +++ /dev/null @@ -1,276 +0,0 @@ -#!/usr/bin/make -f - -# Debian X Strike Force Build System (XSFBS): Make portion - -# Copyright 1996 Stephen Early -# Copyright 1997 Mark Eichin -# Copyright 1998-2005, 2007 Branden Robinson -# Copyright 2005 David Nusinow -# -# Licensed under the GNU General Public License, version 2. See the file -# /usr/share/common-licenses/GPL or . - -# Originally by Stephen Early -# Modified by Mark W. Eichin -# Modified by Adam Heath -# Modified by Branden Robinson -# Modified by Fabio Massimo Di Nitto -# Modified by David Nusinow -# Acknowledgements to Manoj Srivastava. - -# Pass $(DH_OPTIONS) into the environment for debhelper's benefit. -export DH_OPTIONS - -# force quilt to not use ~/.quiltrc and to use debian/patches -QUILT = QUILT_PATCHES=debian/patches quilt --quiltrc /dev/null - -# Set up parameters for the upstream build environment. - -# Determine (source) package name from Debian changelog. -SOURCE_NAME:=$(shell dpkg-parsechangelog -ldebian/changelog \ - | grep '^Source:' | awk '{print $$2}') - -# Determine package version from Debian changelog. -SOURCE_VERSION:=$(shell dpkg-parsechangelog -ldebian/changelog \ - | grep '^Version:' | awk '{print $$2}') - -# Determine upstream version number. -UPSTREAM_VERSION:=$(shell echo $(SOURCE_VERSION) | sed 's/-.*//') - -# Determine the source version without the epoch for make-orig-tar-gz -NO_EPOCH_VER:=$(shell echo $(UPSTREAM_VERSION) | sed 's/^.://') - -# Figure out who's building this package. -BUILDER:=$(shell echo $${DEBEMAIL:-$${EMAIL:-$$(echo $$LOGNAME@$$(cat /etc/mailname 2>/dev/null))}}) - -# Find out if this is an official build; an official build has nothing but -# digits, dots, and/or the codename of a release in the Debian part of the -# version number. Anything else indicates an unofficial build. -OFFICIAL_BUILD:=$(shell VERSION=$(SOURCE_VERSION); if ! expr "$$(echo $${VERSION\#\#*-} | sed 's/\(woody\|sarge\|etch\|lenny\)//g')" : ".*[^0-9.].*" >/dev/null 2>&1; then echo yes; fi) - -# Set up parameters for the Debian build environment. - -# Determine our architecture. -BUILD_ARCH:=$(shell dpkg-architecture -qDEB_BUILD_ARCH) -# Work around some old-time dpkg braindamage. -BUILD_ARCH:=$(subst i486,i386,$(BUILD_ARCH)) -# The DEB_HOST_ARCH variable may be set per the Debian cross-compilation policy. -ifdef DEB_HOST_ARCH - ARCH:=$(DEB_HOST_ARCH) -else - # dpkg-cross sets the ARCH environment variable; if set, use it. - ifdef ARCH - ARCH:=$(ARCH) - else - ARCH:=$(BUILD_ARCH) - endif -endif - -# $(STAMP_DIR) houses stamp files for complex targets. -STAMP_DIR:=stampdir - -# $(DEBTREEDIR) is where all install rules are told (via $(DESTDIR)) to place -# their files. -DEBTREEDIR:=$(CURDIR)/debian/tmp - -# All "important" targets have four lines: -# 1) A target name that is invoked by a package-building tool or the user. -# This consists of a dependency on a "$(STAMP_DIR)/"-prefixed counterpart. -# 2) A line delcaring 1) as a phony target (".PHONY:"). -# 3) A "$(STAMP_DIR)/"-prefixed target which does the actual work, and may -# depend on other targets. -# 4) A line declaring 3) as a member of the $(stampdir_targets) variable; the -# "$(STAMP_DIR)/" prefix is omitted. -# -# This indirection is needed so that the "stamp" files that signify when a rule -# is done can be located in a separate "stampdir". Recall that make has no way -# to know when a goal has been met for a phony target (like "build" or -# "install"). -# -# At the end of each "$(STAMP_DIR)/" target, be sure to run the command ">$@" -# so that the target will not be run again. Removing the file will make Make -# run the target over. - -# All phony targets should be declared as dependencies of .PHONY, even if they -# do not have "($STAMP_DIR)/"-prefixed counterparts. - -# Define a harmless default rule to keep things from going nuts by accident. -.PHONY: default -default: - -# Set up the $(STAMP_DIR) directory. -.PHONY: stampdir -stampdir_targets+=stampdir -stampdir: $(STAMP_DIR)/stampdir -$(STAMP_DIR)/stampdir: - mkdir $(STAMP_DIR) - >$@ - -# Set up the package build directory as quilt expects to find it. -.PHONY: prepare -stampdir_targets+=prepare -prepare: $(STAMP_DIR)/prepare -$(STAMP_DIR)/prepare: $(STAMP_DIR)/log $(STAMP_DIR)/genscripts - >$@ - -.PHONY: log -stampdir_targets+=log -log: $(STAMP_DIR)/log -$(STAMP_DIR)/log: $(STAMP_DIR)/stampdir - mkdir -p $(STAMP_DIR)/log - -# Apply all patches to the upstream source. -.PHONY: patch -stampdir_targets+=patch -patch: $(STAMP_DIR)/patch -$(STAMP_DIR)/patch: $(STAMP_DIR)/prepare - if ! [ `which quilt` ]; then \ - echo "Couldn't find quilt. Please install it or add it to the build-depends for this package."; \ - exit 1; \ - fi; \ - if $(QUILT) next >/dev/null 2>&1; then \ - echo -n "Applying patches..."; \ - if $(QUILT) push -a -v >$(STAMP_DIR)/log/patch 2>&1; then \ - cat $(STAMP_DIR)/log/patch; \ - echo "successful."; \ - else \ - cat $(STAMP_DIR)/log/patch; \ - echo "failed! (check $(STAMP_DIR)/log/patch for details)"; \ - exit 1; \ - fi; \ - else \ - echo "No patches to apply"; \ - fi; \ - >$@ - -# Revert all patches to the upstream source. -.PHONY: unpatch -unpatch: $(STAMP_DIR)/log - rm -f $(STAMP_DIR)/patch - @echo -n "Unapplying patches..."; \ - if $(QUILT) applied >/dev/null 2>/dev/null; then \ - if $(QUILT) pop -a -v >$(STAMP_DIR)/log/unpatch 2>&1; then \ - cat $(STAMP_DIR)/log/unpatch; \ - echo "successful."; \ - else \ - cat $(STAMP_DIR)/log/unpatch; \ - echo "failed! (check $(STAMP_DIR)/log/unpatch for details)"; \ - exit 1; \ - fi; \ - else \ - echo "nothing to do."; \ - fi - -# Clean the generated maintainer scripts. -.PHONY: cleanscripts -cleanscripts: - rm -f $(STAMP_DIR)/genscripts - rm -f debian/*.config \ - debian/*.postinst \ - debian/*.postrm \ - debian/*.preinst \ - debian/*.prerm - -# Clean the package build tree. -.PHONY: xsfclean -xsfclean: cleanscripts unpatch - dh_testdir - rm -rf .pc - rm -rf $(STAMP_DIR) - 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 - >$@ - -SERVERMINVERS = $(shell cat /usr/share/xserver-xorg/serverminver 2>/dev/null) -VIDEOABI = $(shell cat /usr/share/xserver-xorg/videoabiver 2>/dev/null) -INPUTABI = $(shell cat /usr/share/xserver-xorg/inputabiver 2>/dev/null) -SERVER_DEPENDS = xserver-xorg-core (>= $(SERVERMINVERS)) -VIDDRIVER_PROVIDES = xserver-xorg-video-$(VIDEOABI) -INPDRIVER_PROVIDES = xserver-xorg-input-$(INPUTABI) -ifeq ($(PACKAGE),) -PACKAGE=$(shell awk '/^Package:/ { print $$2; exit }' < debian/control) -endif - -.PHONY: serverabi -serverabi: install -ifeq ($(SERVERMINVERS),) - @echo error: xserver-xorg-dev needs to be installed - @exit 1 -else - echo "xserver:Depends=$(SERVER_DEPENDS)" >> debian/$(PACKAGE).substvars - echo "xviddriver:Provides=$(VIDDRIVER_PROVIDES)" >> debian/$(PACKAGE).substvars - echo "xinpdriver:Provides=$(INPDRIVER_PROVIDES)" >> debian/$(PACKAGE).substvars -endif - -# vim:set noet ai sts=8 sw=8 tw=0: diff --git a/debian/xsfbs/xsfbs.sh b/debian/xsfbs/xsfbs.sh deleted file mode 100644 index 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 < on the World Wide Web for -instructions, read the file /usr/share/doc/debian/bug-reporting.txt from the -"doc-debian" package, or install the "reportbug" package and use the command of -the same name to file a report against version $SOURCE_VERSION of this package. -EOF - exit $SHELL_LIB_USAGE_ERROR -fi - -if [ -z "$THIS_SCRIPT" ]; then - cat >&2 < on the World Wide Web for -instructions, read the file /usr/share/doc/debian/bug-reporting.txt from the -"doc-debian" package, or install the "reportbug" package and use the command of -the same name to file a report against version $SOURCE_VERSION of the -"$THIS_PACKAGE" package. -EOF - exit $SHELL_LIB_USAGE_ERROR -fi - -if [ "$1" = "reconfigure" ] || [ -n "$DEBCONF_RECONFIGURE" ]; then - RECONFIGURE="true" -else - RECONFIGURE= -fi - -if ([ "$1" = "install" ] || [ "$1" = "configure" ]) && [ -z "$2" ]; then - FIRSTINST="yes" -fi - -if [ -z "$RECONFIGURE" ] && [ -z "$FIRSTINST" ]; then - UPGRADE="yes" -fi - -trap "message;\ - message \"Received signal. Aborting $THIS_PACKAGE package $THIS_SCRIPT script.\";\ - message;\ - exit 1" HUP INT QUIT TERM - -reject_nondigits () { - # syntax: reject_nondigits [ operand ... ] - # - # scan operands (typically shell variables whose values cannot be trusted) for - # characters other than decimal digits and barf if any are found - while [ -n "$1" ]; do - # does the operand contain anything but digits? - if ! expr "$1" : "[[:digit:]]\+$" > /dev/null 2>&1; then - # can't use die(), because it wraps message() which wraps this function - echo "$THIS_PACKAGE $THIS_SCRIPT error: reject_nondigits() encountered" \ - "possibly malicious garbage \"$1\"" >&2 - exit $SHELL_LIB_THROWN_ERROR - fi - shift - done -} - -reject_unlikely_path_chars () { - # syntax: reject_unlikely_path_chars [ operand ... ] - # - # scan operands (typically shell variables whose values cannot be trusted) for - # characters unlikely to be seen in a path and which the shell might - # interpret and barf if any are found - while [ -n "$1" ]; do - # does the operand contain any funny characters? - if expr "$1" : '.*[!$&()*;<>?|].*' > /dev/null 2>&1; then - # can't use die(), because I want to avoid forward references - echo "$THIS_PACKAGE $THIS_SCRIPT error: reject_unlikely_path_chars()" \ - "encountered possibly malicious garbage \"$1\"" >&2 - exit $SHELL_LIB_THROWN_ERROR - fi - shift - done -} - -# Query the terminal to establish a default number of columns to use for -# displaying messages to the user. This is used only as a fallback in the -# event the COLUMNS variable is not set. ($COLUMNS can react to SIGWINCH while -# the script is running, and this cannot, only being calculated once.) -DEFCOLUMNS=$(stty size 2> /dev/null | awk '{print $2}') || true -if ! expr "$DEFCOLUMNS" : "[[:digit:]]\+$" > /dev/null 2>&1; then - DEFCOLUMNS=80 -fi - -message () { - # pretty-print messages of arbitrary length - reject_nondigits "$COLUMNS" - echo "$*" | fmt -t -w ${COLUMNS:-$DEFCOLUMNS} >&2 -} - -observe () { - # syntax: observe message ... - # - # issue observational message suitable for logging someday when support for - # it exists in dpkg - if [ -n "$DEBUG_XORG_PACKAGE" ]; then - message "$THIS_PACKAGE $THIS_SCRIPT note: $*" - fi -} - -warn () { - # syntax: warn message ... - # - # issue warning message suitable for logging someday when support for - # it exists in dpkg; also send to standard error - message "$THIS_PACKAGE $THIS_SCRIPT warning: $*" -} - -die () { - # syntax: die message ... - # - # exit script with error message - message "$THIS_PACKAGE $THIS_SCRIPT error: $*" - exit $SHELL_LIB_THROWN_ERROR -} - -internal_error () { - # exit script with error; essentially a "THIS SHOULD NEVER HAPPEN" message - message "internal error: $*" - if [ -n "$OFFICIAL_BUILD" ]; then - message "Please report a bug in the $THIS_SCRIPT script of the" \ - "$THIS_PACKAGE package, version $SOURCE_VERSION to the Debian Bug" \ - "Tracking System. Include all messages above that mention the" \ - "$THIS_PACKAGE package. Visit " \ - " on the World Wide Web for" \ - "instructions, read the file" \ - "/usr/share/doc/debian/bug-reporting.txt from the doc-debian" \ - "package, or install the reportbug package and use the command of" \ - "the same name to file a report." - fi - exit $SHELL_LIB_INTERNAL_ERROR -} - -usage_error () { - message "usage error: $*" - message "Please report a bug in the $THIS_SCRIPT script of the" \ - "$THIS_PACKAGE package, version $SOURCE_VERSION to the Debian Bug" \ - "Tracking System. Include all messages above that mention the" \ - "$THIS_PACKAGE package. Visit " \ - " on the World Wide Web for" \ - "instructions, read the file" \ - "/usr/share/doc/debian/bug-reporting.txt from the doc-debian" \ - "package, or install the reportbug package and use the command of" \ - "the same name to file a report." - exit $SHELL_LIB_USAGE_ERROR -} - -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/packaging/xorg-x11-utils.spec b/packaging/xorg-x11-utils.spec index 3981f5e..8574055 100644 --- a/packaging/xorg-x11-utils.spec +++ b/packaging/xorg-x11-utils.spec @@ -2,7 +2,7 @@ Summary: X.Org X11 X client utilities Name: xorg-x11-utils -Version: 7.5 +Version: 7.5.1 Release: 6 License: MIT Group: User Interface/X @@ -12,13 +12,13 @@ Source: %{name}-%{version}.tar.gz BuildRequires: pkgconfig(dmx) pkgconfig(xext) pkgconfig(xft) pkgconfig(xrandr) #BuildRequires: pkgconfig(dmx) pkgconfig(gl) pkgconfig(xext) pkgconfig(xft) BuildRequires: pkgconfig(xi) pkgconfig(xinerama) pkgconfig(xmu) -BuildRequires: pkgconfig(xpm) pkgconfig(xt) pkgconfig(xtst) pkgconfig(xv) +BuildRequires: pkgconfig(xt) pkgconfig(xtst) pkgconfig(xv) BuildRequires: pkgconfig(xxf86dga) pkgconfig(xxf86vm) BuildRequires: pkgconfig(xcb) pkgconfig(xcb-atom) -%define DEF_SUBDIRS xdpyinfo xev xlsatoms xlsclients xlsfonts xprop xvinfo xwininfo +%define DEF_SUBDIRS xdpyinfo xev xprop xvinfo xwininfo -Provides: %{DEF_SUBDIRS} edid-decode +Provides: %{DEF_SUBDIRS} edid-decode %description A collection of client utilities which can be used to query the X server @@ -32,7 +32,7 @@ for various information. { for app in %{DEF_SUBDIRS}; do pushd $app - %configure \ + %reconfigure \ --disable-xprint \ RSH=rsh \ MANCONF="/etc/manpath.config" @@ -42,6 +42,8 @@ for various information. %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 @@ -57,7 +59,9 @@ rm -rf $RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT %files +%manifest xorg-x11-utils.manifest %defattr(-,root,root,-) +/usr/share/license/%{name} #%doc %{_bindir}/* #%{_bindir}/edid-decode diff --git a/xdpyinfo/Makefile.am b/xdpyinfo/Makefile.am old mode 100644 new mode 100755 index 2f21dda..3134713 --- a/xdpyinfo/Makefile.am +++ b/xdpyinfo/Makefile.am @@ -35,7 +35,11 @@ AM_CFLAGS = \ $(DPY_XCOMPOSITE_CFLAGS) \ $(DPY_XINERAMA_CFLAGS) \ $(DPY_DMX_CFLAGS) \ - $(DPY_XTST_CFLAGS) + $(DPY_XTST_CFLAGS) \ + -fPIE +AM_LDFLAGS = \ + $(XDPYINFO_LDFLAGS) \ + -pie xdpyinfo_LDADD = \ $(XDPYINFO_LIBS) \ diff --git a/xev/Makefile.am b/xev/Makefile.am old mode 100644 new mode 100755 index a100a1d..8c85771 --- a/xev/Makefile.am +++ b/xev/Makefile.am @@ -22,7 +22,8 @@ SUBDIRS = man bin_PROGRAMS = xev -AM_CFLAGS = $(CWARNFLAGS) $(XEV_CFLAGS) +AM_CFLAGS = $(CWARNFLAGS) $(XEV_CFLAGS) -fPIE +AM_LDFLAGS = $(XEV_LDFLAGS) -pie xev_LDADD = $(XEV_LIBS) xev_SOURCES = \ diff --git a/xlsatoms/Makefile.am b/xlsatoms/Makefile.am old mode 100644 new mode 100755 index 5cc70fe..9483fa4 --- a/xlsatoms/Makefile.am +++ b/xlsatoms/Makefile.am @@ -22,7 +22,8 @@ SUBDIRS = man bin_PROGRAMS = xlsatoms -AM_CFLAGS = $(CWARNFLAGS) $(XLSATOMS_CFLAGS) +AM_CFLAGS = $(CWARNFLAGS) $(XLSATOMS_CFLAGS) -fPIE +AM_CFLAGS = $(XLSATOMS_LDFLAGS) -pie xlsatoms_LDADD = $(XLSATOMS_LIBS) xlsatoms_SOURCES = \ diff --git a/xlsclients/Makefile.am b/xlsclients/Makefile.am old mode 100644 new mode 100755 index 0fb5667..1ffdb71 --- a/xlsclients/Makefile.am +++ b/xlsclients/Makefile.am @@ -22,7 +22,8 @@ SUBDIRS = man bin_PROGRAMS = xlsclients -AM_CFLAGS = $(CWARNFLAGS) $(XLSCLIENTS_CFLAGS) +AM_CFLAGS = $(CWARNFLAGS) $(XLSCLIENTS_CFLAGS) -fPIE +AM_LDFLAGS = $(XLSCLIENTS_LDFLAGS) -pie xlsclients_LDADD = $(XLSCLIENTS_LIBS) $(LIBOBJS) xlsclients_SOURCES = \ diff --git a/xlsfonts/Makefile.am b/xlsfonts/Makefile.am old mode 100644 new mode 100755 index e6a1df8..dd56c7e --- a/xlsfonts/Makefile.am +++ b/xlsfonts/Makefile.am @@ -21,7 +21,8 @@ bin_PROGRAMS = xlsfonts -AM_CFLAGS = $(XLSFONTS_CFLAGS) $(CWARNFLAGS) +AM_CFLAGS = $(XLSFONTS_CFLAGS) $(CWARNFLAGS) -fPIE +AM_LDFLAGS = $(XLSFONTS_LDFLAGS) -pie xlsfonts_LDADD = $(XLSFONTS_LIBS) xlsfonts_SOURCES = \ diff --git a/xorg-x11-utils.manifest b/xorg-x11-utils.manifest new file mode 100644 index 0000000..34e771a --- /dev/null +++ b/xorg-x11-utils.manifest @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/xprop/Makefile.am b/xprop/Makefile.am old mode 100644 new mode 100755 index f2b3b88..52adeb4 --- a/xprop/Makefile.am +++ b/xprop/Makefile.am @@ -22,7 +22,8 @@ SUBDIRS = man bin_PROGRAMS = xprop -AM_CFLAGS = $(CWARNFLAGS) $(XPROP_CFLAGS) +AM_CFLAGS = $(CWARNFLAGS) $(XPROP_CFLAGS) -fPIE +AM_LDFLAGS = $(XPROP_LDFLAGS) -pie xprop_LDADD = $(XPROP_LIBS) xprop_SOURCES = \ diff --git a/xvinfo/Makefile.am b/xvinfo/Makefile.am old mode 100644 new mode 100755 index 1c0f68b..3449af7 --- a/xvinfo/Makefile.am +++ b/xvinfo/Makefile.am @@ -21,7 +21,8 @@ bin_PROGRAMS = xvinfo -AM_CFLAGS = $(CWARNFLAGS) $(XVINFO_CFLAGS) +AM_CFLAGS = $(CWARNFLAGS) $(XVINFO_CFLAGS) -fPIE +AM_LDFLAGS = $(XVINFO_LDFLAGS) -pie xvinfo_LDADD = $(XVINFO_LIBS) xvinfo_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/xwininfo/Makefile.am b/xwininfo/Makefile.am old mode 100644 new mode 100755 index 1bb0664..e3f62b6 --- a/xwininfo/Makefile.am +++ b/xwininfo/Makefile.am @@ -22,7 +22,8 @@ SUBDIRS = man bin_PROGRAMS = xwininfo -AM_CFLAGS = $(CWARNFLAGS) $(XWININFO_CFLAGS) +AM_CFLAGS = $(CWARNFLAGS) $(XWININFO_CFLAGS) -fPIE +AM_LDFLAGS = $(XWININFO_LDFLAGS) -pie xwininfo_LDADD = $(XWININFO_LIBS) $(LIBOBJS) xwininfo_SOURCES = \ -- 2.7.4