[Pkg-ocaml-maint-commits] [SCM] marionnet packaging branch, master, updated. upstream/0.90.6+bzr407-23-ged64b4f

Lucas Nussbaum lucas at debian.org
Fri Mar 29 15:09:07 UTC 2013 

The following commit has been merged in the master branch:
commit ed64b4f64389ab61305f92008d0baa6f9dcd02a6
Author: Lucas Nussbaum <lucas at debian.org>
Date:   Fri Mar 29 16:04:17 2013 +0100

    Add more copyright info.

diff --git a/debian/copyright b/debian/copyright
index d6dbe3c..21c6aed 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -66,10 +66,12 @@ License: BSD-3-clause
  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 Files: share/images/leds/*
+Copyright: made by Luca Saiu, but public domain
 License: public-domain
  Made by Luca Saiu with the GIMP. Public domain.
 
 Files: share/images/treeview-icons/*
+Copyright: made by Luca Saiu, but public domain
 License: public-domain
  Images in this directory were made by Luca Saiu with the GIMP.
  The author releases them into the public domain.
@@ -77,144 +79,27 @@ License: public-domain
 Files: share/images/ico.info.orig.png
        share/images/ico.warning.orig.png
        share/images/ico.error.orig.png
+Copyright: same as GNOME Amaranth theme
 License: Artistic
- 			 The "Artistic License"
- .
- 				Preamble
- .
- The intent of this document is to state the conditions under which a
- Package may be copied, such that the Copyright Holder maintains some
- semblance of artistic control over the development of the package,
- while giving the users of the package the right to use and distribute
- the Package in a more-or-less customary fashion, plus the right to make
- reasonable modifications.
- .
- Definitions:
- .
- 	"Package" refers to the collection of files distributed by the
- 	Copyright Holder, and derivatives of that collection of files
- 	created through textual modification.
- .
- 	"Standard Version" refers to such a Package if it has not been
- 	modified, or has been modified in accordance with the wishes
- 	of the Copyright Holder as specified below.
- .
- 	"Copyright Holder" is whoever is named in the copyright or
- 	copyrights for the package.
- .
- 	"You" is you, if you're thinking about copying or distributing
- 	this Package.
- .
- 	"Reasonable copying fee" is whatever you can justify on the
- 	basis of media cost, duplication charges, time of people involved,
- 	and so on.  (You will not be required to justify it to the
- 	Copyright Holder, but only to the computing community at large
- 	as a market that must bear the fee.)
- .
- 	"Freely Available" means that no fee is charged for the item
- 	itself, though there may be fees involved in handling the item.
- 	It also means that recipients of the item may redistribute it
- 	under the same conditions they received it.
- .
- 1. You may make and give away verbatim copies of the source form of the
- Standard Version of this Package without restriction, provided that you
- duplicate all of the original copyright notices and associated disclaimers.
- .
- 2. You may apply bug fixes, portability fixes and other modifications
- derived from the Public Domain or from the Copyright Holder.  A Package
- modified in such a way shall still be considered the Standard Version.
- .
- 3. You may otherwise modify your copy of this Package in any way, provided
- that you insert a prominent notice in each changed file stating how and
- when you changed that file, and 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 placing the modifications on a major archive
-     site such as uunet.uu.net, or by allowing the Copyright Holder to include
-     your modifications in the Standard Version of the Package.
- .
-     b) use the modified Package only within your corporation or organization.
- .
-     c) rename any non-standard executables so the names do not conflict
-     with standard executables, which must also be provided, and provide
-     a separate manual page for each non-standard executable that clearly
-     documents how it differs from the Standard Version.
- .
-     d) make other distribution arrangements with the Copyright Holder.
- .
- 4. You may distribute the programs of this Package in object code or
- executable form, provided that you do at least ONE of the following:
- .
-     a) distribute a Standard Version of the executables and library files,
-     together with instructions (in the manual page or equivalent) on where
-     to get the Standard Version.
- .
-     b) accompany the distribution with the machine-readable source of
-     the Package with your modifications.
- .
-     c) give non-standard executables non-standard names, and clearly
-     document the differences in manual pages (or equivalent), together
-     with instructions on where to get the Standard Version.
- .
-     d) make other distribution arrangements with the Copyright Holder.
- .
- 5. You may charge a reasonable copying fee for any distribution of this
- Package.  You may charge any fee you choose for support of this
- Package.  You may not charge a fee for this Package itself.  However,
- you may distribute this Package in aggregate with other (possibly
- commercial) programs as part of a larger (possibly commercial) software
- distribution provided that you do not advertise this Package as a
- product of your own.  You may embed this Package's interpreter within
- an executable of yours (by linking); this shall be construed as a mere
- form of aggregation, provided that the complete Standard Version of the
- interpreter is so embedded.
- .
- 6. The scripts and library files supplied as input to or produced as
- output from the programs of this Package do not automatically fall
- under the copyright of this Package, but belong to whoever generated
- them, and may be sold commercially, and may be aggregated with this
- Package.  If such scripts or library files are aggregated with this
- Package via the so-called "undump" or "unexec" methods of producing a
- binary executable image, then distribution of such an image shall
- neither be construed as a distribution of this Package nor shall it
- fall under the restrictions of Paragraphs 3 and 4, provided that you do
- not represent such an executable image as a Standard Version of this
- Package.
- .
- 7. C subroutines (or comparably compiled subroutines in other
- languages) supplied by you and linked into this Package in order to
- emulate subroutines and variables of the language defined by this
- Package shall not be considered part of this Package, but are the
- equivalent of input as in Paragraph 6, provided these subroutines do
- not change the language in any way that would cause it to fail the
- regression tests for the language.
- .
- 8. Aggregation of this Package with a commercial distribution is always
- permitted provided that the use of this Package is embedded; that is,
- when no overt attempt is made to make this Package's interfaces visible
- to the end user of the commercial distribution.  Such use shall not be
- construed as a distribution of this Package.
- .
- 9. The name of the Copyright Holder may not be used to endorse or promote
- products derived from this software without specific prior written permission.
- .
- 10. THIS PACKAGE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR
- IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- .
- 				The End
+ On Debian systems, the complete text of the Artistic license
+ can be found in "/usr/share/common-licenses/Artistic".
 Comment: see share/images/README
  taken from GNOME Amaranth theme
  
 Files: share/images/ico.question-2.orig.png
+Copyright: same as GNOME icons
 Comment: see share/images/README
  ico.question-2.orig.png is taken from the Gnome icons, released
  by its authors under the GNU GPL version 2; converted by Luca Saiu
  in 2008.
+License: GPL-2
+ The license paragraph was not included in share/images/README.
+ .
+ On Debian systems, the complete text of the GNU General
+ Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
 
 Files: share/images/ico.splines.png
+Copyright: the Oxygen Team
 Comment: see share/images/README
  "Actions-format-stroke-color-icon" taken from the Oxygen Icons and
  released by its authors, the "Oxygen Team", under the GNU LGPL v3
@@ -223,9 +108,14 @@ Comment: see share/images/README
  http://www.oxygen-icons.org/
  Original file (24x24) downloaded from:
  http://www.iconarchive.com/show/oxygen-icons-by-oxygen-icons.org/Actions-format-stroke-color-icon.html
-Copyright: LGPL-3
+License: LGPL-3
+ The license paragraph was not included in share/images/README.
+ .
+ On Debian systems, the complete text of the GNU lesser General
+ Public License version 3 can be found in "/usr/share/common-licenses/LGPL-3".
 
 Files: share/images/ico.invert-arcs.png
+Copyright: the Oxygen Team
 Comment: see share/images/README
  "Actions-transform-rotate-icon" taken from the Oxygen Icons and
  released by its authors, the "Oxygen Team", under the GNU LGPL v3;
@@ -233,15 +123,26 @@ Comment: see share/images/README
  http://www.oxygen-icons.org/
  Original file (24x24) downloaded from:
  http://www.iconarchive.com/show/oxygen-icons-by-oxygen-icons.org/Actions-transform-rotate-icon.html
+License: LGPL-3
+ The license paragraph was not included in share/images/README.
+ .
+ On Debian systems, the complete text of the GNU lesser General
+ Public License version 3 can be found in "/usr/share/common-licenses/LGPL-3".
 
 Files: share/images/ico.action.zoom.in.png
        share/images/ico.action.zoom.out.png
+Copyright: Saki
 Comment: see share/images/README
  "Actions-zoom-in-icon" taken from the "Snowish Icons" and
  released by its author "Saki" under the GNU LGPL v3.
  http://www.oxygen-icons.org/
  Original file (24x24) downloaded from:
  http://www.iconarchive.com/show/snowish-icons-by-saki/Actions-zoom-in-icon.html
+License: LGPL-3
+ The license paragraph was not included in share/images/README.
+ .
+ On Debian systems, the complete text of the GNU General
+ Public License version 2 can be found in "/usr/share/common-licenses/LGPL-3".
 
 Files: share/vde_switch.lang
 Copyright: 2012  Jean-Vincent Loddo

-- 
marionnet packaging

More information about the Pkg-ocaml-maint-commits mailing list