The following commit has been merged in the master branch:
commit 8f81e2cb2ee8925dab17b9a25caae6a4e5cc2ea5
Author: Stephane Glondu <st...@glondu.net>
Date:   Sat Mar 3 14:58:41 2012 +0100

    Switch debian/copyright to format 1.0

diff --git a/debian/copyright b/debian/copyright
index 85059c5..b932835 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,163 +1,156 @@
-Packaged-By: Stefano Zacchiroli <z...@debian.org>
-Packaged-Date: Tue, 10 Jul 2007 20:57:36 +0200
-Upstream-Author: Daniel de Rauglaudre <daniel.de_rauglau...@inria.fr>
-Original-Source-Location: http://cristal.inria.fr/~ddr/camlp5/
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Contact: Daniel de Rauglaudre <daniel.de_rauglau...@inria.fr>
 
 Files: *
-Copyright: © 2007-2010 INRIA (Institut National de Recherche en
-                              Informatique et Automatique)
-License: BSD-C3
-
-  Copyright (c) 2007-2010, INRIA (Institut National de Recherches en
-  Informatique et Automatique). All rights reserved.
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions
-  are met:
-
-   * Redistributions of source code must retain the above copyright
-     notice, this list of conditions and the following disclaimer.
-   * Redistributions in binary form must reproduce the above copyright
-     notice, this list of conditions and the following disclaimer in
-     the documentation and/or other materials provided with the
-     distribution.
-   * Neither the name of INRIA, nor the names of its contributors may
-     be used to endorse or promote products derived from this software
-     without specific prior written permission.
-
-  THIS SOFTWARE IS PROVIDED BY INRIA AND CONTRIBUTORS ``AS IS'' AND
-  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-  THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
-  PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL INRIA AND
-  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
-  USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-  OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
-  OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-  SUCH DAMAGE.
+Copyright: 2007-2010, INRIA
+License: BSD-3-clause
 
 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.
+Copyright: 1996-2009, INRIA
+License: QPL-1 and other
 
 Files: debian/*
-Copyright: © 2007-2009 Stefano Zacchiroli <z...@debian.org>
-License: GPL-3+
-
-  The Debian packaging is licensed under the GPL (version 3 or above),
-  see `/usr/share/common-licenses/GPL-3'.
-
-----------------------------------------------------------------------
-
+Copyright: 2007-2009, Stefano Zacchiroli <z...@debian.org>
+License: BSD-3-clause
+
+License: BSD-3-clause
+ Copyright (c) 2007-2010, INRIA (Institut National de Recherches en
+ Informatique et Automatique). All rights reserved.  Redistribution
+ and use in source and binary forms, with or without modification, are
+ permitted provided that the following conditions are met:
+ .
+  * Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+  * Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in
+    the documentation and/or other materials provided with the
+    distribution.
+  * Neither the name of INRIA, nor the names of its contributors may
+    be used to endorse or promote products derived from this software
+    without specific prior written permission.
+ .
+ THIS SOFTWARE IS PROVIDED BY INRIA AND CONTRIBUTORS ``AS IS'' AND
+ ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+ PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL INRIA AND
+ CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ SUCH DAMAGE.
+
+License: QPL-1 and 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.
+ .
                    THE Q PUBLIC LICENSE version 1.0
-
+ .
               Copyright (C) 1999 Troll Tech AS, Norway.
                   Everyone is permitted to copy and
                   distribute this license document.
-
-The intent of this license is to establish freedom to share and change
-the software regulated by this license under the open source model.
-
-This license applies to any software containing a notice placed by the
-copyright holder saying that it may be distributed under the terms of
-the Q Public License version 1.0. Such software is herein referred to
-as the Software. This license covers modification and distribution of
-the Software, use of third-party application programs based on the
-Software, and development of free software which uses the Software.
-
-                            Granted Rights
-
-1. You are granted the non-exclusive rights set forth in this license
-provided you agree to and comply with any and all conditions in this
-license. Whole or partial distribution of the Software, or software
-items that link with the Software, in any form signifies acceptance of
-this license.
-
-2. You may copy and distribute the Software in unmodified form
-provided that the entire package, including - but not restricted to -
-copyright, trademark notices and disclaimers, as released by the
-initial developer of the Software, is distributed.
-
-3. You may make modifications to the Software and distribute your
-modifications, in a form that is separate from the Software, such as
-patches. The following restrictions apply to modifications:
-
-      a. Modifications must not alter or remove any copyright notices
-      in the Software.
-
-      b. When modifications to the Software are released under this
-      license, a non-exclusive royalty-free right is granted to the
-      initial developer of the Software to distribute your
-      modification in future versions of the Software provided such
-      versions remain available under these terms in addition to any
-      other license(s) of the initial developer.
-
-4. You may distribute machine-executable forms of the Software or
-machine-executable forms of modified versions of the Software,
-provided that you meet these restrictions:
-
-      a. You must include this license document in the distribution.
-
-      b. You must ensure that all recipients of the machine-executable
-      forms are also able to receive the complete machine-readable
-      source code to the distributed Software, including all
-      modifications, without any charge beyond the costs of data
-      transfer, and place prominent notices in the distribution
-      explaining this.
-
-      c. You must ensure that all modifications included in the
-      machine-executable forms are available under the terms of this
-      license.
-
-5. You may use the original or modified versions of the Software to
-compile, link and run application programs legally developed by you or
-by others.
-
-6. You may develop application programs, reusable components and other
-software items that link with the original or modified versions of the
-Software. These items, when distributed, are subject to the following
-requirements:
-
-      a. You must ensure that all recipients of machine-executable
-      forms of these items are also able to receive and use the
-      complete machine-readable source code to the items without any
-      charge beyond the costs of data transfer.
-
-      b. You must explicitly license all recipients of your items to
-      use and re-distribute original and modified versions of the
-      items in both machine-executable and source code forms. The
-      recipients must be able to do so without any charges whatsoever,
-      and they must be able to re-distribute to anyone they choose.
-
-      c. If the items are not available to the general public, and the
-      initial developer of the Software requests a copy of the items,
-      then you must supply one.
-
-                       Limitations of Liability
-
-In no event shall the initial developers or copyright holders be
-liable for any damages whatsoever, including - but not restricted to -
-lost revenue or profits or other direct, indirect, special, incidental
-or consequential damages, even if they have been advised of the
-possibility of such damages, except to the extent invariable law, if
-any, provides otherwise.
-
-                             No Warranty
-
-The Software and this license document are provided AS IS with NO
-WARRANTY OF ANY KIND, INCLUDING THE WARRANTY OF DESIGN,
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-
-                            Choice of Law
-
-This license is governed by the Laws of France.
+ .
+ The intent of this license is to establish freedom to share and change
+ the software regulated by this license under the open source model.
+ .
+ This license applies to any software containing a notice placed by the
+ copyright holder saying that it may be distributed under the terms of
+ the Q Public License version 1.0. Such software is herein referred to
+ as the Software. This license covers modification and distribution of
+ the Software, use of third-party application programs based on the
+ Software, and development of free software which uses the Software.
+ .
+                             Granted Rights
+ .
+ 1. You are granted the non-exclusive rights set forth in this license
+ provided you agree to and comply with any and all conditions in this
+ license. Whole or partial distribution of the Software, or software
+ items that link with the Software, in any form signifies acceptance of
+ this license.
+ .
+ 2. You may copy and distribute the Software in unmodified form
+ provided that the entire package, including - but not restricted to -
+ copyright, trademark notices and disclaimers, as released by the
+ initial developer of the Software, is distributed.
+ .
+ 3. You may make modifications to the Software and distribute your
+ modifications, in a form that is separate from the Software, such as
+ patches. The following restrictions apply to modifications:
+ .
+       a. Modifications must not alter or remove any copyright notices
+       in the Software.
+ .
+       b. When modifications to the Software are released under this
+       license, a non-exclusive royalty-free right is granted to the
+       initial developer of the Software to distribute your
+       modification in future versions of the Software provided such
+       versions remain available under these terms in addition to any
+       other license(s) of the initial developer.
+ .
+ 4. You may distribute machine-executable forms of the Software or
+ machine-executable forms of modified versions of the Software,
+ provided that you meet these restrictions:
+ .
+       a. You must include this license document in the distribution.
+ .
+       b. You must ensure that all recipients of the machine-executable
+       forms are also able to receive the complete machine-readable
+       source code to the distributed Software, including all
+       modifications, without any charge beyond the costs of data
+       transfer, and place prominent notices in the distribution
+       explaining this.
+ .
+       c. You must ensure that all modifications included in the
+       machine-executable forms are available under the terms of this
+       license.
+ .
+ 5. You may use the original or modified versions of the Software to
+ compile, link and run application programs legally developed by you or
+ by others.
+ .
+ 6. You may develop application programs, reusable components and other
+ software items that link with the original or modified versions of the
+ Software. These items, when distributed, are subject to the following
+ requirements:
+ .
+       a. You must ensure that all recipients of machine-executable
+       forms of these items are also able to receive and use the
+       complete machine-readable source code to the items without any
+       charge beyond the costs of data transfer.
+ .
+       b. You must explicitly license all recipients of your items to
+       use and re-distribute original and modified versions of the
+       items in both machine-executable and source code forms. The
+       recipients must be able to do so without any charges whatsoever,
+       and they must be able to re-distribute to anyone they choose.
+ .
+       c. If the items are not available to the general public, and the
+       initial developer of the Software requests a copy of the items,
+       then you must supply one.
+ .
+                        Limitations of Liability
+ .
+ In no event shall the initial developers or copyright holders be
+ liable for any damages whatsoever, including - but not restricted to -
+ lost revenue or profits or other direct, indirect, special, incidental
+ or consequential damages, even if they have been advised of the
+ possibility of such damages, except to the extent invariable law, if
+ any, provides otherwise.
+ .
+                              No Warranty
+ .
+ The Software and this license document are provided AS IS with NO
+ WARRANTY OF ANY KIND, INCLUDING THE WARRANTY OF DESIGN,
+ MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ .
+                             Choice of Law
+ .
+ This license is governed by the Laws of France.

-- 
camlp5 packaging

_______________________________________________
Pkg-ocaml-maint-commits mailing list
Pkg-ocaml-maint-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits

Reply via email to