The following commit has been merged in the master branch:
commit 18c4c605fbc2aa1f1a9093c42802d4bcd7b7dbc2
Author: Hendrik Tews <hend...@askra.de>
Date:   Tue Apr 10 13:06:38 2012 +0200

    copyright refinement
    - checked copyright statements of various files and added them to
      debian/copyright; some of them have no or an unclear license
    - fixed typos in README.debian

diff --git a/debian/README.Debian b/debian/README.Debian
index 79e92e4..b2c2006 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -11,9 +11,9 @@ HOL Light runs inside an OCaml toplevel. On every session 
start, the
 logical core and all auxilary theorems are loaded as sources into the
 OCaml toplevel. On modern hardware this takes about 90 seconds.
 
-HOL Light can use several external tools. Prover9, csdp, pari-gp and
+HOL Light can use several external tools. Prover9, CSDP, PARI/GP and
 Maxima are available in Debian as packages prover9, coinor-csdp,
-PARI/GP and maxima. The SAT-solver interface of HOL Light requires
+pari-gp and maxima. The SAT-solver interface of HOL Light requires
 MiniSat and zChaff. MiniSat can be installed as package minisat, but
 zChaff has a very restrictive license. If you are eligible you can
 install it from http://www.princeton.edu/~chaff/zchaff.html . HOL
@@ -26,7 +26,7 @@ available. To use it do:
 
 1. install dmtcp: become root and do
 
-   aptitude install 
+   aptitude install dmtcp
 
 2. run hol-light under control of dmtcp
 
@@ -65,4 +65,4 @@ On Debian the test suite will produce one error
 be run without zChaff, which is not available in Debian.
 
 
- -- Hendrik Tews <hend...@askra.de>, Sun, 25 Mar 2012 22:28:24 +0200
+ -- Hendrik Tews <hend...@askra.de>, Wed,  4 Apr 2012 20:55:23 +0200
diff --git a/debian/copyright b/debian/copyright
index 6a5934d..628d9f5 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,12 +1,12 @@
-Format: http://dep.debian.net/deps/dep5
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: hol-light
 Upstream-Contact: John Harrison <jo...@ichips.intel.com>
 Source: svn repository at http://hol-light.googlecode.com/svn/trunk
 
 Files: *
 Copyright: 1998 University of Cambridge
-           1998-2012 John Harrison <jo...@ichips.intel.com>
-License: BSD 2 clause
+           1998-2012 John Harrison <jo...@ichips.intel.com> and others
+License: BSD-2-clause
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions are
  met:
@@ -32,26 +32,111 @@ License: BSD 2 clause
  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
+Files: Permutation/*
+Copyright: 2005-2007 Marco Maggesi <magg...@math.unifi.it>
+License: BSD-2-clause
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are
+ met:
+ .
+  o Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+ .
+  o 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.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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 THE COPYRIGHT
+ HOLDER 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.
+Comment: There is no license in subdirectory Permutation, but
+ Permutation/DOC.txt states that all files under the same license terms
+ as HOL Light.
+
+Files: Unity/*
+Copyright: 1989-2008 by Flemming Andersen
+License: ??
+
+Files: pa_j*
+Copyright: 2007-2010 INRIA 
+License: no?
+
+Files: Jordan/float.ml
+Copyright: Thomas C. Hales
+License: GPL-3
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+ .
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>. 
+ .
+ On Debian systems, the full text of the GNU General Public
+ License version 3 can be found in the file
+ `/usr/share/common-licenses/GPL-3'.
+
+
+Files: Minisat/zc2mso/zc2mso.C
+Copyright: 2003-2005, Niklas Een, Niklas Sorensson
+License: Expat
+ Permission is hereby granted, free of charge, to any person obtaining
+ a copy of this software and associated documentation files (the
+ "Software"), to deal in the Software without restriction, including
+ without limitation the rights to use, copy, modify, merge, publish,
+ distribute, sublicense, and/or sell copies of the Software, and to
+ permit persons to whom the Software is furnished to do so, subject to
+ the following conditions:
+ .
+ The above copyright notice and this permission notice shall be included
+ in all copies or substantial portions of the Software.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+ CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+
 Files: debian/*
 Copyright: 2012 Hendrik Tews <hend...@askra.de>
-License: GPL-2+
- This program is free software; you can redistribute it
- and/or modify it under the terms of the GNU General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later
- version.
- .
- This program is distributed in the hope that it will be
- useful, but WITHOUT ANY WARRANTY; without even the implied
- warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE.  See the GNU General Public License for more
- details.
- .
- You should have received a copy of the GNU General Public
- License along with this package; if not, write to the Free
- Software Foundation, Inc., 51 Franklin St, Fifth Floor,
- Boston, MA  02110-1301 USA
+License: BSD-2-clause
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are
+ met:
  .
- On Debian systems, the full text of the GNU General Public
- License version 2 can be found in the file
- `/usr/share/common-licenses/GPL-2'.
+  o Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+ .
+  o 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.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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 THE COPYRIGHT
+ HOLDER 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.

-- 
hol-light 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