[Glibc-bsd-commits] r3384 - trunk/freebsd-moused/debian

Tue May 31 04:01:46 UTC 2011

Author: guillem
Date: 2011-05-31 04:01:46 +0000 (Tue, 31 May 2011)
New Revision: 3384

Modified:
   trunk/freebsd-moused/debian/changelog
   trunk/freebsd-moused/debian/copyright
Log:
Update copyright file with actual license and copyright information


Modified: trunk/freebsd-moused/debian/changelog
===================================================================

--- trunk/freebsd-moused/debian/changelog	2011-05-31 04:01:01 UTC (rev 3383)
+++ trunk/freebsd-moused/debian/changelog	2011-05-31 04:01:46 UTC (rev 3384)
@@ -10,6 +10,7 @@
   * Line-wrap PMAKE variable in debian/rules.
   * Use libbsd-dev instead of local copy of strlcpy().
   * Remove numeric prefixes from patches.
+  * Update copyright file with actual license and copyright information.
 
  -- Guillem Jover <guillem at debian.org>  Thu, 30 Apr 2009 20:57:46 +0200
 

Modified: trunk/freebsd-moused/debian/copyright
===================================================================
--- trunk/freebsd-moused/debian/copyright	2011-05-31 04:01:01 UTC (rev 3383)
+++ trunk/freebsd-moused/debian/copyright	2011-05-31 04:01:46 UTC (rev 3384)
@@ -1,19 +1,36 @@
 This package was debianized by Robert Millan <rmh at debian.org> on
 Wed, 18 Aug 2004 00:45:07 +0200.
 
-It was downloaded from FreeBSD CVS (http://www.freebsd.org/)
+It was downloaded from FreeBSD Subversion (http://www.freebsd.org/).
 
-Upstream Author: The FreeBSD Project
+Upstream Author:
 
+    The FreeBSD Project
+
 Copyright:
 
+    Copyright (c) 1996
+    	Mike Pritchard <mpp at FreeBSD.org>.  All rights reserved.
+
     Redistribution and use in source and binary forms, with or without
-    modification, are permitted under the terms of the BSD License.
+    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. All advertising materials mentioning features or use of this software
+       must display the following acknowledgement:
+    	This product includes software developed by Mike Pritchard.
+    4. Neither the name of the author nor the names of its contributors
+       may be used to endorse or promote products derived from this software
+       without specific prior written permission.
 
-    THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+    THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``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 REGENTS OR CONTRIBUTORS BE LIABLE
+    ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS 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)
@@ -22,5 +39,58 @@
     OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
     SUCH DAMAGE.
 
-On Debian GNU systems, the complete text of the BSD License can be 
-found in `/usr/share/common-licenses/BSD'.
+    ---
+
+    Copyright (c) 1995 Michael Smith, All rights reserved.
+
+    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 as
+       the first lines of this file unmodified.
+    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. All advertising materials mentioning features or use of this software
+       must display the following acknowledgment:
+         This product includes software developed by Michael Smith.
+    4. The name of the author may not be used to endorse or promote products
+       derived from this software without specific prior written permission.
+
+
+    THIS SOFTWARE IS PROVIDED BY Michael Smith ``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 Michael Smith 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 1990,91 by Thomas Roell, Dinkelscherben, Germany.
+    Copyright 1993 by David Dawes <dawes at physics.su.oz.au>
+
+    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 appear in all copies and that both that
+    copyright notice and this permission notice appear in supporting
+    documentation, and that the names of Thomas Roell and David Dawes not be
+    used in advertising or publicity pertaining to distribution of the
+    software without specific, written prior permission.  Thomas Roell
+    and David Dawes makes no representations about the suitability of this
+    software for any purpose.  It is provided "as is" without express or
+    implied warranty.
+
+    THOMAS ROELL AND DAVID DAWES DISCLAIM ALL WARRANTIES WITH REGARD TO THIS
+    SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
+    FITNESS, IN NO EVENT SHALL THOMAS ROELL OR DAVID DAWES 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.


