[Pkg-ocaml-maint-commits] [dose3] 04/05: Clarify copyright situation of scripts/pack.ml in debian/copyright and patch the copyright header of scripts/pack.ml accordingly with a new patch called 0001-fix-licence-header.patch

[Johannes Schauer]

This is an automated email from the git hooks/post-receive script.

josch pushed a commit to annotated tag debian/4.3-1
in repository dose3.

commit 1784ebc468c623b5a01ef42ed2eb8526245b959c
Author: Johannes Schauer <josch at debian.org>
Date:   Fri May 13 18:01:47 2016 +0200

    Clarify copyright situation of scripts/pack.ml in debian/copyright and patch the copyright header of scripts/pack.ml accordingly with a new patch called 0001-fix-licence-header.patch
---
 debian/changelog                             |  3 +++
 debian/copyright                             | 18 ++++++++++++++++++
 debian/patches/0001-fix-licence-header.patch | 25 +++++++++++++++++++++++++
 debian/patches/series                        |  1 +
 4 files changed, 47 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index bde2977..40abae8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,9 @@ dose3 (4.3-1) experimental; urgency=medium
     upgrades or downgrades but only a single install request. See the patch
     description as well as the closed bug for details (closes: #823906)
   * Refreshed patch binaries-prefix-edos
+  * Clarify copyright situation of scripts/pack.ml in debian/copyright and
+    patch the copyright header of scripts/pack.ml accordingly with a new patch
+    called 0001-fix-licence-header.patch
 
  -- Ralf Treinen <treinen at debian.org>  Sat, 23 Apr 2016 17:28:08 +0200
 
diff --git a/debian/copyright b/debian/copyright
index 41aa49f..c067da9 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -39,6 +39,24 @@ Files: common/shell_lexer.mll
 Copyright: © 2015 Johannes Schauer <j.schauer at email.de>
 License: LGPL-3+
 
+Files: scripts/pack.ml
+Copyright: 2011 OCamlPro SAS
+Comment:
+ Some versions of this file had a copyright header claiming the file was
+ distributed under the terms of the "GNU Public License version 3.0". Later
+ releases clarified that the GPL3 was meant.
+ .
+ This file only serves as a helper during compilation (it packs together all
+ mli files into one file for ocamldoc) and its contents are not linked or
+ otherwise copied into the final binaries. Thus, the final binaries of the
+ dose3 packages are still distributed under the terms of the LGPL-3+.
+License: GPL-3
+ This file is distributed under the terms of the GNU General Public License
+ version 3.0.
+ .
+ On Debian systems, the complete text of the GNU General Public License version
+ 3 can be found in `/usr/share/common-licenses/GPL-3'.
+
 License: LGPL-3+
  This library is free software: you can redistribute it and/or modify
  it under the terms of the GNU Lesser General Public License as
diff --git a/debian/patches/0001-fix-licence-header.patch b/debian/patches/0001-fix-licence-header.patch
new file mode 100644
index 0000000..1bcff36
--- /dev/null
+++ b/debian/patches/0001-fix-licence-header.patch
@@ -0,0 +1,25 @@
+From 9e1e7e0aa93ed319ac1e1b5fce596989e3c85ccd Mon Sep 17 00:00:00 2001
+From: Pietro Abate <pietro.abate at pps.univ-paris-diderot.fr>
+Date: Sun, 24 Apr 2016 17:12:31 +0200
+Subject: [PATCH] fix licence header
+
+---
+ scripts/pack.ml | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/scripts/pack.ml b/scripts/pack.ml
+index 7821b61..d12fa88 100644
+--- a/scripts/pack.ml
++++ b/scripts/pack.ml
+@@ -6,7 +6,7 @@
+ (*                                                                     *)
+ (*  Copyright 2011 OCamlPro SAS                                        *)
+ (*  All rights reserved.  This file is distributed under the terms of  *)
+-(*  the GNU Public License version 3.0.                                *)
++(*  the GNU General Public License version 3.0.                        *)
+ (*                                                                     *)
+ (***********************************************************************)
+ 
+-- 
+2.5.1
+
diff --git a/debian/patches/series b/debian/patches/series
index e5d64a1..b707708 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 binaries-prefix-edos
 0001-applications-apt-cudf.ml-Do-not-generate-removal-req.patch
+0001-fix-licence-header.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/dose3.git