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

[Lucas Nussbaum]

The following commit has been merged in the master branch:
commit 1b9c584769aa6583ada3139946bf33c32387468f
Author: Lucas Nussbaum <lucas at debian.org>
Date:   Mon Feb 18 17:41:20 2013 +0100

    Fill-in copyright

diff --git a/debian/copyright b/debian/copyright
index 54d36fe..5122723 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,18 +1,25 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: marionnet
-Source: <url://example.com>
+Source: https://launchpad.net/marionnet
 
 Files: *
-Copyright: <years> <put author's name and email here>
-           <years> <likewise for another author>
-License: <special license>
- <Put the license of the package here indented by 1 space>
- <This follows the format of Description: lines in control file>
+Copyright: 2007-2013 Luca Saiu <saiu at lipn.univ-paris13.fr>
+           2007-2013 Jean-Vincent Loddo <loddo at lipn.univ-paris13.fr>
+           2007-2013 Université Paris 13
+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.
  .
- <Including paragraphs>
+ 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 program.  If not, see <http://www.gnu.org/licenses/>.
 
-# If you want to use GPL v2 or later for the /debian/* files use 
-# the following clauses, or change it to suit. Delete these two lines
 Files: debian/*
 Copyright: 2013 Lucas Nussbaum <lucas at debian.org>
 License: GPL-2+
@@ -31,8 +38,3 @@ License: GPL-2+
  .
  On Debian systems, the complete text of the GNU General
  Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
-
-# Please also look if there are files or directories which have a
-# different copyright/license attached and list them here.
-# Please avoid to pick license terms that are more restrictive than the
-# packaged work, as it may make Debian's contributions unacceptable upstream.

-- 
marionnet packaging