[Pkg-ocaml-maint-commits] [SCM] js-of-ocaml packaging branch, master, updated. debian/1.0.2+dfsg-1-5-g4e50563

[Stephane Glondu]

The following commit has been merged in the master branch:
commit 493e79d615431fd285e9c2a523f443364e1f3181
Author: Stephane Glondu <steph at glondu.net>
Date:   Sat Jul 30 18:24:58 2011 +0200

    Update copyright file

diff --git a/debian/README.source b/debian/README.source
deleted file mode 100644
index df48cb8..0000000
--- a/debian/README.source
+++ /dev/null
@@ -1,11 +0,0 @@
-js-of-ocaml Debian source package
-=================================
-
-Repackaged upstream sources
----------------------------
-
-Some examples (boulderdash, canvas, minesweeper and sudoku) have been
-removed from upstream sources because they do not come with a clear
-license and/or copyright header.
-
- -- Stéphane Glondu <glondu at debian.org>, Wed, 16 Mar 2011 23:25:27 +0100
diff --git a/debian/copyright b/debian/copyright
index 13a8c0e..1052db1 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -5,8 +5,7 @@ Upstream-Name: Js_of_ocaml
 Upstream-Contact: The Ocsigen Team <dev at ocsigen.org>
 
 Files: *
-Copyright: 2010, Jérôme Vouillon
-           2010, Raphaël Proust
+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
@@ -42,7 +41,7 @@ License: LGPL-2+ | other
  General Public License.
 
 Files: runtime/*
-Copyright: 2010, Jérôme Vouillon
+Copyright: 2010, Jérôme Vouillon and contributors
            2010, PPS, CNRS, Université Paris Diderot
            1996, INRIA
 License: LGPL-2+ | other
@@ -61,6 +60,30 @@ 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}/*
+Copyright: 2007-2009, Benjamin Canou
+License: other
+ 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+
+
+--------------------------------------------------------------------------
+            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.
+--------------------------------------------------------------------------

-- 
js-of-ocaml packaging