diff -Nru xserver-xorg-video-trident-1.3.3+git20100609.cb7949bf/ChangeLog xserver-xorg-video-trident-1.3.4+git20100706.b5d17329/ChangeLog --- xserver-xorg-video-trident-1.3.3+git20100609.cb7949bf/ChangeLog 2010-06-09 20:01:05.000000000 +0100 +++ xserver-xorg-video-trident-1.3.4+git20100706.b5d17329/ChangeLog 2010-07-06 01:50:37.000000000 +0100 @@ -1,3 +1,23 @@ +commit 03aebfff7ce3cb7b2e8ac438682e2a220f2e7818 +Author: Robert Hooker +Date: Tue Jul 6 09:35:02 2010 +0845 + + Add debian tree from origin/debian-unstable + +commit b5d17329ae1746bc95ac211c1325df86982e0eb1 +Author: Dave Airlie +Date: Mon Jul 5 14:32:39 2010 +1000 + + trident 1.3.4 + +commit ea2f02a84ad5a51a39c0ae55fa5aa785360d3830 +Author: Gaetan Nadon +Date: Sun Jun 13 12:34:21 2010 -0400 + + COPYING: replace stub file with actual Copyright notices. + + Signed-off-by: Gaetan Nadon + commit cb7949bf5a4e99755677ce5df09f2e977a47da71 Author: Alan Coopersmith Date: Fri Jan 15 15:05:31 2010 -0800 diff -Nru xserver-xorg-video-trident-1.3.3+git20100609.cb7949bf/configure.ac xserver-xorg-video-trident-1.3.4+git20100706.b5d17329/configure.ac --- xserver-xorg-video-trident-1.3.3+git20100609.cb7949bf/configure.ac 2010-06-09 20:00:26.000000000 +0100 +++ xserver-xorg-video-trident-1.3.4+git20100706.b5d17329/configure.ac 2010-07-06 01:50:02.000000000 +0100 @@ -22,7 +22,7 @@ AC_PREREQ(2.57) AC_INIT([xf86-video-trident], - 1.3.3, + 1.3.4, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xf86-video-trident) diff -Nru xserver-xorg-video-trident-1.3.3+git20100609.cb7949bf/COPYING xserver-xorg-video-trident-1.3.4+git20100706.b5d17329/COPYING --- xserver-xorg-video-trident-1.3.3+git20100609.cb7949bf/COPYING 2010-06-09 20:00:24.000000000 +0100 +++ xserver-xorg-video-trident-1.3.4+git20100706.b5d17329/COPYING 2010-07-06 01:50:02.000000000 +0100 @@ -1,12 +1,63 @@ -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 1992-2003 by Alan Hourihane, North Wales, UK. -Please submit updated COPYING files to the Xorg bugzilla: +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 Alan Hourihane not be used in +advertising or publicity pertaining to distribution of the software without +specific, written prior permission. Alan Hourihane makes no representations +about the suitability of this software for any purpose. It is provided +"as is" without express or implied warranty. -https://bugs.freedesktop.org/enter_bug.cgi?product=xorg +ALAN HOURIHANE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO +EVENT SHALL ALAN HOURIHANE 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. -All licensing questions regarding this software should be directed at the -Xorg mailing list: +Copyright 1997-2003 by Alan Hourihane, North Wales, UK. +Copyright 2006 by Alan Hourihane, North Wales, UK. +Copyright (c) 2006, Jesse Barnes + +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation, and that the name of the authors not be used in +advertising or publicity pertaining to distribution of the software without +specific, written prior permission. The authors make no representations +about the suitability of this software for any purpose. It is provided +"as is" without express or implied warranty. + +THE AUTHORS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO +EVENT SHALL THE AUTHORS 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. -http://lists.freedesktop.org/mailman/listinfo/xorg diff -Nru xserver-xorg-video-trident-1.3.3+git20100609.cb7949bf/debian/changelog xserver-xorg-video-trident-1.3.4+git20100706.b5d17329/debian/changelog --- xserver-xorg-video-trident-1.3.3+git20100609.cb7949bf/debian/changelog 2010-07-06 02:00:44.000000000 +0100 +++ xserver-xorg-video-trident-1.3.4+git20100706.b5d17329/debian/changelog 2010-07-06 02:00:44.000000000 +0100 @@ -1,10 +1,10 @@ -xserver-xorg-video-trident (1:1.3.3+git20100609.cb7949bf-0ubuntu0sarvatt) maverick; urgency=low +xserver-xorg-video-trident (1:1.3.4+git20100706.b5d17329-0ubuntu0sarvatt) maverick; urgency=low - * Checkout from git 20100609 (master branch) up to commit - cb7949bf5a4e99755677ce5df09f2e977a47da71 + * Checkout from git 20100706 (master branch) up to commit + b5d17329ae1746bc95ac211c1325df86982e0eb1 * Only added debian/ tree from origin/debian-unstable - -- Robert Hooker Wed, 09 Jun 2010 15:01:09 -0400 + -- Robert Hooker Tue, 06 Jul 2010 09:35:40 +0845 xserver-xorg-video-trident (1:1.3.3-2) unstable; urgency=low diff -Nru xserver-xorg-video-trident-1.3.3+git20100609.cb7949bf/.lastcommit xserver-xorg-video-trident-1.3.4+git20100706.b5d17329/.lastcommit --- xserver-xorg-video-trident-1.3.3+git20100609.cb7949bf/.lastcommit 2010-06-09 20:00:26.000000000 +0100 +++ xserver-xorg-video-trident-1.3.4+git20100706.b5d17329/.lastcommit 2010-07-06 01:50:02.000000000 +0100 @@ -1 +1 @@ -commit cb7949bf5a4e99755677ce5df09f2e977a47da71 +commit b5d17329ae1746bc95ac211c1325df86982e0eb1