[Pkg-ocaml-maint-commits] [SCM] js-of-ocaml packaging branch, master, updated. debian/1.3.2-1-6-gfa3a808

Fri May 10 09:31:43 UTC 2013

The following commit has been merged in the master branch:
commit 2a6eb640ff09085af35f0d5201bb8590db171361
Author: Stephane Glondu <steph at glondu.net>
Date:   Fri May 10 11:13:51 2013 +0200

    Use format version 1.0 in debian/copyright

diff --git a/debian/copyright b/debian/copyright
index 1052db1..28207ec 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,3 +1,4 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Packaged-By: Stéphane Glondu <glondu at debian.org>
 Packaged-Date: Sun, 23 Jan 2011 09:40:34 +0100
 Source: http://ocsigen.org/install/js_of_ocaml
@@ -8,47 +9,20 @@ Files: *
 Copyright: 2010, Jérôme Vouillon and contributors
            2010, PPS, CNRS, Université Paris Diderot
 License: LGPL-2.1+
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU Lesser General Public License as published by
- the Free Software Foundation, with linking exception;
- either version 2.1 of the License, or (at your option) any later version.
- .
- 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 Lesser General Public License for more details. On Debian systems, the full
- text can be found in `/usr/share/common-licenses/LGPL-2.1'.
 
 Files: lib/*
 Copyright: 2010, Jérôme Vouillon, PPS, CNRS, Université Paris Diderot
-License: LGPL-2+ | other
- This Library is distributed under the terms of the GNU Library
- General Public License version 2. On Debian systems, the full text
- can be found in `/usr/share/common-licenses/LGPL-2'.
- .
- As a special exception to the GNU Library 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 Library General
- Public License.  By "a publicly distributed version of the Library",
- we mean either the unmodified Library as distributed by INRIA, or a
- modified version of the Library that is distributed under the
- conditions defined in clause 2 of the GNU Library General Public
- License.  This exception does not however invalidate any other
- reasons why the executable file might be covered by the GNU Library
- General Public License.
+License: LGPL-2-exception
 
 Files: runtime/*
 Copyright: 2010, Jérôme Vouillon and contributors
            2010, PPS, CNRS, Université Paris Diderot
            1996, INRIA
-License: LGPL-2+ | other
+License: LGPL-2-exception
 
 Files: tools/*
 Copyright: 2001, INRIA
-License: QPL | other
+License: QPL-exception
  The software is distributed under the terms of the Q Public License
  version 1.0 with a change to choice of law. The full text can be
  found in `/usr/share/doc/ocaml-base-nox/copyright', in ocaml-base-nox
@@ -60,30 +34,59 @@ License: QPL | other
  are not made available to the general public, without any of the
  additional requirements listed in clause 6c of the Q Public licence.
 
-Files: examples/{boulderdash,minesweeper}/*
+Files: examples/boulderdash/* examples/minesweeper/*
 Copyright: 2007-2009, Benjamin Canou
-License: other
+License: WTFPL
  These examples were taken from obrowser and adapted to
  Js_of_ocaml. You are free to use them under the terms of the Do What
- The Fuck You Want Public License. This license is detailed at the end
- of this file.
-
-Files: debian/*
-Copyright: 2011, Stéphane Glondu <glondu at debian.org>
-License: GPL-2+
-
---------------------------------------------------------------------------
+ The Fuck You Want Public License.
+ .
             DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
                     Version 2, December 2004
-
+ .
  Copyright (C) 2004 Sam Hocevar
   14 rue de Plaisance, 75014 Paris, France
  Everyone is permitted to copy and distribute verbatim or modified
  copies of this license document, and changing it is allowed as long
  as the name is changed.
-
+ .
             DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+ .
+ 0. You just DO WHAT THE FUCK YOU WANT TO.
+
+Files: debian/*
+Copyright: 2011, Stéphane Glondu <glondu at debian.org>
+License: LGPL-2.1+
+
+License: LGPL-2.1+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU Lesser General Public License as
+ published by the Free Software Foundation, with linking exception;
+ either version 2.1 of the License, or (at your option) any later
+ version.
+ .
+ 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
+ Lesser General Public License for more details. On Debian systems,
+ the full text can be found in `/usr/share/common-licenses/LGPL-2.1'.
 
-  0. You just DO WHAT THE FUCK YOU WANT TO.
---------------------------------------------------------------------------
+License: LGPL-2-exception
+ This Library is distributed under the terms of the GNU Library
+ General Public License version 2. On Debian systems, the full text
+ can be found in `/usr/share/common-licenses/LGPL-2'.
+ .
+ As a special exception to the GNU Library 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 Library General
+ Public License.  By "a publicly distributed version of the Library",
+ we mean either the unmodified Library as distributed by INRIA, or a
+ modified version of the Library that is distributed under the
+ conditions defined in clause 2 of the GNU Library General Public
+ License.  This exception does not however invalidate any other
+ reasons why the executable file might be covered by the GNU Library
+ General Public License.

-- 
js-of-ocaml packaging

