COPYING | 674 ++++++++++++ ChangeLog | 553 --------- Makefile.am | 5 configure.ac | 2 debian/changelog | 5 debian/patches/0001-Fix-linking-against-X-server-libs.patch | 29 debian/patches/series | 2 src/Makefile.am | 6 8 files changed, 687 insertions(+), 589 deletions(-)
New commits: commit 69ffa46b12380456af23d964b88bd95ba4bd6d74 Author: Chase Douglas <chase.doug...@canonical.com> Date: Fri Feb 24 08:53:26 2012 -0800 Update to xorg-gtest-0.1.1 diff --git a/ChangeLog b/ChangeLog deleted file mode 100644 index 5f7be9e..0000000 --- a/ChangeLog +++ /dev/null @@ -1,553 +0,0 @@ -commit 1f4bd9c267e70cf9ac8a57f90bf1795b0fa63d6c -Author: Chase Douglas <chase.doug...@canonical.com> -Date: Sat Feb 4 11:47:35 2012 -0800 - - Add symbol version scripts - - It would be nice to explicitly list each class method, but there's no - documentation on how to do it, and everything I try fails. At least this - ensures we don't ship visible symbols that are really part of GTest. - - Signed-off-by: Chase Douglas <chase.doug...@canonical.com> - Reviewed-by: Stephen Webb <stephen.w...@canonical.com> - -commit 4216fddec31fed8b141f6d6f233c31e73e651fde -Author: Daniel d'Andrada <daniel.dandr...@canonical.com> -Date: Mon Feb 6 09:29:46 2012 -0200 - - Make Environment API property-based. - - Instead of shoving all parameters in the constructor. - - Signed-off-by: Daniel d'Andrada <daniel.dandr...@canonical.com> - Reviewed-by: Chase Douglas <chase.doug...@canonical.com> - Signed-off-by: Chase Douglas <chase.doug...@canonical.com> - -commit d568a6c0626eeef038753f207f234037bbbb26e4 -Author: Chase Douglas <chase.doug...@canonical.com> -Date: Fri Feb 3 17:21:22 2012 -0800 - - Ship conf files - - Signed-off-by: Chase Douglas <chase.doug...@canonical.com> - -commit 50cd80649cd09800a245754bb7621de777026022 -Author: Chase Douglas <chase.doug...@canonical.com> -Date: Fri Feb 3 17:20:10 2012 -0800 - - Add defines.h to the list of source files - - This ensures the header is shipped in the dist tarball. - - Signed-off-by: Chase Douglas <chase.doug...@canonical.com> - -commit 24fbaa20c179ce4b4d9be9627bb41daffc91527a -Author: Jussi Pakkanen <jussi.pakka...@canonical.com> -Date: Thu Feb 2 14:36:32 2012 +0200 - - Fix build system. - - The project could not be built from scratch due to erroneous - Autofoo setup. This commit makes it work. - - Signed-off-by: Jussi Pakkanen <jussi.pakka...@canonical.com> - Reviewed-by: Chase Douglas <chase.doug...@canonical.com> - Signed-off-by: Chase Douglas <chase.doug...@canonical.com> - -commit 79b2d4e7f976621705bd32a9fd16e56c989a5a45 -Author: Chase Douglas <chase.doug...@canonical.com> -Date: Wed Feb 1 11:12:29 2012 -0800 - - And by default point to a location that doesn't require root privileges to be used. - - This will make it possible to run Xorg without being root. - - Signed-off-by: Daniel d'Andrada <daniel.dandr...@canonical.com> - -commit 656d8b22be42b23d5336a85173d7381bf115a327 -Merge: 37906b3 e5f21a6 -Author: Chase Douglas <chase.doug...@ubuntu.com> -Date: Wed Dec 21 08:30:43 2011 -0800 - - Merge some miscellaneous fixes - -commit e5f21a67393a5db4d91f07f87a649ec38d27fcc7 -Author: Chase Douglas <chase.doug...@ubuntu.com> -Date: Wed Dec 21 08:09:22 2011 -0800 - - Use "make doc" to build all documentation - - And clean up doc/Makefile.am targets. - -commit 739e52c343cdd412c0c4e9e21dd79be25b3027ca -Author: Chase Douglas <chase.doug...@ubuntu.com> -Date: Wed Dec 21 07:51:51 2011 -0800 - - Rename xorg_gtest_example to xorg-gtest-example - -commit c63e0369cc4c7db7ffe3109b6ea8ff478ac4ba91 -Author: Chase Douglas <chase.doug...@ubuntu.com> -Date: Wed Dec 21 07:51:10 2011 -0800 - - Install man pages too - -commit c276dc0ac292d54ffc00dcab83ce7cc056c6c3df -Author: Chase Douglas <chase.doug...@ubuntu.com> -Date: Wed Dec 21 07:49:58 2011 -0800 - - Start the so library version at 0.0.0 - -commit 37906b3c6431e470a07bbf5fd26784f5116b141c -Merge: 67c98e9 5f10cf0 -Author: Thomas Voß <thomas.v...@rub.de> -Date: Fri Dec 16 11:44:34 2011 +0100 - - Merged in lp:~chasedouglas/xorg-gtest/fixes. - -commit 67c98e96ab8ee10e2d399d1ed4fd1f20e3daffd5 -Merge: 286707f be95cf5 -Author: Chase Douglas <chase.doug...@ubuntu.com> -Date: Wed Dec 14 11:59:40 2011 -0800 - - Merge example documentation fixes - -commit 5f10cf0d7bc2492e53bba8dc2105c8a9b8445a18 -Author: Chase Douglas <chase.doug...@ubuntu.com> -Date: Wed Dec 14 11:34:01 2011 -0800 - - Fix gtest cpp flags - -commit c8a4e665b558f2e39b63bfe91a7081fc041887c2 -Author: Chase Douglas <chase.doug...@ubuntu.com> -Date: Wed Dec 14 11:18:49 2011 -0800 - - Use gtest lib path when checking for gtest library - -commit 5bbdf9fe259a3bde28192286de2a685457b49a50 -Author: Chase Douglas <chase.doug...@ubuntu.com> -Date: Wed Dec 14 11:11:25 2011 -0800 - - Use Process::SetEnv() in Environment::SetUp() - -commit 327d46a503ab1f57134e9d3a56f6792b151e8c03 -Author: Chase Douglas <chase.doug...@ubuntu.com> -Date: Wed Dec 14 11:10:59 2011 -0800 - - Make Process::GetEnv and SetEnv static methods - - They do not modify or use a Process object. They are merely helper - functions. - -commit 8b2947df181dba16e07bd399d33ef0ae60aebdeb -Author: Chase Douglas <chase.doug...@ubuntu.com> -Date: Wed Dec 14 11:01:39 2011 -0800 - - Move SetUp and TearDown methods to protected sections - -commit 7b18bcffa98443e736dbfde2848698f5e6d6efa9 -Author: Chase Douglas <chase.doug...@ubuntu.com> -Date: Wed Dec 14 11:00:13 2011 -0800 - - Don't install Doxyfile - -commit e51bcee92edeb7f3da577f9f2da2b6ecb96d17d4 -Author: Chase Douglas <chase.doug...@ubuntu.com> -Date: Wed Dec 14 10:54:33 2011 -0800 - - Only install documentation if it was created - -commit d5df40d00c6729dfdf1504d50f3658d3de22c5f5 -Author: Chase Douglas <chase.doug...@ubuntu.com> -Date: Wed Dec 14 10:38:44 2011 -0800 - - Remove leftover geistest doc line in doc/Makefile.am - -commit 286707f7a39ce7daa753994f35776ff2f273f07e -Author: Chase Douglas <chase.doug...@ubuntu.com> -Date: Wed Dec 14 10:29:22 2011 -0800 - - Don't link gtest when creating library - -commit be95cf5f4fccaf6393ac65f3c3f9254acfd8ee17 -Author: Chase Douglas <chase.doug...@ubuntu.com> -Date: Wed Dec 14 09:27:07 2011 -0800 - - Include examples directory when scanning for documented sources - -commit 42d3e9d818d4827ae001c50dd190fd477ffce593 -Author: Chase Douglas <chase.doug...@ubuntu.com> -Date: Wed Dec 14 09:21:30 2011 -0800 - - Remove license header from example - - It clutters up the example and is unnecessary for such a small file. - -commit 6f0204791b3057ad49719675f30810c1b2755aff -Merge: bb34e85 2e13892 -Author: Chase Douglas <chase.doug...@ubuntu.com> -Date: Wed Dec 14 09:13:34 2011 -0800 - - Merge in Doxygen branch, which also includes many fixes - -commit bb34e8586f1d74e4717dc8300bea6628b9a38804 -Merge: 4ee62b3 5b07f09 -Author: Chase Douglas <chase.doug...@ubuntu.com> -Date: Wed Dec 14 08:25:54 2011 -0800 - - Merge gtest configure check fixes - -commit 2e13892e9031e10dc91a2677295be654eb6b7747 -Author: Thomas Voß <thomas.v...@rub.de> -Date: Wed Dec 14 16:19:03 2011 +0100 - - Introduced examples. Added virtual d'tors to xorg::testing::Environment and xorg::testing::Test. - -commit 5b07f09f0713b670070e4d44ada2aeab3f6e883c -Author: Chase Douglas <chase.doug...@ubuntu.com> -Date: Tue Dec 13 17:30:48 2011 -0800 - - Use AC_LANG_PUSH(C++)/AC_LANG_POP so as not to contaminate configure.ac - -commit 9a493fa6cbaa61582092b2484ab2cf95edcc8dcf -Author: Chase Douglas <chase.doug...@ubuntu.com> -Date: Tue Dec 13 17:21:24 2011 -0800 - - Link against pthread when checking for gtest library - -commit 9b93e8df1f350fd1fc3cd0888c0bf565bf3e18f0 -Author: Chase Douglas <chase.doug...@ubuntu.com> -Date: Tue Dec 13 17:02:48 2011 -0800 - - Move check result test to configure.ac and use standard variables - -commit 41d0b41fc5b244438af787de687a4b341889cadc -Author: Chase Douglas <chase.doug...@ubuntu.com> -Date: Tue Dec 13 16:49:08 2011 -0800 - - Remove unnecessary HAVE_GTEST conditional in configure.ac - -commit 0ada1132294813196503527124d321093cb36e7f -Author: Chase Douglas <chase.doug...@ubuntu.com> -Date: Tue Dec 13 16:48:37 2011 -0800 - - Make gtest a requirement for successful configuration - - And switch to the non-deprecated AC_CHECK_LIB. - -commit 69569cba1db0c17ae04d5c26c62fd02fa6473191 -Author: Thomas Voß <thomas.v...@rub.de> -Date: Tue Dec 13 18:33:39 2011 +0100 - - Adjusted signature of Process::GetEnv. Adjusted documentation. - -commit 78ac5be868fd1e1d31300a61f8e425736c586b58 -Author: Thomas Voß <thomas.v...@rub.de> -Date: Tue Dec 13 10:15:24 2011 +0100 - - Fixed typo in test.h. - -commit 8ace60ed7cc70589de26ec3e5e409588a0f0bd00 -Author: Thomas Voß <thomas.v...@rub.de> -Date: Tue Dec 13 10:08:09 2011 +0100 - - Modified Process::Terminate and Process::Kill to reset process identifier. Adjusted documentation. - -commit 932bf1ec03ed9160c9784fdbb7f3a9456a5beb50 -Author: Thomas Voß <thomas.v...@rub.de> -Date: Tue Dec 13 10:00:07 2011 +0100 - - Adjusted documentation according to review. Switched to std::string for environment query/adjustment in Process. - -commit 07ffdc1266c3c3d7c5d2df56666567777fd54050 -Author: Thomas Voß <thomas.v...@rub.de> -Date: Tue Dec 13 07:37:37 2011 +0100 - - Prevent from linking Test in Google Test. Set HIDE_SCOPE_NAMES to NO. - -commit 4ee62b348d2346e03b6cbbfd94f710eda499d011 -Merge: bd17c14 934da76 -Author: Chase Douglas <chase.doug...@ubuntu.com> -Date: Mon Dec 12 11:28:13 2011 -0800 - - Merge cleanup and fixes branch - -commit bb43c8271894e29a5818fadacde9bb459a55e6e1 -Author: Thomas Voß <thomas.v...@rub.de> -Date: Mon Dec 12 09:44:51 2011 +0100 - - Referenced manpage of execvp in documentation. - -commit 6383f42858833f9695580f365352df30f4e33fb2 -Author: Thomas Voß <thomas.v...@rub.de> -Date: Mon Dec 12 09:31:21 2011 +0100 - - Fixed whitespace issue. - -commit e7ea9a0717b58af7aaf9728862df424c84e58b77 -Merge: f815612 934da76 -Author: Thomas Voß <thomas.v...@rub.de> -Date: Mon Dec 12 09:22:17 2011 +0100 - - Added: Additional doxygen documentation and adjusted build setup to include docs. - -commit 934da7636d0cc811600c2dd73c6cd386f0851e25 -Author: Chase Douglas <chase.doug...@ubuntu.com> -Date: Fri Dec 9 13:03:46 2011 -0800 - - Throw runtime_error if Test::SetUp fails to open connection to server - - gtest treats exceptions as test failures, so this should have the same - result but is a cleaner implementation. - -commit c0b553ebe1be0bf4c2ebffc1582a0e07f40aaa5a -Author: Chase Douglas <chase.doug...@ubuntu.com> -Date: Fri Dec 9 12:09:28 2011 -0800 - - Add initializer for Environment::Private struct since it is not a POD - -commit f815612acc574081880c62b64ba803f5305b8bc5 -Author: Thomas Voß <thomas.v...@rub.de> -Date: Fri Dec 9 09:58:35 2011 +0100 - - Added doxygen documentation for public interface classes. - -commit ef3e43e4edba9577097430bed545ad4c7dca3fb8 -Author: Chase Douglas <chase.doug...@ubuntu.com> -Date: Thu Dec 8 15:07:53 2011 -0800 - - Remove strdup from argument parsing in Process::Start() - - The data pointed to by the args should still be valid. There's no real - need to copy the data. - -commit 330dfc09ecc78cfd91a93ed5d41f31f0341e81a1 -Author: Chase Douglas <chase.doug...@ubuntu.com> -Date: Thu Dec 8 15:00:25 2011 -0800 - - Use std::vector to store process arguments passed to execvp - -commit 3eda6c1380ab4bdfaf891d6d20097dc83dac8e65 -Author: Chase Douglas <chase.doug...@ubuntu.com> -Date: Thu Dec 8 14:20:53 2011 -0800 - - Use std::auto_ptr for Test pimpl too - -commit 826c9bbf23fd5650cd2ca0e3314e4e8559b1061e -Author: Chase Douglas <chase.doug...@ubuntu.com> -Date: Thu Dec 8 14:09:23 2011 -0800 - - Use C++ headers, such as cstring, instead of C-compatibility headers - -commit 1bc40ffa16a3986d901bf602fcf17504afdf6cfc -Author: Chase Douglas <chase.doug...@ubuntu.com> -Date: Thu Dec 8 14:02:26 2011 -0800 - - Remove obsolete Process::SetEnvBehavior enum - -commit 6757be79645ba5a4e582e010934d1ef908896e9d -Author: Chase Douglas <chase.doug...@ubuntu.com> -Date: Thu Dec 8 13:59:34 2011 -0800 - - Use std::auto_ptr for pimpls - -commit 3ddfc3d8b1dd8a99126faa2eb05687eb08c279fb -Author: Chase Douglas <chase.doug...@ubuntu.com> -Date: Thu Dec 8 13:51:17 2011 -0800 - - Add newlines to end of Environment::TearDown() error messages - -commit ad2cdf9b4daf3193dc852342153719817c8b1fc0 -Author: Chase Douglas <chase.doug...@ubuntu.com> -Date: Thu Dec 8 13:50:11 2011 -0800 - - In Environment::SetUp, pass std::string into Process::Start - -commit dc354884d529bf6060a6a1537339527ad70d80a7 -Author: Chase Douglas <chase.doug...@ubuntu.com> -Date: Wed Dec 7 15:34:30 2011 -0800 - - Fix a couple usages of C++ line comments - - C++ line comments are only used for documenting end of namespace scopes - and #endif macros. - -commit 016ff9329130266f10edd7f4828bf22e59a8c97f -Author: Chase Douglas <chase.doug...@ubuntu.com> -Date: Wed Dec 7 14:46:28 2011 -0800 - - Add xorg::testing::Test base test fixture - -commit 3aea1bbbbb7f7ab8a76cdbfc110fa9c5ed14ae25 -Author: Chase Douglas <chase.doug...@ubuntu.com> -Date: Wed Dec 7 12:38:04 2011 -0800 - - Add server executable path option so one can test different servers - - Also, fix issues with the main option parsing code. - -commit 4f083dd6a3ea2473913d23aecf4d06f664f95bce -Author: Chase Douglas <chase.doug...@ubuntu.com> -Date: Wed Dec 7 12:40:30 2011 -0800 - - Reorder Process copy constructor declarations - -commit 8fe2c7c8bfc167c577674273f462f2d7c7a1a9fa -Author: Chase Douglas <chase.doug...@ubuntu.com> -Date: Wed Dec 7 12:27:12 2011 -0800 - - Fix comment in environment.h - -commit 3d4a10a0280ed3320ed221e33595623af8d20150 -Author: Chase Douglas <chase.doug...@ubuntu.com> -Date: Wed Dec 7 12:26:25 2011 -0800 - - Cleanup unnecessary braces in if .. else blocks in Environment::SetUp() - -commit 4348b83156925eee6f2cbdca24a2473ebfd90c9f -Author: Chase Douglas <chase.doug...@ubuntu.com> -Date: Wed Dec 7 12:24:59 2011 -0800 - - Don't fail the tests if the X server refuses to die - -commit e97811a1be63c97706fe3ca87a0568eb5a585a08 -Author: Chase Douglas <chase.doug...@ubuntu.com> -Date: Wed Dec 7 12:15:08 2011 -0800 - - Let setenv() and getenv() do error handling, and throw exception if they - fail - -commit bd446fb14847d6ab4d6531fb39309eea58aac4df -Author: Chase Douglas <chase.doug...@ubuntu.com> -Date: Wed Dec 7 12:09:04 2011 -0800 - - Throw exception if child process tries to kill itself - -commit f052b71de4ab05158b2b239d9d31d64e0aad76a4 -Author: Chase Douglas <chase.doug...@ubuntu.com> -Date: Wed Dec 7 12:05:26 2011 -0800 - - Remove Process::Wait() - - There are many ways to wait on the status of a process. We don't want to - get into wrapping all of them. Let the caller pick and choose from the - c library. - -commit 723704879e551b971e1e3504be7338e371d4981d -Author: Chase Douglas <chase.doug...@ubuntu.com> -Date: Wed Dec 7 12:02:05 2011 -0800 - - Rename Process::pid() to Process::Pid() to follow naming conventions - -commit 2a3c526f6f6d1e32a4f51bef557a26520fe01ef7 -Author: Chase Douglas <chase.doug...@ubuntu.com> -Date: Wed Dec 7 11:58:20 2011 -0800 - - Fix Process::Start() and switch to using exceptions - -commit 737e0bc858cb741407c24fc8597bd98f3c15a271 -Author: Chase Douglas <chase.doug...@ubuntu.com> -Date: Wed Dec 7 09:01:57 2011 -0800 - - Switch Process::Private to a POD struct - - Some other syntax cleanups too. - -commit c182eb93570139e18f8eeb3144e9ed5ccf3a3252 -Author: Chase Douglas <chase.doug...@ubuntu.com> -Date: Wed Dec 7 08:50:50 2011 -0800 - - Re-enable X server startup timeout - -commit eba6481ae557d05da0b151087a090d00496d1aa2 -Author: Chase Douglas <chase.doug...@ubuntu.com> -Date: Wed Dec 7 08:50:06 2011 -0800 - - Remove dead code in Environment - -commit 204cfd5c09eb1b40059d49b9864ee0f584630a4c -Author: Chase Douglas <chase.doug...@ubuntu.com> -Date: Wed Dec 7 08:47:56 2011 -0800 - - Make Environment::Private a POD struct - -commit 9c003eb98bc41d196847ab911d9d155c5a7972a4 -Author: Thomas Voß <thomas.v...@rub.de> -Date: Wed Dec 7 15:34:53 2011 +0100 - - ADDED: Simple and lightweight class to abstract process handling. - -commit bd17c146ff4a159393ec37f1300c613d40921bbf -Merge: 1ff7a96 7777cbb -Author: Thomas Voß <thomas.v...@rub.de> -Date: Tue Dec 6 11:16:25 2011 +0100 - - Merged. - -commit 7777cbbbd16d428d68fc738a946816edcb718654 -Author: Chase Douglas <chase.doug...@ubuntu.com> -Date: Mon Dec 5 16:25:36 2011 -0800 - - Use installed dummy.conf location - - Also, set the location in the pkg-config file so other packages can find - it. - -commit ad0ef22400f1b9960e15e0f6fe39b3e95701f21e -Author: Chase Douglas <chase.doug...@ubuntu.com> -Date: Mon Dec 5 16:02:22 2011 -0800 - - Rename testing::xorg to xorg::testing - - Prevents a possible collision with gtest's testing namespace - -commit e10564038f99adee0a12cb028cac5bd1610d7b40 -Author: Chase Douglas <chase.doug...@ubuntu.com> -Date: Mon Dec 5 11:32:36 2011 -0800 - - Remove unused fixture.h - -commit 4a1d0ed99f929b658e726f83e4ded4cc5e21aabc -Author: Chase Douglas <chase.doug...@ubuntu.com> -Date: Mon Dec 5 11:32:04 2011 -0800 - - Add pkg-config file - -commit 9fc1496d5a10266337773daff2b3d9937fbf8cf1 -Author: Chase Douglas <chase.doug...@ubuntu.com> -Date: Mon Dec 5 10:54:49 2011 -0800 - - Remove unused gcov support - -commit e1d5b252f4c09ee52380a7b7b7533a9b7c382975 -Author: Chase Douglas <chase.doug...@ubuntu.com> -Date: Mon Dec 5 10:53:37 2011 -0800 - - Remove autoconf check for C compiler since we only use C++ - -commit f4706dc1c47eb59bda619dc105a0e6e9f0a81a21 -Author: Chase Douglas <chase.doug...@ubuntu.com> -Date: Mon Dec 5 10:49:52 2011 -0800 - - Init gtest before checking for special args so --help works properly - - Otherwise, it's impossible to list the gtest help list. - -commit 26cdf7ae0eb8477b2c8afa97d3857d8810de3d99 -Author: Chase Douglas <chase.doug...@ubuntu.com> -Date: Mon Dec 5 10:47:31 2011 -0800 - - Remove unnecessary c++0x std flag - - We can add it back in if we actually use any of its features. - -commit d401f679f3e9161bbb06ce33bf48678c74329cd0 -Author: Chase Douglas <chase.doug...@ubuntu.com> -Date: Mon Dec 5 10:46:07 2011 -0800 - - Rename to xorg-gtest, move some files around, make some fixes - -commit 1ff7a967e0648d6f71bf3bc30e3642431765da7e -Author: Thomas Voß <thomas.v...@rub.de> -Date: Mon Dec 5 17:27:29 2011 +0100 - - init checkin. diff --git a/debian/changelog b/debian/changelog index 5076499..c131903 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,9 @@ -xorg-gtest (0.1.0-1) UNRELEASED; urgency=low +xorg-gtest (0.1.1-1) UNRELEASED; urgency=low [ Daniel d'Andrada ] * Initial release [ Chase Douglas ] - * Fix linking against X server libs - - Added 0001-Fix-linking-against-X-server-libs.patch + * Update to xorg-gtest-0.1.1 -- Chase Douglas <chase.doug...@ubuntu.com> Wed, 15 Feb 2012 08:55:27 -0800 diff --git a/debian/patches/0001-Fix-linking-against-X-server-libs.patch b/debian/patches/0001-Fix-linking-against-X-server-libs.patch deleted file mode 100644 index dd25e5d..0000000 --- a/debian/patches/0001-Fix-linking-against-X-server-libs.patch +++ /dev/null @@ -1,29 +0,0 @@ -From fc02e9aa96646c0ea60384b14083107a10e965b2 Mon Sep 17 00:00:00 2001 -From: Chase Douglas <chase.doug...@canonical.com> -Date: Wed, 15 Feb 2012 08:54:08 -0800 -Subject: [PATCH] Fix linking against X server libs - -Signed-off-by: Chase Douglas <chase.doug...@canonical.com> ---- - src/Makefile.am | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/Makefile.am b/src/Makefile.am -index 579ed9c..c266421 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -26,9 +26,9 @@ libxorg_gtest_main_la_CPPFLAGS = \ - $(AM_CPPFLAGS) \ - $(GTEST_CPPFLAGS) - --libxorg_gtest_la_LDFLAGS = $(X11_LIBS) -Wl,--version-script=libxorg-gtest.ver -+libxorg_gtest_la_LDFLAGS = $(XSERVER_LIBS) -Wl,--version-script=libxorg-gtest.ver - libxorg_gtest_main_la_LDFLAGS = \ -- $(X11_LIBS) \ -+ $(XSERVER_LIBS) \ - -Wl,--version-script=libxorg-gtest_main.ver - - AM_CXXFLAGS = -I$(top_srcdir)/include --- -1.7.9 - diff --git a/debian/patches/series b/debian/patches/series index cb3ee71..6928140 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1 @@ -0001-Fix-linking-against-X-server-libs.patch +# No patches commit a15d88e39f19efdd6aa20053a7a3ce6ffc8c0d9e Author: Chase Douglas <chase.doug...@canonical.com> Date: Fri Feb 24 08:39:56 2012 -0800 Release version 0.1.1 Signed-off-by: Chase Douglas <chase.doug...@canonical.com> diff --git a/configure.ac b/configure.ac index 1623394..da94219 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,7 @@ # Initialize Autoconf AC_PREREQ([2.60]) AC_INIT([Dummy X.org Testing Environment for Google Test], - [0.1.0], + [0.1.1], [], [xorg-gtest]) AC_CONFIG_SRCDIR([Makefile.am]) commit 6422b13b33438a1dfa2d57c2df3593fcac719814 Author: Chase Douglas <chase.doug...@canonical.com> Date: Fri Feb 24 08:35:13 2012 -0800 Generate ChangeLog at make dist time Signed-off-by: Chase Douglas <chase.doug...@canonical.com> diff --git a/Makefile.am b/Makefile.am index 01c7730..a3f51a3 100644 --- a/Makefile.am +++ b/Makefile.am @@ -6,6 +6,11 @@ pkgconfig_DATA = xorg-gtest.pc ACLOCAL_AMFLAGS = -I m4 .PHONY: ChangeLog INSTALL +ChangeLog: + cd ${top_srcdir} && \ + mkdir -p ${distdir} && \ + git log > ${distdir}/ChangeLog + INSTALL: $(INSTALL_CMD) commit 66bcd7de0d9bd4a822b6cf3bca79d295d7fb86ab Author: Chase Douglas <chase.doug...@canonical.com> Date: Fri Feb 24 08:01:17 2012 -0800 Add GPLv3 license as COPYING Signed-off-by: Chase Douglas <chase.doug...@canonical.com> diff --git a/COPYING b/COPYING new file mode 100644 index 0000000..94a9ed0 --- /dev/null +++ b/COPYING @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/> + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/e1s0yea-0008og...@vasks.debian.org