diff -Nru xserver-xorg-video-sisusb-0.9.3+git20100609.fdc38b41/ChangeLog xserver-xorg-video-sisusb-0.9.4+git20100706.43eab862/ChangeLog --- xserver-xorg-video-sisusb-0.9.3+git20100609.fdc38b41/ChangeLog 2010-06-09 19:52:23.000000000 +0100 +++ xserver-xorg-video-sisusb-0.9.4+git20100706.43eab862/ChangeLog 2010-07-06 01:47:18.000000000 +0100 @@ -1,3 +1,25 @@ +commit f68349f40dd050dabf11e560092f68f530cf3c9c +Author: Robert Hooker +Date: Tue Jul 6 09:31:45 2010 +0845 + + Add debian tree from origin/debian-unstable + +commit 43eab862e5cf0bfa9e7c8bb570651e94c067c451 +Author: Peter Hutterer +Date: Mon Jul 5 15:01:24 2010 +1000 + + sisusb 0.9.4 + + Signed-off-by: Peter Hutterer + +commit 13068db6a2180350b6e0e4159979dc7402889fce +Author: Gaetan Nadon +Date: Sun Jun 13 11:04:56 2010 -0400 + + COPYING: replace stub file with actual Copyright notices. + + Signed-off-by: Gaetan Nadon + commit fdc38b41c4aa45cc08aa8d213a9f24b6cff2d0b5 Author: Adam Jackson Date: Tue May 18 13:12:06 2010 -0400 diff -Nru xserver-xorg-video-sisusb-0.9.3+git20100609.fdc38b41/configure.ac xserver-xorg-video-sisusb-0.9.4+git20100706.43eab862/configure.ac --- xserver-xorg-video-sisusb-0.9.3+git20100609.fdc38b41/configure.ac 2010-06-09 19:51:48.000000000 +0100 +++ xserver-xorg-video-sisusb-0.9.4+git20100706.43eab862/configure.ac 2010-07-06 01:46:45.000000000 +0100 @@ -22,7 +22,7 @@ AC_PREREQ(2.57) AC_INIT([xf86-video-sisusb], - 0.9.3, + 0.9.4, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xf86-video-sisusb) diff -Nru xserver-xorg-video-sisusb-0.9.3+git20100609.fdc38b41/COPYING xserver-xorg-video-sisusb-0.9.4+git20100706.43eab862/COPYING --- xserver-xorg-video-sisusb-0.9.3+git20100609.fdc38b41/COPYING 2010-06-09 19:51:47.000000000 +0100 +++ xserver-xorg-video-sisusb-0.9.4+git20100706.43eab862/COPYING 2010-07-06 01:46:45.000000000 +0100 @@ -1,12 +1,54 @@ -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) 2001-2005 by Thomas Winischhofer, Vienna, Austria -Please submit updated COPYING files to the Xorg bugzilla: +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions +are met: +1) Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. +2) Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. +3) The name of the author may not be used to endorse or promote products + derived from this software without specific prior written permission. -https://bugs.freedesktop.org/enter_bug.cgi?product=xorg +THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR +IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, +INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT +NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF +THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +Copyright (C) 1998, 1999 by Alan Hourihane, Wigan, England +Written by: + Alan Hourihane , + Mike Chapman , + Juanjo Santamarta , + Mitani Hiroshi , + David Thomas , + Thomas Winischhofer . + +Licensed under the following terms: + +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 appears in all copies and that both that copyright +notice and this permission notice appear in supporting documentation, and +and that the name of the copyright holder not be used in advertising +or publicity pertaining to distribution of the software without specific, +written prior permission. The copyright holder makes no representations +about the suitability of this software for any purpose. It is provided +"as is" without expressed or implied warranty. + +THE COPYRIGHT HOLDER DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO +EVENT SHALL THE COPYRIGHT HOLDER 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: -http://lists.freedesktop.org/mailman/listinfo/xorg diff -Nru xserver-xorg-video-sisusb-0.9.3+git20100609.fdc38b41/debian/changelog xserver-xorg-video-sisusb-0.9.4+git20100706.43eab862/debian/changelog --- xserver-xorg-video-sisusb-0.9.3+git20100609.fdc38b41/debian/changelog 2010-07-06 02:00:39.000000000 +0100 +++ xserver-xorg-video-sisusb-0.9.4+git20100706.43eab862/debian/changelog 2010-07-06 02:00:39.000000000 +0100 @@ -1,10 +1,10 @@ -xserver-xorg-video-sisusb (1:0.9.3+git20100609.fdc38b41-0ubuntu0sarvatt) maverick; urgency=low +xserver-xorg-video-sisusb (1:0.9.4+git20100706.43eab862-0ubuntu0sarvatt) maverick; urgency=low - * Checkout from git 20100609 (master branch) up to commit - fdc38b41c4aa45cc08aa8d213a9f24b6cff2d0b5 + * Checkout from git 20100706 (master branch) up to commit + 43eab862e5cf0bfa9e7c8bb570651e94c067c451 * Only added debian/ tree from origin/debian-unstable - -- Robert Hooker Wed, 09 Jun 2010 14:52:26 -0400 + -- Robert Hooker Tue, 06 Jul 2010 09:32:21 +0845 xserver-xorg-video-sisusb (1:0.9.3-2) unstable; urgency=low diff -Nru xserver-xorg-video-sisusb-0.9.3+git20100609.fdc38b41/.lastcommit xserver-xorg-video-sisusb-0.9.4+git20100706.43eab862/.lastcommit --- xserver-xorg-video-sisusb-0.9.3+git20100609.fdc38b41/.lastcommit 2010-06-09 19:51:48.000000000 +0100 +++ xserver-xorg-video-sisusb-0.9.4+git20100706.43eab862/.lastcommit 2010-07-06 01:46:45.000000000 +0100 @@ -1 +1 @@ -commit fdc38b41c4aa45cc08aa8d213a9f24b6cff2d0b5 +commit 43eab862e5cf0bfa9e7c8bb570651e94c067c451