[Pkg-ocaml-maint-commits] [SCM] ocamlgraph packaging branch, master, updated. debian/1.5-1-5-ga6b6fdb

[Mehdi Dogguy]

The following commit has been merged in the master branch:
commit a6b6fdb12db558f14eca534aadd36aac113b903e
Author: Mehdi Dogguy <mehdi at debian.org>
Date:   Fri Apr 15 22:15:42 2011 +0200

    Update copyright file, and mention linking exception (Closes: #589032).

diff --git a/debian/changelog b/debian/changelog
index 8740af4..0d299a9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
 ocamlgraph (1.7-1) unstable; urgency=low
 
   * New upstream version.
+  * Update copyright file, and mention linking exception (Closes: #589032).
 
- -- Mehdi Dogguy <mehdi at debian.org>  Fri, 15 Apr 2011 22:07:51 +0200
+ -- Mehdi Dogguy <mehdi at debian.org>  Fri, 15 Apr 2011 22:15:07 +0200
 
 ocamlgraph (1.5-1) unstable; urgency=low
 
diff --git a/debian/copyright b/debian/copyright
index 8bcc7a3..839aaed 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -10,18 +10,53 @@ Files: dgraph/*
 Copyright: © 2009 CEA
 License: LGPL-2.1
 
+Files: view_graph/*
+Copyright: © 2008 Anne Pacalet
+License: LGPL-2.1 + linking exception
+
+The Library is distributed under the terms of the GNU Library General
+Public License version 2.1 (included below).
+
+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, or a
+modified version of the Library that is distributed under the
+conditions defined in clause 3 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.
+
+
 Files: *
-Copyright: © 2004-2008 Sylvain Conchon <Sylvain.Conchon at lri.fr>
-           © 2004-2008 Jean-Christophe Filliâtre <Jean-Christophe.Filliatre at lri.fr>
-           © 2004-2008 Julien Signoles <Julien.Signoles at lri.fr>
-License: LGPL-2
+Copyright: © 2004-2010 Sylvain Conchon <Sylvain.Conchon at lri.fr>
+           © 2004-2010 Jean-Christophe Filliâtre <Jean-Christophe.Filliatre at lri.fr>
+           © 2004-2010 Julien Signoles <Julien.Signoles at lri.fr>
+License: LGPL-2.1
+
+The Library is distributed under the terms of the GNU Library General
+Public License version 2.1 (included below).
 
-OCamlGraph is distributed under the terms of the LGPL licence, which  can be
-found in the /usr/share/common-licenses/LGPL-2 file on debian systems.
+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, or a
+modified version of the Library that is distributed under the
+conditions defined in clause 3 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.
 
 Files: debian/*
 Copyright: © 2004-2008 Sylvain Le Gall <gildor at debian.org>
            ©      2008 Stefano Zacchiroli <zack at debian.org>
-	   ©      2009 Mehdi Dogguy <mehdi at debian.org>
-License: GPL-3+
-
+	   © 2009-2011 Mehdi Dogguy <mehdi at debian.org>
+License: GPL-2+

-- 
ocamlgraph packaging