[Pkg-ocaml-maint-commits] [SCM] ocamlgraph packaging branch, master, updated. debian/1.7-1-15-g24cc7c2

Sat Dec 3 17:11:49 UTC 2011

The following commit has been merged in the master branch:
commit 16556431f281af89f6164ff331387acee9aa0119
Author: Stephane Glondu <steph at glondu.net>
Date:   Sat Dec 3 17:08:32 2011 +0100

    Update debian/copyright

diff --git a/debian/copyright b/debian/copyright
index 839aaed..4626857 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,10 +1,15 @@
-Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat
-Upstream-Author: Sylvain Conchon <Sylvain.Conchon at lri.fr>
-                 Jean-Christophe Filliâtre <Jean-Christophe.Filliatre at lri.fr>
-                 Julien Signoles <Julien.Signoles at lri.fr>
+Format: http://anonscm.debian.org/viewvc/dep/web/deps/dep5.mdwn?revision=202
+Source: http://ocamlgraph.lri.fr/
+Upstream-Contact:
+ Sylvain Conchon <Sylvain.Conchon at lri.fr>,
+ Jean-Christophe Filliâtre <Jean-Christophe.Filliatre at lri.fr>,
+ Julien Signoles <Julien.Signoles at lri.fr>
 Packaged-By: Sylvain Le Gall <gildor at debian.org>
 Packaged-Date: Sun, 22 Feb 2004 22:45:00 +0100
-Original-Source-Location: http://ocamlgraph.lri.fr/
+
+License: LGPL-2.1
+ The full text of the GNU Library General Public License version 2.1
+ can be found in `/usr/share/common-licenses/LGPL-2.1'.
 
 Files: dgraph/*
 Copyright: © 2009 CEA
@@ -13,50 +18,49 @@ 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.
-
+ The Library is distributed under the terms of the GNU Library General
+ Public License version 2.1.
+ .
+ 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-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).
-
-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.
+ The Library is distributed under the terms of the GNU Library General
+ Public License version 2.1.
+ .
+ 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-2011 Mehdi Dogguy <mehdi at debian.org>
 License: GPL-2+
+ The full text of the GNU General Public License version 2 can be
+ found in `/usr/share/common-licenses/GPL-2'.

-- 
ocamlgraph packaging

