This is an automated email from the git hooks/post-receive script.
hendrik-guest pushed a commit to branch master
in repository hol-light.
commit 366cb237e587055a4dc7855d4e62f65c91d21b88
Author: Hendrik Tews <hend...@askra.de>
Date: Wed Aug 14 22:26:11 2013 +0200
update patches
---
debian/changelog | 4 +++-
debian/patches/default-hollight-dir | 6 ++++--
debian/patches/holtest-no-proof-recording.patch | 2 +-
debian/patches/include-compiler-libs.patch | 15 ---------------
debian/patches/series | 1 -
5 files changed, 8 insertions(+), 20 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index ffb8637..551b330 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,10 @@ hol-light (20130811-1) unstable; urgency=low
* new upstream version revision 170 from 2013-08-11
* fix vcs fields
+ * refresh patches
+ * delete include-compiler-libs patch (applied upstream)
- -- Hendrik Tews <hend...@askra.de> Wed, 14 Aug 2013 22:08:52 +0200
+ -- Hendrik Tews <hend...@askra.de> Wed, 14 Aug 2013 22:25:52 +0200
hol-light (20130511-1) unstable; urgency=low
diff --git a/debian/patches/default-hollight-dir
b/debian/patches/default-hollight-dir
index 4acdbd3..eb1d614 100644
--- a/debian/patches/default-hollight-dir
+++ b/debian/patches/default-hollight-dir
@@ -2,12 +2,14 @@ Description: configure default HOL Light source directory
Author: Hendrik Tews <hend...@askra.de>
--- a/hol.ml
+++ b/hol.ml
-@@ -11,8 +11,16 @@
+@@ -11,10 +11,18 @@
let hol_version = "2.20++";;
-+let debian_hol_light_dir = "/usr/share/hol-light"
++let debian_hol_light_dir = "/usr/share/hol-light";;
+
+ #directory "+compiler-libs";;
+
let hol_dir = ref
- (try Sys.getenv "HOLLIGHT_DIR" with Not_found -> Sys.getcwd());;
+ (try Sys.getenv "HOLLIGHT_DIR"
diff --git a/debian/patches/holtest-no-proof-recording.patch
b/debian/patches/holtest-no-proof-recording.patch
index c01248e..ec1361f 100644
--- a/debian/patches/holtest-no-proof-recording.patch
+++ b/debian/patches/holtest-no-proof-recording.patch
@@ -2,7 +2,7 @@ Description: don't build the proof-recording version as part of
the test suite
Author: Hendrik Tews <hend...@askra.de>
--- a/holtest
+++ b/holtest
-@@ -165,7 +165,7 @@
+@@ -172,7 +172,7 @@
echo '### Loading 100/wilson.ml'; echo 'loadt "100/wilson.ml";;' | (time
$hollight)
# Build the proof-recording version of HOL
diff --git a/debian/patches/include-compiler-libs.patch
b/debian/patches/include-compiler-libs.patch
deleted file mode 100644
index 95e4bcc..0000000
--- a/debian/patches/include-compiler-libs.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Description: include compiler-libs dir for OCaml 4
-Author: Hendrik Tews <hend...@askra.de>
---- a/hol.ml
-+++ b/hol.ml
-@@ -11,7 +11,9 @@
-
- let hol_version = "2.20++";;
-
--let debian_hol_light_dir = "/usr/share/hol-light"
-+let debian_hol_light_dir = "/usr/share/hol-light";;
-+
-+#directory "+compiler-libs";;
-
- let hol_dir = ref
- (try Sys.getenv "HOLLIGHT_DIR"
diff --git a/debian/patches/series b/debian/patches/series
index e0623d1..0c7a73b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
default-hollight-dir
holtest-no-proof-recording.patch
-include-compiler-libs.patch
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-ocaml-maint/packages/hol-light.git
_______________________________________________
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
