[DRE-commits] [SCM] ruby-opengl.git branch, master, updated. upstream/0.60.1-20-g8ad0c8d

[Cédric Boutillier]

The following commit has been merged in the master branch:
commit 1624d4d83b54ab5fd4c2fa98f319c4867c63d332
Author: Cédric Boutillier <cedric.boutillier at gmail.com>
Date:   Mon Apr 23 14:08:52 2012 +0200

    fix lintian errors about copyright file

diff --git a/debian/copyright b/debian/copyright
index 5ac863f..9a768a2 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -45,11 +45,32 @@ License: Expat
 
 License: Artistic
  On Debian systems, the full text of this license is
- contained in the file /usr/share/common-licences/Artistic.
+ contained in the file /usr/share/common-licenses/Artistic.
 
 License: BSD-3
- On Debian systems, the full text of this license is
- contained in the file /usr/share/common-licenses/BSD.
+ All rights reserved.
+ .
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
+ .
+ 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 3Dlabs Inc. Ltd. 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 HOLDER 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: Expat
  Permission is hereby granted, free of charge, to any person obtaining a

-- 
ruby-opengl.git