diff -Nru xserver-xorg-video-vmware-11.0.1+git20100609.423d8a06/ChangeLog xserver-xorg-video-vmware-11.0.1+git20100706.f307f77a/ChangeLog --- xserver-xorg-video-vmware-11.0.1+git20100609.423d8a06/ChangeLog 2010-06-09 20:06:48.000000000 +0100 +++ xserver-xorg-video-vmware-11.0.1+git20100706.f307f77a/ChangeLog 2010-07-06 01:54:45.000000000 +0100 @@ -1,3 +1,17 @@ +commit 3f7759b26704f9442028388dfb9a43686a4681ee +Author: Robert Hooker +Date: Tue Jul 6 09:39:15 2010 +0845 + + Add debian tree from origin/debian-unstable + +commit f307f77a34f3a6777f74458819f6a3519c2c3f2b +Author: Gaetan Nadon +Date: Sun Jun 13 13:10:55 2010 -0400 + + COPYING: replace stub file with actual Copyright notices. + + Signed-off-by: Gaetan Nadon + commit 423d8a069a2d86068a8f22926a73bc965670315d Author: Michel Dänzer Date: Mon Mar 29 10:19:04 2010 +0200 diff -Nru xserver-xorg-video-vmware-11.0.1+git20100609.423d8a06/COPYING xserver-xorg-video-vmware-11.0.1+git20100706.f307f77a/COPYING --- xserver-xorg-video-vmware-11.0.1+git20100609.423d8a06/COPYING 2010-06-09 20:06:13.000000000 +0100 +++ xserver-xorg-video-vmware-11.0.1+git20100706.f307f77a/COPYING 2010-07-06 01:54:15.000000000 +0100 @@ -1,12 +1,48 @@ -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 2006 by VMware, Inc. +Copyright 2007 by VMware, Inc. -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, +FITNESS 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. + +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 2010 VMware, 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, 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-vmware-11.0.1+git20100609.423d8a06/debian/changelog xserver-xorg-video-vmware-11.0.1+git20100706.f307f77a/debian/changelog --- xserver-xorg-video-vmware-11.0.1+git20100609.423d8a06/debian/changelog 2010-07-06 02:00:48.000000000 +0100 +++ xserver-xorg-video-vmware-11.0.1+git20100706.f307f77a/debian/changelog 2010-07-06 02:00:49.000000000 +0100 @@ -1,10 +1,10 @@ -xserver-xorg-video-vmware (1:11.0.1+git20100609.423d8a06-0ubuntu0sarvatt) maverick; urgency=low +xserver-xorg-video-vmware (1:11.0.1+git20100706.f307f77a-0ubuntu0sarvatt) maverick; urgency=low - * Checkout from git 20100609 (master branch) up to commit - 423d8a069a2d86068a8f22926a73bc965670315d + * Checkout from git 20100706 (master branch) up to commit + f307f77a34f3a6777f74458819f6a3519c2c3f2b * Only added debian/ tree from origin/debian-unstable - -- Robert Hooker Wed, 09 Jun 2010 15:06:51 -0400 + -- Robert Hooker Tue, 06 Jul 2010 09:39:48 +0845 xserver-xorg-video-vmware (1:11.0.1-2) UNRELEASED; urgency=low diff -Nru xserver-xorg-video-vmware-11.0.1+git20100609.423d8a06/.lastcommit xserver-xorg-video-vmware-11.0.1+git20100706.f307f77a/.lastcommit --- xserver-xorg-video-vmware-11.0.1+git20100609.423d8a06/.lastcommit 2010-06-09 20:06:14.000000000 +0100 +++ xserver-xorg-video-vmware-11.0.1+git20100706.f307f77a/.lastcommit 2010-07-06 01:54:15.000000000 +0100 @@ -1 +1 @@ -commit 423d8a069a2d86068a8f22926a73bc965670315d +commit f307f77a34f3a6777f74458819f6a3519c2c3f2b