[Pkg-ocaml-maint-commits] [SCM] ledit packaging branch, master, updated. debian/2.01-6-14-g82675a2

[Stephane Glondu]

The following commit has been merged in the master branch:
commit 6e4113aef39699063432911a54122a03dbb89cfe
Author: Stephane Glondu <steph at glondu.net>
Date:   Thu Feb 10 10:23:55 2011 +0100

    BSD is no longer a common license

diff --git a/debian/copyright b/debian/copyright
index 88f33f7..cccba64 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,12 +1,31 @@
-Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat
 Upstream-Author: Daniel de Rauglaudre <daniel.de_rauglaudre at inria.fr>
 Packaged-By: Sven LUTHER <luther at debian.org>
 Packaged-Date: Wed, 15 Aug 2001 12:38:35 +0200
 Original-Source-Location: http://cristal.inria.fr/~ddr/
 
 Files: *
-Copyright: (c) 2001, Daniel de Rauglaudre, INRIA.
+Copyright: 2001, Daniel de Rauglaudre, INRIA.
 License: BSD
-
-Apart from that, ledit is distributed under the terms of the BSD licence,
-as found in the /usr/share/common-licenses/BSD file on debian systems.
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+ 1. Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+ 2. 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.
+ 3. 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 OR 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.

-- 
ledit packaging