xserver-xorg-video-neomagic: Changes to 'debian-experimental'
debian/changelog | 8 ++++++--
debian/copyright | 29 ++++++++++++++++++++++++++++-
2 files changed, 34 insertions(+), 3 deletions(-)
New commits:
commit 2667e156fb0f6a590d59bfb7645811aed90ce44e
Author: Cyril Brulebois <kibi@debian.org>
Date: Sat Nov 20 17:16:06 2010 +0100
Upload to experimental.
diff --git a/debian/changelog b/debian/changelog
index 46fd5e8..544b105 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-video-neomagic (1:1.2.5-1) UNRELEASED; urgency=low
+xserver-xorg-video-neomagic (1:1.2.5-1) experimental; urgency=low
[ Robert Hooker ]
* New upstream release.
@@ -6,7 +6,7 @@ xserver-xorg-video-neomagic (1:1.2.5-1) UNRELEASED; urgency=low
[ Cyril Brulebois ]
* Update debian/copyright from upstream COPYING.
- -- Robert Hooker <sarvatt@ubuntu.com> Mon, 18 Oct 2010 16:56:57 -0400
+ -- Cyril Brulebois <kibi@debian.org> Sat, 20 Nov 2010 17:16:01 +0100
xserver-xorg-video-neomagic (1:1.2.4-4) experimental; urgency=low
commit 9d8820a92f06e9adfe1e2afdc37b8de6cbb0b518
Author: Cyril Brulebois <kibi@debian.org>
Date: Sat Nov 20 17:13:54 2010 +0100
Update debian/copyright from upstream COPYING.
diff --git a/debian/changelog b/debian/changelog
index a3da057..46fd5e8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,11 @@
xserver-xorg-video-neomagic (1:1.2.5-1) UNRELEASED; urgency=low
+ [ Robert Hooker ]
* New upstream release.
+ [ Cyril Brulebois ]
+ * Update debian/copyright from upstream COPYING.
+
-- Robert Hooker <sarvatt@ubuntu.com> Mon, 18 Oct 2010 16:56:57 -0400
xserver-xorg-video-neomagic (1:1.2.4-4) experimental; urgency=low
diff --git a/debian/copyright b/debian/copyright
index 8d5c41f..1152c70 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -24,7 +24,6 @@ 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 2000 by Alan Hourihane, Sychdyn, North Wales, UK.
Permission to use, copy, modify, distribute, and sell this software and its
@@ -45,6 +44,34 @@ 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 1998, 1999 Egbert Eich
+Copyright 2000, 2001 SuSE GmbH, Author: Egbert Eich
+Copyright 2002 SuSE Linux AG, Author: Egbert Eich
+Copyright 2002 Shigehiro Nomura
+
+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.
+
+Copyright (c) 1999, 2000 The XFree86 Project Inc.
+based on code written by Mark Vojkovich <markv@valinux.com>
Copyright 2002 by Shigehiro Nomura.
Reply to: