[Pkg-ocaml-maint-commits] [SCM] hol-light packaging branch, master, updated. debian/20120423-1-7-g452b483

[Hendrik Tews]

The following commit has been merged in the master branch:
commit 35c9e74ffcb5c0d7bf8db90ad59806fd79ff6d55
Author: Hendrik Tews <hendrik at askra.de>
Date:   Wed May 30 13:36:09 2012 +0200

    adapt debian/copyright

diff --git a/debian/changelog b/debian/changelog
index d4e1f9c..29f1d31 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ hol-light (20120530-1) unstable; urgency=low
   * new upstream version revision 141 from 2012-05-30
   * remove patches that have been applied upstream: 
       adapt-holtest-for-debian and pa-j-makefile-fix
+  * adapt debian/copyright 
 
  -- Hendrik Tews <hendrik at askra.de>  Wed, 30 May 2012 09:29:26 +0200
 
diff --git a/debian/copyright b/debian/copyright
index c939b00..79eabdd 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -10,19 +10,36 @@ Copyright: 1998 University of Cambridge
 License: BSD-2-clause
 
 
+Files: miz3/*
+Copyright: 2009-2012 Freek Wiedijk
+License: BSD-2-clause
+Comment: There is no license in subdirectory miz3, but miz3/README
+ states that this directory is distributed under the same license
+ terms as HOL Light.
+
+
 Files: Permutation/*
 Copyright: 2005-2007 Marco Maggesi <maggesi at math.unifi.it>
 License: BSD-2-clause
 Comment: There is no license in subdirectory Permutation, but
- Permutation/DOC.txt states that all files are distributed under the
- same license terms as HOL Light.
+ Permutation/DOC.txt states that this directory is distributed under
+ the same license terms as HOL Light.
+
+
+Files: QBF/*
+Copyright: 2010-2011 Ondřej Kunčar
+License: BSD-2-clause
+Comment: There is no license in subdirectory QBF, but QBF/README
+ states that this directory is distributed under the same license
+ terms as HOL Light.
 
 
 Files: Unity/*
 Copyright: 1989-2008 by Flemming Andersen
 License: BSD-2-clause
 Comment: There is no license in subdirectory Unity, but Unity/README
- states that it is distributed under the same license as HOL Light.
+ states that this directory is distributed under the same license as
+ HOL Light.
 
 
 Files: pa_j_3.07.ml pa_j_3.08.ml pa_j_3.09.ml
@@ -131,6 +148,13 @@ License: Expat
  SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 
+Files: Ntrie/ntrie.ml
+Copyright: 2009 Clelia Lomuto and Marco Maggesi
+License: BSD-2-clause
+Comment: There is no license in this file, but it states that this it
+ distributed under the same license terms as HOL Light.
+
+
 Files: debian/*
 Copyright: 2012 Hendrik Tews <hendrik at askra.de>
 License: BSD-2-clause

-- 
hol-light packaging