diffstat of debian/ for xorg-gtest_0.7.1-1 xorg-gtest_0.2.0-0ubuntu2 README.source | 1 changelog | 109 ------ control | 18 - copyright | 269 --------------- copyright.in | 171 --------- libxorg-gtest-data.install | 1 libxorg-gtest-dev.install | 2 libxorg-gtest-doc.doc-base | 9 libxorg-gtest-doc.install | 1 patches/0001-device-add-HasEvent-and-GetAbsData.patch | 309 ------------------ patches/README | 3 patches/gtest_extra_ldflags.patch | 25 - patches/series | 4 patches/va_list_usage_armhf.patch | 91 ----- rules | 16 source/format | 2 watch | 2 17 files changed, 30 insertions(+), 1003 deletions(-) diff -Nru xorg-gtest-0.7.1/debian/README.source xorg-gtest-0.2.0/debian/README.source --- xorg-gtest-0.7.1/debian/README.source 1970-01-01 00:00:00.000000000 +0000 +++ xorg-gtest-0.2.0/debian/README.source 2019-04-09 09:38:25.000000000 +0000 @@ -0,0 +1 @@ +Please see /usr/share/doc/quilt/README.source. diff -Nru xorg-gtest-0.7.1/debian/changelog xorg-gtest-0.2.0/debian/changelog --- xorg-gtest-0.7.1/debian/changelog 2017-05-29 11:29:34.000000000 +0000 +++ xorg-gtest-0.2.0/debian/changelog 2019-04-09 09:38:25.000000000 +0000 @@ -1,112 +1,3 @@ -xorg-gtest (0.7.1-1) experimental; urgency=medium - - * Initial upload to Debian. (Closes: #699403). - * debian/*: Debianize Ubuntu package (Maintainer: field, Uploaders: field, - Vcs-*: fields, etc.). - - * debian/watch: - + Update upstream URL. - * debian/control: - + Add get-orig-source rule. - + Avoid FTBFS on well-known architecture that do not have valgrind - available. - * debian/rules: - + Don't run unit tests in parallel. We saw build failures hinting to a - not-yet-started Xvfb instance. - + Use doc's package folder as --docdir in configure run. - * debian/{control,rules}: - + Avoid duplicate files in doxygen generated docs. - * debian/copyright: - + Add auto-generated copyright.in file. - + Rewrite from scratch. Ubuntu had GPL-3+ everywhere whereas upstream has - MIT/X11 in most places. Mention files individually. - * debian/README.source: - + Drop. Quilt packaging should not require a README anymore nowadays. - * debian/*.doc-base: - + Add API documentation to doc-base. - * debian/patches: - + Mention our patch naming scheme in a README file. - - -- Mike Gabriel Mon, 29 May 2017 13:29:34 +0200 - -xorg-gtest (0.7.1-0ubuntu1) saucy; urgency=low - - * New upstream release - * Drop upstreamed patches. - - 0001-fix-example-failures.patch - - 0002-fix-valgrind-test-failure.patch - - 0003-remove-timeout-truncation-warning.patch - * Add upstream patch. - - 0001-device-add-HasEvent-and-GetAbsData.patch - - -- Maarten Lankhorst Tue, 16 Jul 2013 10:40:34 +0200 - -xorg-gtest (0.7.0-0ubuntu5) raring; urgency=low - - * debian/patches/gtest_extra_ldflags.patch: push extra LDFLAGS required to - build against gtest / X11. - - -- Mathieu Trudel-Lapierre Mon, 04 Mar 2013 16:25:12 -0500 - -xorg-gtest (0.7.0-0ubuntu4) raring; urgency=low - - * debian/patches/va_list_usage_armhf.patch: Fix FTBFS on armhf: you can't - compare va_list to NULL directly due to its implementation on arm. - (LP: #1136306) - - -- Mathieu Trudel-Lapierre Thu, 28 Feb 2013 15:27:13 -0500 - -xorg-gtest (0.7.0-0ubuntu3) raring; urgency=low - - * debian/patches/0003-remove-timeout-truncation-warning.patch: - Elimiate compile-time warnings that cause problems when -Werror is enabled - (lp: #1110728). - - -- Stephen M. Webb Wed, 30 Jan 2013 17:03:28 -0500 - -xorg-gtest (0.7.0-0ubuntu2) raring; urgency=low - - * debian/libxorg-test-dev.install: only install files from usr/include/xorg, - so as not to try to install files already owned by libgtest-dev (esp. since - we Depends on libgtest-dev anyway...) - * debian/rules: explicitly remove usr/include/gtest from the install; it's - provided by libgtest-dev. (LP: #1102478) - - -- Mathieu Trudel-Lapierre Mon, 21 Jan 2013 11:43:24 -0500 - -xorg-gtest (0.7.0-0ubuntu1) raring; urgency=low - - * New upstream release (lp: #1100382). - * debian/control: added valgrind as a build dependency (for tests). - * debian/source/format: changed to 3.0 (quilt) - * fixed 'make check' target so it does not fail in Ubuntu - * debian/control (Standards-Version): updated to 3.9.4 (no changes required) - * debian/copyright: updated - - -- Stephen M. Webb Fri, 18 Jan 2013 16:11:32 -0500 - -xorg-gtest (0.3.0-0ubuntu2) quantal; urgency=low - - * debian/control: Depends on xserver-xorg-video-dummy, it seems required - (without it ido would bail on in tests) - - -- Sebastien Bacher Wed, 22 Aug 2012 11:18:40 +0200 - -xorg-gtest (0.3.0-0ubuntu1) quantal; urgency=low - - * Ship usr/share/X11/xorg.conf.d/99-virtual-test-devices.conf - * Update to version 0.3.0 - - Prevent other X servers from grabbing test devices - - Kill dummy server if test program dies - - Provide a full X server layout to ensure the dummy video driver is used - - Wait for dummy server to shut down before exiting - - Namespace header filenames to prevent clashes with other headers - - Better logging and error handling - - Perform checks to see if dummy server could start before attempting - - Enable the highest verbosity level for the dummy server log file - - -- Chase Douglas Fri, 08 Jun 2012 12:39:52 -0700 - xorg-gtest (0.2.0-0ubuntu2) precise; urgency=low * Make libxorg-gtest-dev depend on xutils-dev >= 1:7.7~1 (LP: #960528) diff -Nru xorg-gtest-0.7.1/debian/control xorg-gtest-0.2.0/debian/control --- xorg-gtest-0.7.1/debian/control 2017-05-29 11:29:34.000000000 +0000 +++ xorg-gtest-0.2.0/debian/control 2019-04-09 09:38:25.000000000 +0000 @@ -1,8 +1,7 @@ Source: xorg-gtest Priority: extra -Maintainer: Ayatana Packagers -Uploaders: - Mike Gabriel +Maintainer: Ubuntu X-SWAT +XSBC-Original-Maintainer: Daniel d'Andrada Build-Depends: automake, debhelper (>= 9), dh-autoreconf, @@ -10,27 +9,22 @@ libgtest-dev, libtool, libx11-dev, - libxi-dev, pkg-config, - rdfind, - symlinks, - valgrind [!arm64 !ppc64el !armel !alpha !hppa !hurd-i386 !kfreebsd-amd64 !kfreebsd-i386 !m68k !powerpcspe !sh4 !sparc64 !x32], + quilt, xserver-xorg-core, xserver-xorg-dev, xserver-xorg-video-dummy, xutils-dev (>= 1:7.7~1) -Standards-Version: 3.9.8 +Standards-Version: 3.9.3 Section: libs -Homepage: https://cgit.freedesktop.org/xorg/test/xorg-gtest/ -Vcs-Git: https://anonscm.debian.org/git/pkg-ayatana/xorg-gtest.git -Vcs-Browser: https://anonscm.debian.org/git/pkg-ayatana/xorg-gtest.git +Vcs-Git: git://anongit.freedesktop.org/~cndougla/xorg-gtest +Vcs-Browser: http://cgit.freedesktop.org/~cndougla/xorg-gtest Package: libxorg-gtest-dev Section: libdevel Architecture: all Depends: libgtest-dev, libxorg-gtest-data (= ${source:Version}), - xserver-xorg-video-dummy, xutils-dev (>= 1:7.7~1), ${misc:Depends} Description: X.Org dummy testing environment for Google Test - headers diff -Nru xorg-gtest-0.7.1/debian/copyright xorg-gtest-0.2.0/debian/copyright --- xorg-gtest-0.7.1/debian/copyright 2017-05-29 11:29:34.000000000 +0000 +++ xorg-gtest-0.2.0/debian/copyright 2019-04-09 09:38:25.000000000 +0000 @@ -1,259 +1,20 @@ -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0 +Format: http://dep.debian.net/deps/dep5 Upstream-Name: xorg-gtest -Upstream-Contact: Peter Hutter Source: http://cgit.freedesktop.org/xorg/test/xorg-gtest -Files: ChangeLog - INSTALL - README - configure.ac - data/X11/xorg.conf.d/99-virtual-test-devices.conf - data/xorg/gtest/dummy.conf - doc/Doxyfile.in - gtest/README - examples/xorg-gtest-environment-example.cpp - examples/xorg-gtest-example.cpp - src/defines.h - test/PIXART-USB-OPTICAL-MOUSE.desc - test/SynPS2-Synaptics-TouchPad.desc - test/device-test.cpp - test/process-test-helper.cpp - test/process-test.cpp - test/xserver-test-helper.cpp - test/xserver-test.cpp - xorg-gtest.pc.in -Copyright: 2011-2012, Canonical, Ltd. -License: MIT~X11 -Comment: - Assuming copyright holdership and license from the - other code files in this package. - -Files: Makefile.in - aclocal.m4 - aclocal/Makefile.in - data/Makefile - data/Makefile.in - doc/Makefile.in - examples/Makefile.in - gtest/Makefile.in - gtest/include/Makefile.in - include/Makefile.in - src/Makefile.in - test/Makefile.in -Copyright: 1994-2012, Free Software Foundation, Inc. - 1996-2012, Free Software Foundation, Inc. -License: GENERATED-FILE - -Files: Makefile.am - aclocal/Makefile.am - aclocal/xorg-gtest.m4 - data/Makefile.am - doc/Makefile.am - examples/Makefile.am - include/Makefile.am - src/Makefile-xorg-gtest.am - src/Makefile.am -Copyright: 2011-2012, Canonical, Ltd. - 2012, Canonical, Ltd. -License: MIT~X11 - -Files: include/xorg/gtest/evemu/xorg-gtest-device.h - include/xorg/gtest/xorg-gtest-environment.h - include/xorg/gtest/xorg-gtest-process.h - include/xorg/gtest/xorg-gtest-test.h - src/device.cpp - src/environment.cpp - src/test.cpp -Copyright: 2011-2012, Canonical Ltd. - 2012, Canonical Ltd. - 2012, Red Hat, Inc. -License: MIT~X11 - -Files: gtest/include/gtest/gtest-spi.h - gtest/include/gtest/gtest.h - gtest/src/gtest-all.cc - gtest/src/gtest_main.cc -Copyright: 2005, Google Inc. - 2006, Google Inc. - 2007, Google Inc. - 2008, Google Inc. -License: BSD-3-clause - -Files: config.guess - config.sub - depcomp - missing -Copyright: 1992-2012, Free Software Foundation, Inc. - 1996-2012, Free Software Foundation, Inc. - 1999-2012, Free Software Foundation, Inc. -License: GPL-2+ - -Files: include/xorg/gtest/xorg-gtest.h - src/process.cpp - src/xorg-gtest-all.cpp - src/xorg-gtest_main.cpp -Copyright: 2011-2012, Canonical Ltd. -License: MIT~X11 - -Files: test/Makefile.am -Copyright: 2011-2012, Canonical, Ltd. - 2012, Red Hat, Inc. -License: MIT~X11 - -Files: gtest/Makefile.am - gtest/include/Makefile.am -Copyright: 2012, Red Hat, Inc -License: MIT~X11 - -Files: include/xorg/gtest/xorg-gtest-xserver.h - src/xserver.cpp -Copyright: 2012, Red Hat, Inc. -License: MIT~X11 - -Files: m4/ac_define_dir.m4 -Copyright: 2008, Alexandre Oliva - 2008, Andreas Schwab - 2008, Guido U. Draheim - 2008, Stepan Kasal -License: FSF~All-Permissive - -Files: configure -Copyright: 1992-1996, 1998-2012, Free Software Foundation, Inc. -License: FSF~Unlimited - -Files: install-sh -Copyright: 1994, X Consortium -License: MIT~X11+BSD-like - -Files: debian/* -Copyright: 2011-2012, Canonical, Ltd. - 2017, Mike Gabriel -License: MIT~X11 - - -License: MIT~X11 - 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. - -License: MIT~X11+BSD-like - Permission is hereby granted, free of charge, to any person obtaining a copy - of this software and associated documentation files (the "Software"), to - deal in the Software without restriction, including without limitation the - rights to use, copy, modify, merge, publish, distribute, sublicense, and/or - sell copies of the Software, and to permit persons to whom the Software is - furnished to do so, subject to the following conditions: - . - The above copyright notice and this permission notice shall be included in - all copies or substantial portions of the Software. - . - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN - AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC- - TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - . - Except as contained in this notice, the name of the X Consortium shall not - be used in advertising or otherwise to promote the sale, use or other deal- - ings in this Software without prior written authorization from the X Consor- - tium. - -License: BSD-3-clause - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions are - met: - . - * Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above - copyright notice, this list of conditions and the following disclaimer - in the documentation and/or other materials provided with the - distribution. - * Neither the name of Google Inc. nor the names of its - contributors may be used to endorse or promote products derived from - this software without specific prior written permission. - . - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -License: GPL-2+ - This program is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the - Free Software Foundation; either version 2 of the License, or (at your - option) any later version. - . - This program is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - . - You should have received a copy of the GNU General Public License along - with this program; if not, write to the Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - . - See /usr/share/common-licenses/GPL-2 for the full license text. - -License: FSF~All-Permissive - Copying and distribution of this file, with or without modification, are - permitted in any medium without royalty provided the copyright notice - and this notice are preserved. - -License: FSF~Unlimited - This configure script is free software; the Free Software Foundation - gives unlimited permission to copy, distribute and modify it. - -License: GENERATED-FILE - This Makefile.in is free software; the Free Software Foundation - gives unlimited permission to copy and/or distribute it, - with or without modifications, as long as this notice is preserved. +Files: * +Copyright: 2011-2012 Canonical Ltd. +License: GPL-3+ + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. . This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY, to the extent permitted by law; without - even the implied warranty of MERCHANTABILITY or FITNESS FOR A - PARTICULAR PURPOSE. - . - Makefile for the doc subdirectory of xorg-gtest - . - 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. + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + . + On Debian systems, the full text of the GNU General Public + License version 3 can be found in the file + `/usr/share/common-licenses/GPL-3'. diff -Nru xorg-gtest-0.7.1/debian/copyright.in xorg-gtest-0.2.0/debian/copyright.in --- xorg-gtest-0.7.1/debian/copyright.in 2017-05-29 11:29:34.000000000 +0000 +++ xorg-gtest-0.2.0/debian/copyright.in 1970-01-01 00:00:00.000000000 +0000 @@ -1,171 +0,0 @@ -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ -Upstream-Name: FIXME -Upstream-Contact: FIXME -Source: FIXME -Disclaimer: Autogenerated by CDBS - -Files: ChangeLog - README - configure.ac - data/X11/xorg.conf.d/99-virtual-test-devices.conf - data/xorg/gtest/dummy.conf - debian/compat - debian/control - debian/docs - debian/files - debian/libxorg-gtest-data.install - debian/libxorg-gtest-dev.install - debian/libxorg-gtest-doc.install - debian/patches/0001-device-add-HasEvent-and-GetAbsData.patch - debian/patches/README - debian/patches/gtest_extra_ldflags.patch - debian/patches/series - debian/patches/va_list_usage_armhf.patch - debian/rules - debian/source/format - debian/watch - examples/xorg-gtest-environment-example.cpp - examples/xorg-gtest-example.cpp - src/defines.h - test/PIXART-USB-OPTICAL-MOUSE.desc - test/device-test.cpp - test/process-test-helper.cpp - test/process-test.cpp - test/xserver-test-helper.cpp - test/xserver-test.cpp - xorg-gtest.pc.in -Copyright: NONE -License: UNKNOWN - FIXME - -Files: Makefile.in - aclocal.m4 - aclocal/Makefile.in - data/Makefile - data/Makefile.in - doc/Makefile.in - examples/Makefile.in - gtest/Makefile.in - gtest/include/Makefile.in - include/Makefile.in - src/Makefile.in - test/Makefile.in -Copyright: 1994-2012, Free Software Foundation, Inc. - 1996-2012, Free Software Foundation, Inc. -License: GENERATED FILE - FIXME - -Files: Makefile.am - aclocal/Makefile.am - aclocal/xorg-gtest.m4 - data/Makefile.am - doc/Makefile.am - examples/Makefile.am - include/Makefile.am - src/Makefile-xorg-gtest.am - src/Makefile.am -Copyright: 2011-2012, Canonical, Ltd. - 2012, Canonical, Ltd. -License: UNKNOWN - FIXME - -Files: include/xorg/gtest/evemu/xorg-gtest-device.h - include/xorg/gtest/xorg-gtest-environment.h - include/xorg/gtest/xorg-gtest-process.h - include/xorg/gtest/xorg-gtest-test.h - src/device.cpp - src/environment.cpp - src/test.cpp -Copyright: 2011-2012, Canonical Ltd. - 2012, Canonical Ltd. - 2012, Red Hat, Inc. -License: UNKNOWN - FIXME - -Files: gtest/include/gtest/gtest-spi.h - gtest/include/gtest/gtest.h - gtest/src/gtest-all.cc - gtest/src/gtest_main.cc -Copyright: 2005, Google Inc. - 2006, Google Inc. - 2007, Google Inc. - 2008, Google Inc. -License: BSD (3 clause) - FIXME - -Files: config.guess - config.sub - depcomp - missing -Copyright: 1992-2012, Free Software Foundation, Inc. - 1996-2012, Free Software Foundation, Inc. - 1999-2012, Free Software Foundation, Inc. -License: GPL (v2 or later) GENERATED FILE - FIXME - -Files: include/xorg/gtest/xorg-gtest.h - src/process.cpp - src/xorg-gtest-all.cpp - src/xorg-gtest_main.cpp -Copyright: 2011-2012, Canonical Ltd. -License: UNKNOWN - FIXME - -Files: doc/Doxyfile.in - gtest/README -Copyright: NONE -License: GENERATED FILE - FIXME - -Files: COPYING - test/Makefile.am -Copyright: 2011-2012, Canonical, Ltd. - 2012, Red Hat, Inc. -License: UNKNOWN - FIXME - -Files: gtest/Makefile.am - gtest/include/Makefile.am -Copyright: 2012, Red Hat, Inc -License: UNKNOWN - FIXME - -Files: include/xorg/gtest/xorg-gtest-xserver.h - src/xserver.cpp -Copyright: 2012, Red Hat, Inc. -License: UNKNOWN - FIXME - -Files: debian/copyright -Copyright: -format/1.0 -License: BSD (3 clause) GPL (v3 or later) - FIXME - -Files: m4/ac_define_dir.m4 -Copyright: 2008, Alexandre Oliva - 2008, Andreas Schwab - 2008, Guido U. Draheim - 2008, Stepan Kasal -License: FSF All Permissive - FIXME - -Files: configure -Copyright: 1992-1996, 1998-2012, Free Software Foundation, Inc. -License: FSF Unlimited GENERATED FILE - FIXME - -Files: install-sh -Copyright: 1994, X Consortium -License: MIT/X11 (BSD like) - FIXME - -Files: INSTALL -Copyright: 1994-1996, 1999-2002, 2004-2008, Free Software Foundation, Inc. -License: UNKNOWN - FIXME - -Files: debian/changelog -Copyright: updated -License: UNKNOWN - FIXME - diff -Nru xorg-gtest-0.7.1/debian/libxorg-gtest-data.install xorg-gtest-0.2.0/debian/libxorg-gtest-data.install --- xorg-gtest-0.7.1/debian/libxorg-gtest-data.install 2013-03-04 20:42:42.000000000 +0000 +++ xorg-gtest-0.2.0/debian/libxorg-gtest-data.install 2019-04-09 09:38:25.000000000 +0000 @@ -1,2 +1 @@ -usr/share/X11/xorg.conf.d/99-virtual-test-devices.conf usr/share/xorg/gtest diff -Nru xorg-gtest-0.7.1/debian/libxorg-gtest-dev.install xorg-gtest-0.2.0/debian/libxorg-gtest-dev.install --- xorg-gtest-0.7.1/debian/libxorg-gtest-dev.install 2013-03-04 20:42:42.000000000 +0000 +++ xorg-gtest-0.2.0/debian/libxorg-gtest-dev.install 2019-04-09 09:38:25.000000000 +0000 @@ -1,4 +1,4 @@ -usr/include/xorg +usr/include usr/lib usr/share/aclocal usr/src diff -Nru xorg-gtest-0.7.1/debian/libxorg-gtest-doc.doc-base xorg-gtest-0.2.0/debian/libxorg-gtest-doc.doc-base --- xorg-gtest-0.7.1/debian/libxorg-gtest-doc.doc-base 2017-05-29 11:29:34.000000000 +0000 +++ xorg-gtest-0.2.0/debian/libxorg-gtest-doc.doc-base 1970-01-01 00:00:00.000000000 +0000 @@ -1,9 +0,0 @@ -Document: xorg-gtest -Title: X.Org dummy testing environment for Google Test -Author: Canonical Ltd. -Abstract: API documentation of X.org GTest -Section: Programming/C++ - -Format: HTML -Index: /usr/share/doc/libxorg-gtest-doc/html/index.html -Files: /usr/share/doc/libxorg-gtest-doc/html/ diff -Nru xorg-gtest-0.7.1/debian/libxorg-gtest-doc.install xorg-gtest-0.2.0/debian/libxorg-gtest-doc.install --- xorg-gtest-0.7.1/debian/libxorg-gtest-doc.install 2013-03-04 20:42:42.000000000 +0000 +++ xorg-gtest-0.2.0/debian/libxorg-gtest-doc.install 2019-04-09 09:38:25.000000000 +0000 @@ -1 +1,2 @@ usr/share/doc +usr/share/man diff -Nru xorg-gtest-0.7.1/debian/patches/0001-device-add-HasEvent-and-GetAbsData.patch xorg-gtest-0.2.0/debian/patches/0001-device-add-HasEvent-and-GetAbsData.patch --- xorg-gtest-0.7.1/debian/patches/0001-device-add-HasEvent-and-GetAbsData.patch 2013-07-16 08:43:32.000000000 +0000 +++ xorg-gtest-0.2.0/debian/patches/0001-device-add-HasEvent-and-GetAbsData.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,309 +0,0 @@ -From 879f0195c6174bbf9b9b621dd876c36237209cab Mon Sep 17 00:00:00 2001 -From: Peter Hutterer -Date: Fri, 11 Jan 2013 11:47:34 +1000 -Subject: [PATCH] device: add HasEvent() and GetAbsData() - -Signed-off-by: Peter Hutterer ---- - include/xorg/gtest/evemu/xorg-gtest-device.h | 25 ++++ - src/device.cpp | 21 ++++ - test/SynPS2-Synaptics-TouchPad.desc | 33 ++++++ - test/device-test.cpp | 167 +++++++++++++++++++++++++++ - 4 files changed, 246 insertions(+) - create mode 100644 test/SynPS2-Synaptics-TouchPad.desc - -diff --git a/include/xorg/gtest/evemu/xorg-gtest-device.h b/include/xorg/gtest/evemu/xorg-gtest-device.h -index 60087dd..61a9c01 100644 ---- a/include/xorg/gtest/evemu/xorg-gtest-device.h -+++ b/include/xorg/gtest/evemu/xorg-gtest-device.h -@@ -102,6 +102,31 @@ class Device { - */ - const std::string& GetDeviceNode(void); - -+ /** -+ * Check if a device supports a specific event. -+ * -+ * @param [in] type Type of the event (EV_REL, EV_ABS, ...) -+ * @param [in] code Event code (ABS_X, REL_Y, ...) -+ * -+ * @return true if this device supports this event or false otherwise. -+ */ -+ bool HasEvent(int type, int code); -+ -+ /** -+ * Retrieve data about an absolute axis on this device. -+ * -+ * @param [in] code The axis to query (e.g. ABS_X) -+ * @param [out] min Min value for this axis -+ * @param [out] max Max value for this axis -+ * @param [out] fuzz Fuzz value for this axis -+ * @param [out] flat Flat value for this axis -+ * @param [out] resolution Resolution of this axis -+ * -+ * @return false if this device doesn't have this axis, or true on success -+ */ -+ bool GetAbsData(int code, int *min, int *max, int *fuzz = NULL, int *flat = NULL, int *resolution = NULL); -+ -+ - private: - struct Private; - std::auto_ptr d_; -diff --git a/src/device.cpp b/src/device.cpp -index ea98d17..a57864d 100644 ---- a/src/device.cpp -+++ b/src/device.cpp -@@ -236,6 +236,27 @@ void xorg::testing::evemu::Device::PlayOne(int type, int code, int value, bool s - } - } - -+bool xorg::testing::evemu::Device::HasEvent(int type, int code) -+{ -+ return evemu_has_event(d_->device, type, code); -+} -+ -+bool xorg::testing::evemu::Device::GetAbsData(int code, int *min, int *max, int *fuzz, int *flat, int *resolution) -+{ -+ if (!HasEvent(EV_ABS, code)) -+ return false; -+ -+ *min = evemu_get_abs_minimum(d_->device, code); -+ *max = evemu_get_abs_maximum(d_->device, code); -+ if (fuzz) -+ *fuzz = evemu_get_abs_fuzz(d_->device, code); -+ if (flat) -+ *flat = evemu_get_abs_flat(d_->device, code); -+ if (resolution) -+ *resolution = evemu_get_abs_resolution(d_->device, code); -+ return true; -+} -+ - const std::string& xorg::testing::evemu::Device::GetDeviceNode(void) { - if (d_->device_node.empty()) - GuessDeviceNode(d_->ctime); -diff --git a/test/SynPS2-Synaptics-TouchPad.desc b/test/SynPS2-Synaptics-TouchPad.desc -new file mode 100644 -index 0000000..3f4982b ---- /dev/null -+++ b/test/SynPS2-Synaptics-TouchPad.desc -@@ -0,0 +1,33 @@ -+N: SynPS/2 Synaptics TouchPad -+I: 0011 0002 0007 01b1 -+P: 05 00 00 00 00 00 00 00 -+B: 00 0b 00 00 00 00 00 00 00 -+B: 01 00 00 00 00 00 00 00 00 -+B: 01 00 00 00 00 00 00 00 00 -+B: 01 00 00 00 00 00 00 00 00 -+B: 01 00 00 00 00 00 00 00 00 -+B: 01 00 00 01 00 00 00 00 00 -+B: 01 20 e5 00 00 00 00 00 00 -+B: 01 00 00 00 00 00 00 00 00 -+B: 01 00 00 00 00 00 00 00 00 -+B: 01 00 00 00 00 00 00 00 00 -+B: 01 00 00 00 00 00 00 00 00 -+B: 01 00 00 00 00 00 00 00 00 -+B: 01 00 00 00 00 00 00 00 00 -+B: 02 00 00 00 00 00 00 00 00 -+B: 03 03 00 00 11 00 80 60 06 -+B: 04 00 00 00 00 00 00 00 00 -+B: 05 00 00 00 00 00 00 00 00 -+B: 11 00 00 00 00 00 00 00 00 -+B: 12 00 00 00 00 00 00 00 00 -+B: 15 00 00 00 00 00 00 00 00 -+B: 15 00 00 00 00 00 00 00 00 -+A: 00 1472 5472 8 0 -+A: 01 1408 4448 8 0 -+A: 18 0 255 0 0 -+A: 1c 0 15 0 0 -+A: 2f 0 1 0 0 -+A: 35 1472 5472 8 0 -+A: 36 1408 4448 8 0 -+A: 39 0 65535 0 0 -+A: 3a 0 255 0 0 -diff --git a/test/device-test.cpp b/test/device-test.cpp -index 47ddb26..b7b411b 100644 ---- a/test/device-test.cpp -+++ b/test/device-test.cpp -@@ -2,6 +2,9 @@ - #include - - #ifdef HAVE_EVEMU -+#ifndef BTN_TOOL_QUINTTAP -+#define BTN_TOOL_QUINTTAP 0x148 -+#endif - - using namespace xorg::testing; - -@@ -24,6 +27,170 @@ TEST(Device, InotifyWait) - ASSERT_FALSE(d.GetDeviceNode().empty()); - } - -+TEST(Device, HasEvent) -+{ -+ XORG_TESTCASE("HasEvent must return the right bits.\n"); -+ -+ xorg::testing::evemu::Device d(TEST_ROOT_DIR "PIXART-USB-OPTICAL-MOUSE.desc"); -+ -+ for (int i = ABS_X; i < ABS_MAX; i++) -+ ASSERT_FALSE(d.HasEvent(EV_ABS, i)) << "Axis code " << i; -+ -+ for (int i = REL_X; i < REL_MAX; i++) { -+ if (i == REL_X || i == REL_Y || i == REL_WHEEL) -+ ASSERT_TRUE(d.HasEvent(EV_REL, i)) << "Axis code " << i; -+ else -+ ASSERT_FALSE(d.HasEvent(EV_REL, i)) << "Axis code " << i; -+ } -+ -+ for (int i = BTN_LEFT; i < KEY_MAX; i++) { -+ if (i == BTN_LEFT || i == BTN_RIGHT || i == BTN_MIDDLE) -+ ASSERT_TRUE(d.HasEvent(EV_KEY, i)) << "Axis code " << i; -+ else -+ ASSERT_FALSE(d.HasEvent(EV_KEY, i)) << "Axis code " << i; -+ } -+ -+ xorg::testing::evemu::Device d2(TEST_ROOT_DIR "SynPS2-Synaptics-TouchPad.desc"); -+ -+ for (int i = REL_X; i < REL_MAX; i++) -+ ASSERT_FALSE(d2.HasEvent(EV_REL, i)) << "Axis code " << i; -+ -+ for (int i = ABS_X; i < ABS_MAX; i++) { -+ switch (i) { -+ case ABS_X: -+ case ABS_Y: -+ case ABS_PRESSURE: -+ case ABS_TOOL_WIDTH: -+ case ABS_MT_SLOT: -+ case ABS_MT_POSITION_X: -+ case ABS_MT_POSITION_Y: -+ case ABS_MT_TRACKING_ID: -+ case ABS_MT_PRESSURE: -+ ASSERT_TRUE(d2.HasEvent(EV_ABS, i)) << "Axis code " << i; -+ break; -+ default: -+ ASSERT_FALSE(d2.HasEvent(EV_REL, i)) << "Axis code " << i; -+ break; -+ -+ } -+ } -+ -+ for (int i = BTN_LEFT; i < KEY_MAX; i++) { -+ switch (i) { -+ case BTN_LEFT: -+ case BTN_TOOL_FINGER: -+ case BTN_TOOL_QUINTTAP: -+ case BTN_TOUCH: -+ case BTN_TOOL_DOUBLETAP: -+ case BTN_TOOL_TRIPLETAP: -+ case BTN_TOOL_QUADTAP: -+ ASSERT_TRUE(d2.HasEvent(EV_KEY, i)) << "Axis code " << i; -+ break; -+ default: -+ ASSERT_FALSE(d2.HasEvent(EV_KEY, i)) << "Axis code " << i; -+ } -+ } -+ -+} -+ -+TEST(Device, AbsAxisData) { -+ XORG_TESTCASE("GetAbsData must return the right values.\n"); -+ -+ xorg::testing::evemu::Device d(TEST_ROOT_DIR "SynPS2-Synaptics-TouchPad.desc"); -+ -+ const int DEFAULT = -3; -+ -+ for (int i = ABS_X; i < ABS_MAX; i++) { -+ int min = 0, max = 0, fuzz = 0, flat = 0, resolution = 0; -+ bool axis_exists = 1; -+ -+ switch (i) { -+ case ABS_X: -+ case ABS_MT_POSITION_X: -+ min = 1472; -+ max = 5472; -+ fuzz = 8; -+ break; -+ case ABS_Y: -+ case ABS_MT_POSITION_Y: -+ min = 1408; -+ max = 4448; -+ fuzz = 8; -+ break; -+ case ABS_PRESSURE: -+ min = 0; -+ max = 255; -+ break; -+ case ABS_TOOL_WIDTH: -+ min = 0; -+ max = 15; -+ break; -+ case ABS_MT_SLOT: -+ min = 0; -+ max = 1; -+ break; -+ case ABS_MT_TRACKING_ID: -+ min = 0; -+ max = 65535; -+ break; -+ case ABS_MT_PRESSURE: -+ min = 0; -+ max = 255; -+ break; -+ default: -+ axis_exists = false; -+ break; -+ } -+ -+ if (axis_exists) { -+ int min_ret = min; -+ int max_ret = max; -+ int fuzz_ret = fuzz; -+ int flat_ret = flat; -+ int res_ret = resolution; -+ -+ ASSERT_TRUE(d.GetAbsData(i, &min_ret, &max_ret)) << "Axis code " << i; -+ ASSERT_EQ(min, min_ret); -+ ASSERT_EQ(max, max_ret); -+ -+ ASSERT_TRUE(d.GetAbsData(i, &min_ret, &max_ret, &fuzz)) << "Axis code " << i; -+ ASSERT_EQ(min, min_ret); -+ ASSERT_EQ(max, max_ret); -+ ASSERT_EQ(fuzz, fuzz_ret); -+ -+ ASSERT_TRUE(d.GetAbsData(i, &min_ret, &max_ret, &fuzz, &flat)) << "Axis code " << i; -+ ASSERT_EQ(min, min_ret); -+ ASSERT_EQ(max, max_ret); -+ ASSERT_EQ(fuzz, fuzz_ret); -+ ASSERT_EQ(flat, flat_ret); -+ -+ ASSERT_TRUE(d.GetAbsData(i, &min_ret, &max_ret, &fuzz, &flat, &res_ret)) << "Axis code " << i; -+ ASSERT_EQ(min, min_ret); -+ ASSERT_EQ(max, max_ret); -+ ASSERT_EQ(fuzz, fuzz_ret); -+ ASSERT_EQ(flat, flat_ret); -+ ASSERT_EQ(res_ret, resolution); -+ } else { -+ min = DEFAULT; -+ max = DEFAULT; -+ fuzz = DEFAULT; -+ flat = DEFAULT; -+ resolution = DEFAULT; -+ -+ ASSERT_FALSE(d.GetAbsData(i, &min, &max)) << "Axis code " << i; -+ -+ /* make sure we didn't overwrite the values */ -+ ASSERT_EQ(min, DEFAULT); -+ ASSERT_EQ(max, DEFAULT); -+ ASSERT_EQ(fuzz, DEFAULT); -+ ASSERT_EQ(flat, DEFAULT); -+ ASSERT_EQ(resolution, DEFAULT); -+ } -+ -+ } -+} -+ -+ - #endif - - int main(int argc, char *argv[]) { --- -1.8.3.2 - diff -Nru xorg-gtest-0.7.1/debian/patches/README xorg-gtest-0.2.0/debian/patches/README --- xorg-gtest-0.7.1/debian/patches/README 2017-05-19 13:27:38.000000000 +0000 +++ xorg-gtest-0.2.0/debian/patches/README 1970-01-01 00:00:00.000000000 +0000 @@ -1,3 +0,0 @@ -0xxx: Grabbed from upstream development. -1xxx: Possibly relevant for upstream adoption. -2xxx: Only relevant for official Debian release. diff -Nru xorg-gtest-0.7.1/debian/patches/gtest_extra_ldflags.patch xorg-gtest-0.2.0/debian/patches/gtest_extra_ldflags.patch --- xorg-gtest-0.7.1/debian/patches/gtest_extra_ldflags.patch 2013-03-04 20:47:38.000000000 +0000 +++ xorg-gtest-0.2.0/debian/patches/gtest_extra_ldflags.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,25 +0,0 @@ -From: Mathieu Trudel-Lapierre -Subject: Shoot extra LDFLAGS which seem to be needed to build against xorg-gtest - -... Which broke ido, and a few indicators by their inexistence. - -=== modified file 'aclocal/xorg-gtest.m4' ---- a/aclocal/xorg-gtest.m4 2013-01-18 16:11:32 +0000 -+++ b/aclocal/xorg-gtest.m4 2013-03-04 20:40:19 +0000 -@@ -42,6 +42,7 @@ AC_DEFUN([CHECK_XORG_GTEST], - XORG_GTEST_CPPFLAGS=`$PKG_CONFIG --variable=CPPflags --print-errors xorg-gtest` - XORG_GTEST_CPPFLAGS="$GTEST_CPPFLAGS $XORG_GTEST_CPPFLAGS" - XORG_GTEST_CPPFLAGS="$XORG_GTEST_CPPFLAGS -I$XORG_GTEST_SOURCE" -+ XORG_GTEST_LDFLAGS="-lpthread -lX11 -lXi" - - PKG_CHECK_MODULES(X11, [x11], [have_x11=yes], [have_x11=no]) - -@@ -68,6 +69,7 @@ AC_DEFUN([CHECK_XORG_GTEST], - [AC_SUBST(GTEST_CPPFLAGS)] - [AC_SUBST(XORG_GTEST_SOURCE)] - [AC_SUBST(XORG_GTEST_CPPFLAGS)] -+ [AC_SUBST(XORG_GTEST_LDFLAGS)] - - # Get BASE_CXXFLAGS and STRICT_CXXFLAGS - [XORG_MACROS_VERSION(1.17)] - diff -Nru xorg-gtest-0.7.1/debian/patches/series xorg-gtest-0.2.0/debian/patches/series --- xorg-gtest-0.7.1/debian/patches/series 2013-07-16 08:44:27.000000000 +0000 +++ xorg-gtest-0.2.0/debian/patches/series 2019-04-09 09:38:25.000000000 +0000 @@ -1,3 +1 @@ -0001-device-add-HasEvent-and-GetAbsData.patch -va_list_usage_armhf.patch -gtest_extra_ldflags.patch +# No patches diff -Nru xorg-gtest-0.7.1/debian/patches/va_list_usage_armhf.patch xorg-gtest-0.2.0/debian/patches/va_list_usage_armhf.patch --- xorg-gtest-0.7.1/debian/patches/va_list_usage_armhf.patch 2013-03-04 20:42:42.000000000 +0000 +++ xorg-gtest-0.2.0/debian/patches/va_list_usage_armhf.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,91 +0,0 @@ -From: Mathieu Trudel-Lapierre -Subject: Fix FTBFS on armhf due to va_list's definition. - -This was breaking ido -- - -Basically, the Start(string, va_list) function was taking a second parameter -of type va_list, but that is implemented differently on amd64 or i386 as it is -on arm(hf,el). On armhf, it seems as though va_list is actually a struct and -as we call Start("xyz", NULL), it is the Start() function with this va_list -parameter that gets selected as a candidate rather than the just as good -Start(string, vector). - -This in turn causes build to fail because "if (args)" can't be evaluated. - -As NULL is what is passed, we can actually expect users to pass a *pointer* to -whatever va_list argument they may want to use, which will evaluate properly on -armhf of "if (args)", and continue on to getting each of the variadic lists' -arguments. - -=== modified file 'src/process.cpp' ---- - include/xorg/gtest/xorg-gtest-process.h | 6 +++--- - src/process.cpp | 6 +++--- - test/process-test.cpp | 2 ++ - 3 files changed, 8 insertions(+), 6 deletions(-) - -Index: b/src/process.cpp -=================================================================== ---- a/src/process.cpp -+++ b/src/process.cpp -@@ -124,13 +124,13 @@ void xorg::testing::Process::Start(const - d_->state = RUNNING; - } - --void xorg::testing::Process::Start(const std::string& program, va_list args) { -+void xorg::testing::Process::Start(const std::string& program, va_list* args) { - std::vector argv; - - if (args) { - char *arg; - do { -- arg = va_arg(args, char*); -+ arg = va_arg(*args, char*); - if (arg) - argv.push_back(std::string(arg)); - } while (arg); -@@ -142,7 +142,7 @@ void xorg::testing::Process::Start(const - void xorg::testing::Process::Start(const std::string& program, ...) { - va_list list; - va_start(list, program); -- Start(program, list); -+ Start(program, &list); - va_end(list); /* Shouldn't get here */ - } - -Index: b/test/process-test.cpp -=================================================================== ---- a/test/process-test.cpp -+++ b/test/process-test.cpp -@@ -10,6 +10,8 @@ - #include - - #include -+#include -+#include - - using namespace xorg::testing; - -Index: b/include/xorg/gtest/xorg-gtest-process.h -=================================================================== ---- a/include/xorg/gtest/xorg-gtest-process.h -+++ b/include/xorg/gtest/xorg-gtest-process.h -@@ -157,15 +157,15 @@ class Process { - * process. - * - * @param program The program to start. -- * @param args Variadic list of arguments passed to the program. This list -- * must end with NULL. -+ * @param args Pointer to a variadic list of arguments passed to the program. -+ * This list must end with NULL. - * - * @throws std::runtime_error on failure. - * - * @post If successful: Child process forked and program started. - * @post If successful: Subsequent calls to Pid() return child process pid. - */ -- void Start(const std::string& program, va_list args); -+ void Start(const std::string& program, va_list* args); - - /** - * Starts a program as a child process. diff -Nru xorg-gtest-0.7.1/debian/rules xorg-gtest-0.2.0/debian/rules --- xorg-gtest-0.7.1/debian/rules 2017-05-29 11:29:34.000000000 +0000 +++ xorg-gtest-0.2.0/debian/rules 2019-04-09 09:38:25.000000000 +0000 @@ -4,24 +4,14 @@ #export DH_VERBOSE=1 %: - dh $@ --parallel --with autoreconf + dh $@ --parallel --with quilt,autoreconf # Install xorg-gtest.pc file in architecture independent directory override_dh_auto_configure: - dh_auto_configure -- --libdir=/usr/lib \ - --docdir=/usr/share/doc/libxorg-gtest-doc + dh_auto_configure -- --libdir=/usr/lib override_dh_auto_build: dh_auto_build -- all doc override_dh_install: - rm -rf debian/tmp/usr/include/gtest - dh_install --fail-missing -Xjquery.js - rdfind -makesymlinks true debian/libxorg-gtest-doc/usr/share/doc/libxorg-gtest-doc/html/search/ - symlinks -c debian/libxorg-gtest-doc/usr/share/doc/libxorg-gtest-doc/html/search/ - -override_dh_auto_test: - dh_auto_test --no-parallel - -get-orig-source: - uscan --noconf --force-download --rename --download-current-version --destdir=.. + dh_install --fail-missing diff -Nru xorg-gtest-0.7.1/debian/source/format xorg-gtest-0.2.0/debian/source/format --- xorg-gtest-0.7.1/debian/source/format 2013-03-04 20:42:42.000000000 +0000 +++ xorg-gtest-0.2.0/debian/source/format 2019-04-09 09:38:25.000000000 +0000 @@ -1 +1 @@ -3.0 (quilt) +1.0 diff -Nru xorg-gtest-0.7.1/debian/watch xorg-gtest-0.2.0/debian/watch --- xorg-gtest-0.7.1/debian/watch 2017-05-29 11:13:32.000000000 +0000 +++ xorg-gtest-0.2.0/debian/watch 2019-04-09 09:38:25.000000000 +0000 @@ -1,2 +1,2 @@ version=3 -http://www.x.org/archive/individual/test/xorg-gtest-(.+).tar.bz2 +http://xorg.freedesktop.org/archive/individual/test/xorg-gtest-(.+).tar.gz