[DRE-commits] [SCM] yard.git branch, master, updated. upstream/0.7.4-35-g64ff38b

Fri May 4 12:12:56 UTC 2012

The following commit has been merged in the master branch:
commit 352bf5ae9b9301c1b2e23eb300333a0ef6a3e106
Author: Cédric Boutillier <cedric.boutillier at gmail.com>
Date:   Thu May 3 22:56:03 2012 +0200

    update copyright file to DEP-5

diff --git a/debian/copyright b/debian/copyright
index 335e652..48a5e91 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,15 +1,50 @@
-Format: http://dep.debian.net/deps/dep5
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: yard
 Source: http://yardoc.org
 
 Files: *
 Copyright: 2007-2011 Loren Segal <lsegal at soen.ca>
-License: MIT
+License: Expat
 
-License: MIT
- (from the LICENSE file:)
- Copyright (c) 2007-2011 Loren Segal
- .
+Files: lib/yard/rubygems/backports/
+Copyright: 2006 Chad Fowler
+           2006 Rich Kilmer
+           2006 Jim Weirich and others
+License: Expat or Specific
+Comment: Those files are backports of specific features from recent Rubygems
+ versions.
+
+Files: lib/yard/parser/c_parser.rb:
+Copyright: 2001-2003 Dave Thomas
+           2003-2007 Eric Hodel and others
+License: Ruby or GPL-2
+Comment: That file is part from RDoc distributed with Ruby
+
+Files: lib/yard/parser/ruby/legacy/ruby_lex.rb
+Copyright: 2003-2012 Yukihiro Matsumoto <matz at netlab.jp>
+License: Ruby or GPL-2
+Comment: That file is a modified version of the one distributed with Ruby
+
+Files: templates/default/fulldoc/html/js/jquery.js
+Copyright: 2011 John Resig
+License: Expat or GPL-2
+Comment: the file is a compressed Javascript library. It can
+ be downloaded from http://docs.jquery.com/Downloading_jQuery.
+ A copy of the uncompressed lib is included as debian/jquery-1.7.1.js
+
+Files: lib/yard/server/templates/default/fulldoc/html/js/autocomplete.js
+Copyright: 2009 Jörn Zaefferer
+License: Expat or GPL-2+
+Comment: the file is a compressed Javascript library. It can be
+ downloaded from http://plugins.jquery.com/node/2404/release
+ A copy of the uncompressed lib is included as debian/jquery.autocomplete.js
+
+Files: debian/*
+Copyright: 2011 Lucas Nussbaum <lucas at debian.org>
+           2012 Cédric Boutillier <cedric.boutillier at gmail.com>
+License: Expat
+
+License: Expat
  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
@@ -31,26 +66,152 @@ License: MIT
  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
  OTHER DEALINGS IN THE SOFTWARE.
 
-Files: lib/yard/rubygems/backports/
-Copyright: 2006 by Chad Fowler, Rich Kilmer, Jim Weirich and others
-License: MIT or specific license (not including since MIT is already included)
-Comment: Those files are backports of specific features from recent Rubygems
- versions.
+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 package; if not, write to the Free
+ Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+ Boston, MA  02110-1301 USA
+ .
+ On Debian systems, the full text of the GNU General Public
+ License version 2 can be found in the file
+ `/usr/share/common-licenses/GPL-2'.
 
-Files: templates/default/fulldoc/html/js/jquery.js
-Copyright: 2011 John Resig
-License: MIT or GPLv2 (not including GPLv2 since MIT is already included)
-Comment: the file is a compressed Javascript library. It can
- be downloaded from http://docs.jquery.com/Downloading_jQuery.
- A copy of the uncompressed lib is included as debian/jquery-1.5.2.js
+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.
+ .
+ On Debian systems, the full text of the GNU General Public
+ License version 2 can be found in the file
+ `/usr/share/common-licenses/GPL-2'.
 
-Files: lib/yard/server/templates/default/fulldoc/html/js/autocomplete.js
-Copyright: 2009 Jörn Zaefferer
-License: MIT or GPL (not including GPL since MIT is already included)
-Comment: the file is a compressed Javascript library. It can be
- downloaded from http://plugins.jquery.com/node/2404/release
- A copy of the uncompressed lib is included as debian/jquery.autocomplete.js
+License: Ruby
+ Ruby is copyrighted free software by Yukihiro Matsumoto <matz at netlab.jp>.
+ You can redistribute it and/or modify it under either the terms of the GPL
+ version 2 (see the file GPL), or the conditions below:
+ .
+   1. You may make and give away verbatim copies of the source form of the
+      software without restriction, provided that you duplicate all of the
+      original copyright notices and associated disclaimers.
+ .
+   2. You may modify your copy of the software in any way, provided that
+      you do at least ONE of the following:
+ .
+        a) place your modifications in the Public Domain or otherwise
+           make them Freely Available, such as by posting said
+ 	  modifications to Usenet or an equivalent medium, or by allowing
+ 	  the author to include your modifications in the software.
+ .
+        b) use the modified software only within your corporation or
+           organization.
+ .
+        c) give non-standard binaries non-standard names, with
+           instructions on where to get the original software distribution.
+ .
+        d) make other distribution arrangements with the author.
+ .
+   3. You may distribute the software in object code or binary form,
+      provided that you do at least ONE of the following:
+ .
+        a) distribute the binaries and library files of the software,
+ 	  together with instructions (in the manual page or equivalent)
+ 	  on where to get the original distribution.
+ .
+        b) accompany the distribution with the machine-readable source of
+ 	  the software.
+ .
+        c) give non-standard binaries non-standard names, with
+           instructions on where to get the original software distribution.
+ .
+        d) make other distribution arrangements with the author.
+ .
+   4. You may modify and include the part of the software into any other
+      software (possibly commercial).  But some files in the distribution
+      are not written by the author, so that they are not under these terms.
+ .
+      For the list of those files and their copying conditions, see the
+      file LEGAL.
+ .
+   5. The scripts and library files supplied as input to or produced as 
+      output from the software do not automatically fall under the
+      copyright of the software, but belong to whomever generated them, 
+      and may be sold commercially, and may be aggregated with this
+      software.
+ .
+   6. THIS SOFTWARE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR
+      IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+      WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+      PURPOSE.
+
+License: Specific
+ RubyGems is copyrighted free software by Chad Fowler, Rich Kilmer, Jim
+ Weirich and others.  You can redistribute it and/or modify it under
+ either the terms of the MIT license (see the file MIT.txt), or the
+ conditions below:
+ .
+ 1. You may make and give away verbatim copies of the source form of the
+    software without restriction, provided that you duplicate all of the
+    original copyright notices and associated disclaimers.
+ .
+ 2. You may modify your copy of the software in any way, provided that
+    you do at least ONE of the following:
+ .
+    a. place your modifications in the Public Domain or otherwise
+       make them Freely Available, such as by posting said
+       modifications to Usenet or an equivalent medium, or by allowing
+       the author to include your modifications in the software.
+ .
+    b. use the modified software only within your corporation or
+       organization.
+ .
+    c. give non-standard executables non-standard names, with
+       instructions on where to get the original software distribution.
+ .
+    d. make other distribution arrangements with the author.
+ .
+ 3. You may distribute the software in object code or executable
+    form, provided that you do at least ONE of the following:
+ .
+    a. distribute the executables and library files of the software,
+       together with instructions (in the manual page or equivalent)
+       on where to get the original distribution.
+ .
+    b. accompany the distribution with the machine-readable source of
+       the software.
+ .
+    c. give non-standard executables non-standard names, with
+       instructions on where to get the original software distribution.
+ .
+    d. make other distribution arrangements with the author.
+ .
+ 4. You may modify and include the part of the software into any other
+    software (possibly commercial).  But some files in the distribution
+    are not written by the author, so that they are not under these terms.
+ .
+    For the list of those files and their copying conditions, see the
+    file LEGAL.
+ .
+ 5. The scripts and library files supplied as input to or produced as
+    output from the software do not automatically fall under the
+    copyright of the software, but belong to whomever generated them,
+    and may be sold commercially, and may be aggregated with this
+    software.
+ .
+ 6. THIS SOFTWARE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR
+    IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+    WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+    PURPOSE.
 
-Files: debian/*
-Copyright: 2011 Lucas Nussbaum <lucas at debian.org>
-License: MIT

-- 
yard.git

