The following commit has been merged in the master branch:
commit 581ef954ad1b23547a2b3d8bd70ae489bb3e7d28
Author: Hendrik Tews <hend...@askra.de>
Date:   Mon Mar 26 10:00:32 2012 +0200

    adapt to new upstream version
    - changes license
    - removed unnecessary chmod

diff --git a/debian/changelog b/debian/changelog
index 2b7d72d..786ac24 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-hol-light (20120312-1) unstable; urgency=low
+hol-light (20120322-1) unstable; urgency=low
 
   * Initial release (Closes: #663754)
 
diff --git a/debian/copyright b/debian/copyright
index da14a0b..6a5934d 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -6,31 +6,30 @@ 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: HOL Light
- HOL Light, hereinafter referred to as "the software", is a
- computer theorem proving system written by John Harrison. Much of the
- software was developed at the University of Cambridge Computer Laboratory,
- New Museums Site, Pembroke Street, Cambridge, CB2 3QG, England. The
- software is copyright, University of Cambridge 1998 and John Harrison
- 1998-2007.
+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:
  .
- Permission to use, copy, modify, and distribute the software and its
- documentation for any purpose and without fee is hereby granted. In the
- case of further distribution of the software the present text, including
- copyright notice, licence and disclaimer of warranty, must be included in
- full and unmodified form in any release. Distribution of derivative
- software obtained by modifying the software, or incorporating it into
- other software, is permitted, provided the inclusion of the software is
- acknowledged and that any changes made to the software are clearly
- documented.
+  o Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
  .
- John Harrison and the University of Cambridge disclaim all warranties
- with regard to the software, including all implied warranties of
- merchantability and fitness. In no event shall John Harrison or the
- University of Cambridge be liable for any special, indirect,
- incidental or consequential damages or any damages whatsoever,
- including, but not limited to, those arising from computer failure or
- malfunction, work stoppage, loss of profit or loss of contracts.
+  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.
 
 
 Files: debian/*
diff --git a/debian/rules b/debian/rules
index 5ece79f..f0a42b2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,8 +11,8 @@
 # build-arch and build-indep targets  by Bill Allombert 2001
 
 # Uncomment this to turn on verbose mode.
-export DH_VERBOSE=1
-export DH_OPTIONS=-v 
+#export DH_VERBOSE=1
+#export DH_OPTIONS=-v 
 
 include /usr/share/ocaml/ocamlvars.mk
 
@@ -35,8 +35,6 @@ override_dh_auto_install:
        install -d $(INSTDIR)/usr/share/hol-light
        tar --anchored --exclude-from=debian/hol-light-source.exclude -c . | \
                tar -C $(INSTDIR)/usr/share/hol-light -x
-       chmod 644 $(INSTDIR)/usr/share/hol-light/Unity/README
-       chmod 644 $(INSTDIR)/usr/share/hol-light/100/e_is_transcendental.ml
        install -d $(INSTDIR)/usr/bin
        install debian/hol-light.sh $(INSTDIR)/usr/bin/hol-light
 
diff --git a/debian/test-hol-light b/debian/test-hol-light
index 958682c..a586668 100755
--- a/debian/test-hol-light
+++ b/debian/test-hol-light
@@ -16,7 +16,7 @@ function holtest() {
     fi
 }
 
-holtest Library/agm.ml
+#holtest Library/agm.ml
 # holtest Library/binary.ml
 # holtest Library/binomial.ml
 # holtest Library/card.ml

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