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

xserver-xorg-input-mouse: Changes to 'debian-experimental'



 debian/changelog |    9 +++++++--
 debian/control   |    2 +-
 debian/copyright |   51 ++++++++++++++++++++++-----------------------------
 3 files changed, 30 insertions(+), 32 deletions(-)

New commits:
commit 9439cc1ba3d954eab0314c62ecbebaac4dd2dd26
Author: Cyril Brulebois <kibi@debian.org>
Date:   Fri Nov 19 22:56:46 2010 +0100

    Upload to experimental.

diff --git a/debian/changelog b/debian/changelog
index 4566c3e..e2c3639 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-input-mouse (1:1.6.0-1) UNRELEASED; urgency=low
+xserver-xorg-input-mouse (1:1.6.0-1) experimental; urgency=low
 
   [ Robert Hooker ]
   * New upstream release.
@@ -8,7 +8,7 @@ xserver-xorg-input-mouse (1:1.6.0-1) UNRELEASED; urgency=low
   * Update debian/copyright from upstream COPYING.
   * Add myself to Uploaders.
 
- -- Robert Hooker <sarvatt@ubuntu.com>  Mon, 18 Oct 2010 15:30:30 -0400
+ -- Cyril Brulebois <kibi@debian.org>  Fri, 19 Nov 2010 22:56:42 +0100
 
 xserver-xorg-input-mouse (1:1.5.0-3) experimental; urgency=low
 

commit 01ac90805e1621b0a71747129d1549848464e95e
Author: Cyril Brulebois <kibi@debian.org>
Date:   Fri Nov 19 22:54:58 2010 +0100

    Add myself to Uploaders.

diff --git a/debian/changelog b/debian/changelog
index 5f0e3c4..4566c3e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ xserver-xorg-input-mouse (1:1.6.0-1) UNRELEASED; urgency=low
 
   [ Cyril Brulebois ]
   * Update debian/copyright from upstream COPYING.
+  * Add myself to Uploaders.
 
  -- Robert Hooker <sarvatt@ubuntu.com>  Mon, 18 Oct 2010 15:30:30 -0400
 
diff --git a/debian/control b/debian/control
index f097791..07428d5 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: xserver-xorg-input-mouse
 Section: x11
 Priority: optional
 Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
-Uploaders: David Nusinow <dnusinow@debian.org>, Drew Parsons <dparsons@debian.org>
+Uploaders: David Nusinow <dnusinow@debian.org>, Drew Parsons <dparsons@debian.org>, Cyril Brulebois <kibi@debian.org>
 Build-Depends:
  debhelper (>= 5),
  pkg-config,

commit a5de3f8d53d386bb88dbe724fae33786bd359dcc
Author: Cyril Brulebois <kibi@debian.org>
Date:   Fri Nov 19 22:54:25 2010 +0100

    Update debian/copyright from upstream COPYING.

diff --git a/debian/changelog b/debian/changelog
index cecd297..5f0e3c4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,12 @@
 xserver-xorg-input-mouse (1:1.6.0-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 15:30:30 -0400
 
 xserver-xorg-input-mouse (1:1.5.0-3) experimental; urgency=low
diff --git a/debian/copyright b/debian/copyright
index 6617170..f9f1188 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,12 +1,33 @@
 This package was downloaded from
 http://xorg.freedesktop.org/releases/individual/driver/
 
+Copyright (c) 2004-2005, 2008-2010, Oracle and/or its affiliates.
+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 (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 1990,91 by Thomas Roell, Dinkelscherben, Germany.
 Copyright 1993 by David Dawes <dawes@xfree86.org>
 Copyright 2002 by SuSE Linux AG, Author: Egbert Eich
 Copyright 1994-2002 by The XFree86 Project, Inc.
 Copyright 2002 by Paul Elliott
-Patch for PS/2 Intellimouse by Tim Goodwin 1997-11-06.
 
 Permission to use, copy, modify, distribute, and sell this software and its
 documentation for any purpose is hereby granted without fee, provided that
@@ -112,31 +133,3 @@ 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 2004-2005 Sun Microsystems, 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, and/or sell copies of the Software, and to permit persons
-to whom the Software is furnished to do so, provided that the above
-copyright notice(s) and this permission notice appear in all copies of
-the Software and that both the above copyright notice(s) and this
-permission notice appear in supporting documentation.
-
-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
-OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR 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.
-
-Except as contained in this notice, the name of a copyright holder
-shall not be used in advertising or otherwise to promote the sale, use
-or other dealings in this Software without prior written authorization
-of the copyright holder.
-


Reply to: