[gazebo] 02/02: Fix copyright file

[Jose Luis Rivero]

This is an automated email from the git hooks/post-receive script.

jrivero-guest pushed a commit to branch master
in repository gazebo.

commit b163323a590e6d6d38c42f3445eeed0df69a1252
Author: Jose Luis Rivero <jrivero at osrfoundation.org>
Date:   Mon Aug 3 03:40:07 2015 +0200

    Fix copyright file
---
 debian/copyright | 68 ++++++++++++++++++++++++++++++--------------------------
 1 file changed, 37 insertions(+), 31 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index 55fa362..e7b8035 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -13,12 +13,10 @@ Files: debian/*
 Copyright: 2013, Thomas Moulard <thomas.moulard at gmail.com>
            2014-2015, Jose Luis Rivero <jrivero at osrfoundation.org>
 License: GPL-2
- See `/usr/share/common-licenses/GPL-2'.
 
 Files: cmake/Ronn2Man.cmake
 Copyright: Emmanuel Roullit <emmanuel at netsniff-ng.org>
 License: GPL-2
- See `/usr/share/common-licenses/GPL-2'.
 
 Files: media/gui/fonts/DejaVuSans.ttf
 Copyright: 2003 Bitstream, Inc.
@@ -57,7 +55,7 @@ Copyright: 1993 by Sun Microsystems, Inc
 	   2001 Pierre Terdiman
 	   2008 Oleh Derevenko
 	   2001-2007, Russell L. Smith]
-License: BSD-3-clause, 
+License: BSD-3-clause,
 
 Files: deps/opende/GIMPACT/*
 Copyright: 1991, 1999 Free Software Foundation, Inc,
@@ -112,40 +110,48 @@ Files: doc/search.js
 Copyright: 2009, Dimitri van Heesch.
            2003-2008, Greg Valure.
 License: GPL
- See '/usr/share/common-licenses/GPL'.
 
-License: BSD-3-clause
- Software License Agreement (BSD License)
- . 
- Copyright (c) 2008, Willow Garage, Inc.
- All rights reserved.
+License: GPL-2
+ This package 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 package 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, see <http://www.gnu.org/licenses/>
  .
+ On Debian systems, the complete text of the GNU General
+ Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
+
+License: BSD-3-clause
  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.
+ 3. 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.
  .
-  * Redistributions of source code must retain the above copyright
-    notice, this list of conditions and the following disclaimer.
-  * 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.
-  * Neither the name of the Willow Garage 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 COPYRIGHT HOLDERS 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
- COPYRIGHT OWNER 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.
+ 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: Zlib
  This software is provided 'as-is', without any express or implied

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/gazebo.git