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

Cédric Boutillier cedric.boutillier at gmail.com
Sun Apr 22 22:15:34 UTC 2012


The following commit has been merged in the master branch:
commit 1dca4f2b340f38326105d75751241acec1cf5f90
Author: Cédric Boutillier <cedric.boutillier at gmail.com>
Date:   Sun Apr 22 23:56:19 2012 +0200

    update copyright file

diff --git a/debian/copyright b/debian/copyright
index ac46d30..5ac863f 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,4 +1,4 @@
-Format: http://dep.debian.net/deps/dep5
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: ruby-opengl
 Source: http://rubyforge.org/projects/ruby-opengl/
 
@@ -12,6 +12,7 @@ License: Expat
 
 Files: examples/Redbook/*
 Copyright: 1993-1997, Silicon Graphics, Inc.
+           1994 Mark J. Kilgard
 License: SGI
 
 Files: examples/OrangeBook/*
@@ -19,8 +20,9 @@ Copyright: 2002-2005 3Dlabs Inc. Ltd.
 License: BSD-3
 
 Files: examples/NeHe/*
-Copyright:
-License: Free??
+Copyright: NeHe
+License: Specific
+ Licensed under free license.
 
 Files: example/misc/*
 Copyright: 2007 Jan Dvorak <jan.dvorak at kraxnet.cz>
@@ -35,14 +37,10 @@ License: Specific
 
 Files: example/misc/OGLBench.rb example/misc/trislam.rb
 Copyright: 2004-2006 Geoff Broadwell
-License: GPL or Artistic?
-
-Files: 
-Copyright: 1994 Mark J. Kilgard
-License: SGI
+License: GPL-1+ or Artistic
 
 Files: debian/*
-Copyright: 2011 Cédric Boutillier <cedric.boutillier at gmail.com>
+Copyright: 2011-2012 Cédric Boutillier <cedric.boutillier at gmail.com>
 License: Expat
 
 License: Artistic
@@ -72,8 +70,8 @@ License: Expat
  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  DEALINGS IN THE SOFTWARE.
 
-License: GPL?
- On Debian systems, the full text of this liceense is
+License: GPL-1+
+ On Debian systems, the full text of this license is
  contained in the file /usr/share/common-licenses/GPL.
 
 License: SGI
@@ -108,3 +106,4 @@ License: SGI
  Unpublished-- rights reserved under the copyright laws of the
  United States.  Contractor/manufacturer is Silicon Graphics,
  Inc., 2011 N.  Shoreline Blvd., Mountain View, CA 94039-7311.
+

-- 
ruby-opengl.git



More information about the Pkg-ruby-extras-commits mailing list