diff -Nru xserver-xorg-video-s3-0.6.3+git20100609.36776d8a/ChangeLog xserver-xorg-video-s3-0.6.3+git20100706.798a0017/ChangeLog --- xserver-xorg-video-s3-0.6.3+git20100609.36776d8a/ChangeLog 2010-06-09 19:46:29.000000000 +0100 +++ xserver-xorg-video-s3-0.6.3+git20100706.798a0017/ChangeLog 2010-07-06 01:41:31.000000000 +0100 @@ -1,3 +1,17 @@ +commit 660a80edfc55e2101f2e977acedfbd1adb781dcd +Author: Robert Hooker +Date: Tue Jul 6 09:25:55 2010 +0845 + + Add debian tree from origin/debian-unstable + +commit 798a0017ebd8078a9e0be0c4571675c8056f1100 +Author: Gaetan Nadon +Date: Sun Jun 13 10:18:36 2010 -0400 + + COPYING: replace stub file with actual Copyright notices. + + Signed-off-by: Gaetan Nadon + commit 36776d8ab030d2c139a099ea6f7d39d1005faef3 Author: Gaetan Nadon Date: Fri Jan 29 16:11:25 2010 -0500 diff -Nru xserver-xorg-video-s3-0.6.3+git20100609.36776d8a/COPYING xserver-xorg-video-s3-0.6.3+git20100706.798a0017/COPYING --- xserver-xorg-video-s3-0.6.3+git20100609.36776d8a/COPYING 2010-06-09 19:45:50.000000000 +0100 +++ xserver-xorg-video-s3-0.6.3+git20100706.798a0017/COPYING 2010-07-06 01:40:55.000000000 +0100 @@ -1,12 +1,70 @@ -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. + Copyright 2001 Ani Joshi -Please submit updated COPYING files to the Xorg bugzilla: + XFree86 4.x driver for S3 chipsets -https://bugs.freedesktop.org/enter_bug.cgi?product=xorg -All licensing questions regarding this software should be directed at the -Xorg mailing list: +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 Ani Joshi not be used in advertising or +publicity pertaining to distribution of the software without specific, +written prior permission. Ani Joshi makes no representations +about the suitability of this software for any purpose. It is provided +"as-is" without express or implied warranty. + +ANI JOSHI DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO +EVENT SHALL ANI JOSHI BE LIABLE FOR ANY SPECIAL, INDIRECT OR +CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, +DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER +TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +PERFORMANCE OF THIS SOFTWARE. +Copyright 2007 George Sapountzis + +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 (C) 1994-2000 The XFree86 Project, Inc. All Rights Reserved. + +Permission is hereby granted, free of charge, to any person obtaining a copy of +this software and associated documentation files (the "Software"), to deal in +the Software without restriction, including without limitation the rights to +use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies +of the Software, and to permit persons to whom the Software is furnished to do +so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 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 CONNECTION +WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +Except as contained in this notice, the name of the XFree86 Project shall not +be used in advertising or otherwise to promote the sale, use or other dealings +in this Software without prior written authorization from the XFree86 Project. + + +Copyright 1995-1997 The XFree86 Project, Inc. +Copyright (c) 1999,2000 The XFree86 Project Inc. -http://lists.freedesktop.org/mailman/listinfo/xorg diff -Nru xserver-xorg-video-s3-0.6.3+git20100609.36776d8a/debian/changelog xserver-xorg-video-s3-0.6.3+git20100706.798a0017/debian/changelog --- xserver-xorg-video-s3-0.6.3+git20100609.36776d8a/debian/changelog 2010-07-06 01:49:36.000000000 +0100 +++ xserver-xorg-video-s3-0.6.3+git20100706.798a0017/debian/changelog 2010-07-06 01:49:36.000000000 +0100 @@ -1,10 +1,10 @@ -xserver-xorg-video-s3 (1:0.6.3+git20100609.36776d8a-0ubuntu0sarvatt) maverick; urgency=low +xserver-xorg-video-s3 (1:0.6.3+git20100706.798a0017-0ubuntu0sarvatt) maverick; urgency=low - * Checkout from git 20100609 (master branch) up to commit - 36776d8ab030d2c139a099ea6f7d39d1005faef3 + * Checkout from git 20100706 (master branch) up to commit + 798a0017ebd8078a9e0be0c4571675c8056f1100 * Only added debian/ tree from origin/debian-unstable - -- Robert Hooker Wed, 09 Jun 2010 14:46:32 -0400 + -- Robert Hooker Tue, 06 Jul 2010 09:26:34 +0845 xserver-xorg-video-s3 (1:0.6.3-2) unstable; urgency=medium diff -Nru xserver-xorg-video-s3-0.6.3+git20100609.36776d8a/.lastcommit xserver-xorg-video-s3-0.6.3+git20100706.798a0017/.lastcommit --- xserver-xorg-video-s3-0.6.3+git20100609.36776d8a/.lastcommit 2010-06-09 19:45:51.000000000 +0100 +++ xserver-xorg-video-s3-0.6.3+git20100706.798a0017/.lastcommit 2010-07-06 01:40:55.000000000 +0100 @@ -1 +1 @@ -commit 36776d8ab030d2c139a099ea6f7d39d1005faef3 +commit 798a0017ebd8078a9e0be0c4571675c8056f1100