The following commit has been merged in the master branch:
commit 4042e533d863cc1f475dd23842fc636db881ed8e
Author: Lucas Nussbaum <lu...@debian.org>
Date: Fri Mar 29 15:58:35 2013 +0100
Add missing copyright info after first ftpmasters review.
diff --git a/debian/changelog b/debian/changelog
index ecd5f2a..c557fbd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,5 +11,6 @@ marionnet (0.90.6+bzr407-1) unstable; urgency=low
* This is a preliminary package for marionnet. Missing at the moment:
- script to help download kernels/filesystems
- init script to start the daemon
+ * Add missing copyright info after first ftpmasters review.
- -- Lucas Nussbaum <lu...@debian.org> Tue, 19 Feb 2013 22:31:50 +0100
+ -- Lucas Nussbaum <lu...@debian.org> Fri, 29 Mar 2013 15:57:12 +0100
diff --git a/debian/copyright b/debian/copyright
index 5122723..d6dbe3c 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -20,6 +20,246 @@ License: GPL-2+
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
+Files: po/*
+Copyright: 2010, the Marionnet translators
+License: BSD-3-clause
+ The following license applies to translation files (the ones with
+ a .po extension), and as a consequence to the .mo files which are
+ automatically generated from them.
+ .
+ Translation contributions coming from the Launchpad interface are
+ automatically licensed under these conditions, as the Launchpad
+ terms of use (at https://help.launchpad.net/TermsofUse as of
+ 27 September 2010) stipulate.
+ The translation copyright belongs to the original submitters.
+ .
+ Please notice that Marionnet and Ocamlbricks are distributed
+ under the GNU GPL rather than this three-clause BSD license.
+ .
+ The following text is the complete three-clause BSD license.
+ .
+ --------------------
+ .
+ Copyright (c) 2010, the Marionnet translators
+ 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 the <organization> 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 <COPYRIGHT HOLDER> 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.
+
+Files: share/images/leds/*
+License: public-domain
+ Made by Luca Saiu with the GIMP. Public domain.
+
+Files: share/images/treeview-icons/*
+License: public-domain
+ Images in this directory were made by Luca Saiu with the GIMP.
+ The author releases them into the public domain.
+
+Files: share/images/ico.info.orig.png
+ share/images/ico.warning.orig.png
+ share/images/ico.error.orig.png
+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
+Comment: see share/images/README
+ taken from GNOME Amaranth theme
+
+Files: share/images/ico.question-2.orig.png
+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.
+
+Files: share/images/ico.splines.png
+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
+ (a copy of which is included in this directory); the icon was modified
+ by Jean-Vincent Loddo in 2013.
+ 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
+
+Files: share/images/ico.invert-arcs.png
+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;
+ the icon was modified by Jean-Vincent Loddo in 2013 (simply desatured).
+ 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
+
+Files: share/images/ico.action.zoom.in.png
+ share/images/ico.action.zoom.out.png
+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
+
+Files: share/vde_switch.lang
+Copyright: 2012 Jean-Vincent Loddo
+ 2012 Université Paris 13
+License: LGPL-2+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Library General Public
+ License as published by the Free Software Foundation; either
+ version 2 of the License, or (at your option) any later version.
+ .
+ This library 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
+ Library 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/>
+
Files: debian/*
Copyright: 2013 Lucas Nussbaum <lu...@debian.org>
License: GPL-2+
--
marionnet packaging
_______________________________________________
Pkg-ocaml-maint-commits mailing list
Pkg-ocaml-maint-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits
