[kernel] r13973 - in dists/trunk/linux-modules-contrib-2.6: debian open-vm

Sun Jul 19 09:44:10 UTC 2009

Author: daniel
Date: Sun Jul 19 09:44:07 2009
New Revision: 13973

Log:
Syncing open-vm copyright file.

Modified:
   dists/trunk/linux-modules-contrib-2.6/debian/changelog
   dists/trunk/linux-modules-contrib-2.6/open-vm/copyright

Modified: dists/trunk/linux-modules-contrib-2.6/debian/changelog
==============================================================================

--- dists/trunk/linux-modules-contrib-2.6/debian/changelog	Sat Jul 18 23:20:16 2009	(r13972)
+++ dists/trunk/linux-modules-contrib-2.6/debian/changelog	Sun Jul 19 09:44:07 2009	(r13973)
@@ -2,6 +2,7 @@
 
   * Updating kernel version to 2.6.30-1.
   * Removing rt73, driver was rewritten in 2.6.30 mainline.
+  * Syncing open-vm copyright file.
 
  -- Daniel Baumann <daniel at debian.org>  Mon, 15 Jun 2009 10:22:00 +0200
 

Modified: dists/trunk/linux-modules-contrib-2.6/open-vm/copyright
==============================================================================
--- dists/trunk/linux-modules-contrib-2.6/open-vm/copyright	Sat Jul 18 23:20:16 2009	(r13972)
+++ dists/trunk/linux-modules-contrib-2.6/open-vm/copyright	Sun Jul 19 09:44:07 2009	(r13973)
@@ -1,156 +1,154 @@
-This package was debianized by Daniel Baumann <daniel at debian.org> on
-Sun,  9 Sep 2007 16:53:00 +0200.
+Author: VMware, Inc. <http://www.vmware.com/>
+Download: http://open-vm-tools.sourceforge.net/
 
-It was downloaded from <http://open-vm-tools.sourceforge.net/>.
+Files: *
+Copyright: (C) VMware, Inc. <http://www.vmware.com/>
+License: GPL-2.1
+ This library is free software; you can redistribute it and/or modify it under
+ the terms of the GNU Lesser General Public License as published by the Free
+ Software Foundation; version 2.1 of the License.
+ .
+ This library is distributed in the hope that it will be useful, but WITHOUT ANY
+ WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ .
+ You should have received a copy of the GNU Lesser General Public License along
+ with this library; if not, write to the Free Software Foundation, Inc., 51
+ Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Upstream Authors:
-
-	VMware, Inc. <http://www.vmware.com/>
-
-License (*/Makefile*, modules/*):
-
-	Copyright (C) VMware, Inc. <http://www.vmware.com/>
-
-	This program is free software; you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation; either version 2 of the License.
-
-	This program is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-	GNU General Public License for more details.
+On Debian systems, the complete text of the GNU Lesser General Public License
+can be found in /usr/share/common-licenses/LGPL-2.1 file.
 
-	You should have received a copy of the GNU General Public License
-	along with this program; if not, write to the Free Software
-	Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+Files: */Makefile*, modules/*
+Copyright: (C) VMware, Inc. <http://www.vmware.com/>
+License: GPL-2
+ This program is free software; you can redistribute it and/or modify it under
+ the terms of the GNU General Public License as published by the Free Software
+ Foundation; version 2 of the License.
+ .
+ This program is distributed in the hope that it will be useful, but WITHOUT ANY
+ WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ PARTICULAR PURPOSE. See the GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License along with
+ this program; if not, write to the Free Software Foundation, Inc., 51 Franklin
+ St, Fifth Floor, Boston, MA 02110-1301 USA
 
 On Debian systems, the complete text of the GNU General Public License
 can be found in /usr/share/common-licenses/GPL-2 file.
 
-License (lib/include/bsd*, lib/string/bsd*):
-
-	Copyright (C) 1990, 1993
-	The Regents of the University of California. All rights reserved.
+Files: lib/include/bsd*, lib/string/bsd*
+Copyright: (C) 1990, 1993 The Regents of the University of California.
+License: BSD-3
+ This code is derived from software contributed to Berkeley by Chris Torek.
+ .
+ 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.
+ .
+ 4. Neither the name of the University 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 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 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.
+
+Files: lib/misc/base64.c
+Copyright: (C) 1996, 1998 Internet Software Consortium
+License: MIT
+ Permission to use, copy, modify, and distribute this software for any purpose
+ with or without fee is hereby granted, provided that the above copyright notice
+ and this permission notice appear in all copies.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS ALL
+ WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE CONSORTIUM BE
+ LIABLE FOR ANY SPECIAL, DIRECT, 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.
+ .
+ Portions Copyright (C) 1995 International Business Machines, Inc.
+ .
+ International Business Machines, Inc. (hereinafter called IBM) grants
+ permission under its copyrights to use, copy, modify, and distribute this
+ Software with or without fee, provided that the above copyright notice and all
+ paragraphs of this notice appear in all copies, and that the name of IBM not be
+ used in connection with the marketing of any product incorporating the Software
+ or modifications thereof, without specific, written prior permission.
+ .
+ To the extent it has a right to do so, IBM grants an immunity from suit under
+ its patents, if any, for the use, sale or manufacture of products to the extent
+ that such products are used for performing Domain Name System dynamic updates
+ in TCP/IP networks by means of the Software. No immunity is granted for any
+ product per se or for any other function of any product.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS", AND IBM DISCLAIMS ALL WARRANTIES, INCLUDING
+ ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ IN NO EVENT SHALL IBM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR
+ CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER ARISING OUT OF OR IN CONNECTION
+ WITH THE USE OR PERFORMANCE OF THIS SOFTWARE, EVEN IF IBM IS APPRISED OF THE
+ POSSIBILITY OF SUCH DAMAGES.
+
+Files:
+  vmware-user/libvmwarectrl.h
+  vmware-user/vmwarectrlproto.h
+  vmware-user/vmwarectrl.h,libvmwarectrl.c
+  vmware-user/libvmwarectrl.c
+Copyright: (C) 2006 VMware, Inc. <http://www.vmware.com/>
+License: MIT
+ 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 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
+ COPYRIGHT HOLDER(S) OR AUTHOR(S) 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.
+ .
+ Except as contained in this notice, the name of the copyright holder(s) and
+ author(s) shall not be used in advertising or otherwise to promote the sale,
+ use or other dealings in this Software without prior written authorization from
+ the copyright holder(s) and author(s).
+
+Files: debian/*
+Copyright: (C) 2007-2009 Daniel Baumann <daniel at debian.org>
+License: GPL-2+
+ This program is free software; you can redistribute it and/or modify it under
+ the terms of the GNU General Public License as published by the Free Software
+ Foundation; either version 2 of the License, or (at your option) any later
+ version.
+ .
+ This program is distributed in the hope that it will be useful, but WITHOUT ANY
+ WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ PARTICULAR PURPOSE. See the GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License along with
+ this program; if not, write to the Free Software Foundation, Inc., 51 Franklin
+ St, Fifth Floor, Boston, MA 02110-1301 USA
 
-	This code is derived from software contributed to Berkeley by Chris
-	Torek.
-
-	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.
-
-	4. Neither the name of the University 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
-	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 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.
-
-License (lib/misc/base64.c):
-
-	Copyright (C) 1996, 1998 Internet Software Consortium
-
-	Permission to use, copy, modify, and distribute this software for any
-	purpose with or without fee is hereby granted, provided that the above
-	copyright notice and this permission notice appear in all copies.
-
-	THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM
-	DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL
-	IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL
-	INTERNET SOFTWARE CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT,
-	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.
-
-	Portions Copyright (C) 1995 International Business Machines, Inc.
-
-	International Business Machines, Inc. (hereinafter called IBM) grants
-	permission under its copyrights to use, copy, modify, and distribute
-	this Software with or without fee, provided that the above copyright
-	notice and all paragraphs of this notice appear in all copies, and that
-	the name of IBM not be used in connection with the marketing of any
-	product incorporating the Software or modifications thereof, without
-	specific, written prior permission.
-
-	To the extent it has a right to do so, IBM grants an immunity from suit
-	under its patents, if any, for the use, sale or manufacture of products
-	to the extent that such products are used for performing Domain Name
-	System dynamic updates in TCP/IP networks by means of the Software. No
-	immunity is granted for any product per se or for any other function of
-	any product.
-
-	THE SOFTWARE IS PROVIDED "AS IS", AND IBM DISCLAIMS ALL WARRANTIES,
-	INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
-	PARTICULAR PURPOSE. IN NO EVENT SHALL IBM BE LIABLE FOR ANY SPECIAL,
-	DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
-	ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
-	SOFTWARE, EVEN IF IBM IS APPRISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-License (vmware-user/{libvmwarectrl.h,vmwarectrlproto.h,vmwarectrl.h,libvmwarectrl.c}):
-
-	Copyright (C) 2006 VMware, Inc. <http://www.vmware.com/>
-
-	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 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 COPYRIGHT HOLDER(S) OR AUTHOR(S) 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.
-
-	Except as contained in this notice, the name of the copyright holder(s)
-	and author(s) shall not be used in advertising or otherwise to promote
-	the sale, use or other dealings in this Software without prior written
-	authorization from the copyright holder(s) and author(s).
-
-License (everything else):
-
-	Copyright (C) VMware, Inc. <http://www.vmware.com/>
-
-	This library is free software; you can redistribute it and/or
-	modify it under the terms of the GNU Lesser General Public
-	License as published by the Free Software Foundation; either
-	version 2.1 of the License and no later version.
-
-	This library is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-	Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public
-	License along with this library; if not, write to the Free Software
-	Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-On Debian systems, the complete text of the GNU Lesser General Public License
-can be found in /usr/share/common-licenses/LGPL-2.1 file.
-
-The Debian packaging is (C) 2007-2008, Daniel Baumann <daniel at debian.org> and
-is licensed under the GPL, see /usr/share/common-licenses/GPL-2.
+On Debian systems, the complete text of the GNU General Public License
+can be found in /usr/share/common-licenses/GPL-2 file.

