[Pkg-ocaml-maint-commits] [SCM] camlp5 packaging branch, master, updated. debian/5.10-3-10-g53ab382

[Stephane Glondu]

The following commit has been merged in the master branch:
commit aa2d070cf6b173f9fab3e0187d47caa1bf9c15b9
Author: Stephane Glondu <steph at glondu.net>
Date:   Sun Jun 28 11:00:37 2009 +0200

    Change debian/copyright to new format

diff --git a/debian/copyright b/debian/copyright
index 9e1532c..b862a76 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,33 +1,36 @@
-This package was debianized by Stefano Zacchiroli <zack at debian.org> on
-Tue, 10 Jul 2007 20:57:36 +0200.
-
-It was downloaded from http://cristal.inria.fr/~ddr/camlp5/
-
-Upstream Author: 
-
-    Daniel de Rauglaudre <daniel.de_rauglaudre at inria.fr>
-
-Copyright: 
-
-    Copyright (c) 1996-2007, INRIA (Institut National de Recherches en Informatique et Automatique)
-
-License:
-
-    CamlP5 (everything except the stuff located under ocaml_stuff/) is licensed
-    under the BSD license (with the exception of the copyright, which is by
-    INRIA), see `/usr/share/common-licenses/BSD'.
-
-    The stuff located under ocaml_stuff/ is distributed under the terms of the
-    Q Public License version 1.0 with a change to choice of law (included
-    below). Moreover, as a special exception to the Q Public Licence, you may
-    develop application programs, reusable components and other software items
-    that link with the original or modified versions of the code and are not
-    made available to the general public, without any of the additional
-    requirements listed in clause 6c of the Q Public licence.
-
-The Debian packaging is (C) 2007-2009, Stefano Zacchiroli <zack at debian.org>
-and is licensed under the GPL (version 3 or above), see
-`/usr/share/common-licenses/GPL-3'.
+Packaged-By: Stefano Zacchiroli <zack at debian.org>
+Packaged-Date: Tue, 10 Jul 2007 20:57:36 +0200
+Upstream-Author: Daniel de Rauglaudre <daniel.de_rauglaudre at inria.fr>
+Original-Source-Location: http://cristal.inria.fr/~ddr/camlp5/
+
+Files: *
+Copyright: © 1996-2009 INRIA (Institut National de Recherche en
+                              Informatique et Automatique)
+License: BSD-C3
+
+  CamlP5 (everything except the stuff located under ocaml_stuff/) is
+  licensed under the BSD license (with the exception of the copyright,
+  which is by INRIA), see `/usr/share/common-licenses/BSD'.
+
+Files: ocaml_stuff/*
+Copyright: © 1996-2009 INRIA (Institut National de Recherche en
+                              Informatique et Automatique)
+License: QPL-1 | other
+
+  The stuff located under ocaml_stuff/ is distributed under the terms of the
+  Q Public License version 1.0 with a change to choice of law (included
+  below). Moreover, as a special exception to the Q Public Licence, you may
+  develop application programs, reusable components and other software items
+  that link with the original or modified versions of the code and are not
+  made available to the general public, without any of the additional
+  requirements listed in clause 6c of the Q Public licence.
+
+Files: debian/*
+Copyright: © 2007-2009 Stefano Zacchiroli <zack at debian.org>
+License: GPL-3+
+
+  The Debian packaging is licensed under the GPL (version 3 or above),
+  see `/usr/share/common-licenses/GPL-3'.
 
 ----------------------------------------------------------------------
 
@@ -133,4 +136,3 @@ MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
                             Choice of Law
 
 This license is governed by the Laws of France.
-

-- 
camlp5 packaging