The following commit has been merged in the master branch:
commit f08c7336fbf19aedaff3566b1b90677162bb6d4e
Author: Stephane Glondu <st...@glondu.net>
Date:   Sat Jun 22 17:34:23 2013 +0200

    Switch debian/copyright to format version 1.0

diff --git a/debian/copyright b/debian/copyright
index fe6c53b..d116bd8 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,55 +1,43 @@
-Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat
-Upstream-Author: Markus Mottl
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Packaged-By: Stefano Zacchiroli <z...@debian.org>
 Packaged-Date: Sat, 03 May 2008 11:54:13 +0200.
-Original-Source-Location: http://janestcapital.com/ocaml/
 
 Files: *
-Copyright: © 2005-2008 Markus Mottl <markus.mo...@gmail.com>
-           © 2005-2008 Jane Street Holding, LLC <opensou...@janestcapital.com>
-License: LGPL-2.1 | other
- As a special exception to the GNU Lesser General Public License, you
- may link, statically or dynamically, a "work that uses the Library"
- with a publicly distributed version of the Library to produce an
- executable file containing portions of the Library, and distribute that
- executable file under terms of your choice, without any of the additional
- requirements listed in clause 6 of the GNU Lesser General Public License.
- By "a publicly distributed version of the Library", we mean either the
- unmodified Library as distributed by the authors, or a modified version
- of the Library that is distributed under the conditions defined in clause
- 3 of the GNU Lesser General Public License.  This exception does not
- however invalidate any other reasons why the executable file might be
- covered by the GNU Lesser General Public License.
-
-The Library is distributed under the terms of the GNU Lesser General Public
-License version 2.1, with the special exception to it reported above.
-
-The full text of the GNU Lessere General Public License version 2.1 can be
-found in `/usr/share/common-licenses/LGPL-2.1'.
+Copyright: 2005-2008, Markus Mottl <markus.mo...@gmail.com>
+           2005-2008, Jane Street Holding, LLC <opensou...@janestcapital.com>
+License: LGPL-2.1-ocaml
 
-Files: lib/pa_sexp_conv.ml, lib/pa_sexp_conv.mli
+Files: lib/pa_sexp_conv.ml lib/pa_sexp_conv.mli
 Copyright: © 2005-2008 Markus Mottl <markus.mo...@gmail.com>
            © 2005-2008 Jane Street Holding, LLC <opensou...@janestcapital.com>
            © 2004-2005 Martin Sandin <msan...@hotmail.com>
-License: LGPL-2.1 | other
- As a special exception to the GNU Lesser General Public License, you
- may link, statically or dynamically, a "work that uses the Library"
- with a publicly distributed version of the Library to produce an
- executable file containing portions of the Library, and distribute that
- executable file under terms of your choice, without any of the additional
- requirements listed in clause 6 of the GNU Lesser General Public License.
- By "a publicly distributed version of the Library", we mean either the
- unmodified Library as distributed by the authors, or a modified version
- of the Library that is distributed under the conditions defined in clause
- 3 of the GNU Lesser General Public License.  This exception does not
- however invalidate any other reasons why the executable file might be
- covered by the GNU Lesser General Public License.
+License: LGPL-2.1-ocaml
 
 Files: debian/*
-Copyright: © 2008 Stefano Zacchiroli <z...@debian.org>
+Copyright: 2008, Stefano Zacchiroli <z...@debian.org>
 License: GPL-3+
+ The Debian packaging is copyright Stefano Zacchiroli, and licensed
+ under the GNU General Public License, see
+ `/usr/share/common-licenses/GPL-3' for the full text.
 
-The Debian packaging is copyright Stefano Zacchiroli, and licensed
-under the GNU General Public License, see
-`/usr/share/common-licenses/GPL-3' for the full text.
-
+License: LGPL-2.1-ocaml
+ As a special exception to the GNU Lesser General Public License, you
+ may link, statically or dynamically, a "work that uses the Library"
+ with a publicly distributed version of the Library to produce an
+ executable file containing portions of the Library, and distribute
+ that executable file under terms of your choice, without any of the
+ additional requirements listed in clause 6 of the GNU Lesser General
+ Public License.  By "a publicly distributed version of the Library",
+ we mean either the unmodified Library as distributed by the authors,
+ or a modified version of the Library that is distributed under the
+ conditions defined in clause 3 of the GNU Lesser General Public
+ License.  This exception does not however invalidate any other
+ reasons why the executable file might be covered by the GNU Lesser
+ General Public License.
+ .
+ The Library is distributed under the terms of the GNU Lesser General
+ Public License version 2.1, with the special exception to it reported
+ above.
+ .
+ The full text of the GNU Lessere General Public License version 2.1
+ can be found in `/usr/share/common-licenses/LGPL-2.1'.

-- 
sexplib310 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

Reply via email to