diff -Nru xserver-xorg-video-savage-2.3.1+git20100609.b877be5d/ChangeLog xserver-xorg-video-savage-2.3.1+git20100706.1e9af8f8/ChangeLog --- xserver-xorg-video-savage-2.3.1+git20100609.b877be5d/ChangeLog 2010-06-09 19:48:45.000000000 +0100 +++ xserver-xorg-video-savage-2.3.1+git20100706.1e9af8f8/ChangeLog 2010-07-06 01:43:53.000000000 +0100 @@ -1,3 +1,17 @@ +commit ddefb1f12c4bb99132c1effc01f08c48360980bf +Author: Robert Hooker +Date: Tue Jul 6 09:28:12 2010 +0845 + + Add debian tree from origin/debian-unstable + +commit 1e9af8f812d210d5c9c103447ac586137b972a1a +Author: Gaetan Nadon +Date: Sun Jun 13 10:38:28 2010 -0400 + + COPYING: replace stub file with actual Copyright notices. + + Signed-off-by: Gaetan Nadon + commit b877be5d8e633227764b9a158fb41be6d19c10e5 Author: Alan Coopersmith Date: Mon Apr 26 21:12:18 2010 -0700 diff -Nru xserver-xorg-video-savage-2.3.1+git20100609.b877be5d/COPYING xserver-xorg-video-savage-2.3.1+git20100706.1e9af8f8/COPYING --- xserver-xorg-video-savage-2.3.1+git20100609.b877be5d/COPYING 2010-06-09 19:48:05.000000000 +0100 +++ xserver-xorg-video-savage-2.3.1+git20100706.1e9af8f8/COPYING 2010-07-06 01:43:12.000000000 +0100 @@ -1,12 +1,114 @@ -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 (C) 1994-2000 The XFree86 Project, Inc. All Rights Reserved. +Copyright (c) 2003-2006, X.Org Foundation -Please submit updated COPYING files to the Xorg bugzilla: +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: -https://bugs.freedesktop.org/enter_bug.cgi?product=xorg +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. -All licensing questions regarding this software should be directed at the -Xorg mailing list: +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +COPYRIGHT HOLDER(S) OR AUTHOR(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. -http://lists.freedesktop.org/mailman/listinfo/xorg +Except as contained in this notice, the name of the copyright holder(s) +and author(s) 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 copyright holder(s) and author(s). + +Copyright 1998-2003 VIA Technologies, Inc. All Rights Reserved. +Copyright 2001-2003 S3 Graphics, 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, sub license, +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 NON-INFRINGEMENT. IN NO EVENT SHALL +VIA, S3 GRAPHICS, AND/OR ITS SUPPLIERS 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 2004 Felix Kuehling +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, sub license, +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 NON-INFRINGEMENT. IN NO EVENT SHALL +VIA, S3 GRAPHICS, AND/OR ITS SUPPLIERS 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 1998-2003 VIA Technologies, Inc. All Rights Reserved. +Copyright 2001-2003 S3 Graphics, 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, sub license, +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 NON-INFRINGEMENT. IN NO EVENT SHALL +VIA, S3 GRAPHICS, AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR +OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, +ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +DEALINGS IN THE SOFTWARE. diff -Nru xserver-xorg-video-savage-2.3.1+git20100609.b877be5d/debian/changelog xserver-xorg-video-savage-2.3.1+git20100706.1e9af8f8/debian/changelog --- xserver-xorg-video-savage-2.3.1+git20100609.b877be5d/debian/changelog 2010-07-06 01:49:38.000000000 +0100 +++ xserver-xorg-video-savage-2.3.1+git20100706.1e9af8f8/debian/changelog 2010-07-06 01:49:38.000000000 +0100 @@ -1,10 +1,10 @@ -xserver-xorg-video-savage (1:2.3.1+git20100609.b877be5d-0ubuntu0sarvatt) maverick; urgency=low +xserver-xorg-video-savage (1:2.3.1+git20100706.1e9af8f8-0ubuntu0sarvatt) maverick; urgency=low - * Checkout from git 20100609 (master branch) up to commit - b877be5d8e633227764b9a158fb41be6d19c10e5 + * Checkout from git 20100706 (master branch) up to commit + 1e9af8f812d210d5c9c103447ac586137b972a1a * Only added debian/ tree from origin/debian-unstable - -- Robert Hooker Wed, 09 Jun 2010 14:48:48 -0400 + -- Robert Hooker Tue, 06 Jul 2010 09:28:56 +0845 xserver-xorg-video-savage (1:2.3.1-2) unstable; urgency=low diff -Nru xserver-xorg-video-savage-2.3.1+git20100609.b877be5d/.lastcommit xserver-xorg-video-savage-2.3.1+git20100706.1e9af8f8/.lastcommit --- xserver-xorg-video-savage-2.3.1+git20100609.b877be5d/.lastcommit 2010-06-09 19:48:06.000000000 +0100 +++ xserver-xorg-video-savage-2.3.1+git20100706.1e9af8f8/.lastcommit 2010-07-06 01:43:12.000000000 +0100 @@ -1 +1 @@ -commit b877be5d8e633227764b9a158fb41be6d19c10e5 +commit 1e9af8f812d210d5c9c103447ac586137b972a1a