[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

xserver-xorg-video-i128: Changes to 'debian-experimental'



 debian/changelog |    8 ++++++--
 debian/copyright |   44 +++++++++++++++++++++++++++++++++-----------
 2 files changed, 39 insertions(+), 13 deletions(-)

New commits:
commit a7b9673db65d3d48a8090688d64ed3c545be98ab
Author: Cyril Brulebois <kibi@debian.org>
Date:   Sat Nov 20 15:13:50 2010 +0100

    Upload to experimental.

diff --git a/debian/changelog b/debian/changelog
index e15f692..9ba74ac 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-video-i128 (1:1.3.4-1) UNRELEASED; urgency=low
+xserver-xorg-video-i128 (1:1.3.4-1) experimental; urgency=low
 
   [ Robert Hooker ]
   * New upstream release.
@@ -7,7 +7,7 @@ xserver-xorg-video-i128 (1:1.3.4-1) UNRELEASED; urgency=low
   [ Cyril Brulebois ]
   * Update debian/copyright from upstream COPYING.
 
- -- Robert Hooker <sarvatt@ubuntu.com>  Mon, 18 Oct 2010 17:21:27 -0400
+ -- Cyril Brulebois <kibi@debian.org>  Sat, 20 Nov 2010 15:13:46 +0100
 
 xserver-xorg-video-i128 (1:1.3.3-3) experimental; urgency=low
 

commit 43697fa5ae0fb743c4a56261fe835e3d01aa8bea
Author: Cyril Brulebois <kibi@debian.org>
Date:   Sat Nov 20 15:13:44 2010 +0100

    Update debian/copyright from upstream COPYING.

diff --git a/debian/changelog b/debian/changelog
index a23c1d5..e15f692 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,12 @@
 xserver-xorg-video-i128 (1:1.3.4-1) UNRELEASED; urgency=low
 
+  [ Robert Hooker ]
   * New upstream release.
   * Bump xutils-dev requirement for new util-macros.
 
+  [ Cyril Brulebois ]
+  * Update debian/copyright from upstream COPYING.
+
  -- Robert Hooker <sarvatt@ubuntu.com>  Mon, 18 Oct 2010 17:21:27 -0400
 
 xserver-xorg-video-i128 (1:1.3.3-3) experimental; urgency=low
diff --git a/debian/copyright b/debian/copyright
index 485a648..0ef3515 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,7 +1,8 @@
 This package was downloaded from
 http://xorg.freedesktop.org/releases/individual/driver/
 
-Copyright 1995-2000 by Robin Cutshaw <robin@XFree86.Org>
+Copyright 1994-2000 by Robin Cutshaw <robin@XFree86.Org>
+Copyright 2005 Adam Jackson <ajax@nwnk.net>
 Copyright 1998 by Number Nine Visual Technology, Inc.
 
 Permission to use, copy, modify, distribute, and sell this software and its
@@ -10,14 +11,35 @@ 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 Robin Cutshaw not be used in
 advertising or publicity pertaining to distribution of the software without
-specific, written prior permission.  Robin Cutshaw and Number Nine make no
-representations about the suitability of this software for any purpose.  It
-is provided "as is" without express or implied warranty.
+specific, written prior permission.  Robin Cutshaw makes no representations
+about the suitability of this software for any purpose.  It is provided
+"as is" without express or implied warranty.
 
-ROBIN CUTSHAW AND NUMBER NINE DISCLAIM ALL WARRANTIES WITH REGARD TO THIS
-SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS, IN NO EVENT SHALL ROBIN CUTSHAW OR NUMBER NINE 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.
+ROBIN CUTSHAW DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+EVENT SHALL ROBIN CUTSHAW 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.


Reply to: