[Pkg-ocaml-maint-commits] [mlpost] 01/02: Disable configure check that ocamlbuild has the same version as ocaml

[Stéphane Glondu]

This is an automated email from the git hooks/post-receive script.

glondu pushed a commit to branch master
in repository mlpost.

commit 22b630ea20398b4a603a32185f9f71ec8a8064b1
Author: Stephane Glondu <steph at glondu.net>
Date:   Sat Jul 22 19:29:58 2017 +0200

    Disable configure check that ocamlbuild has the same version as ocaml
---
 .../0001-Do-not-remove-ocamlbuild.Makefile.patch    |  1 -
 ...2-Create-man-dir-before-installing-into-it.patch |  1 -
 .../0003-Fix-hyphen-escapes-in-manpage.patch        |  1 -
 ...mlmacroparser-use-.byte-instead-of-.native.patch |  1 -
 .../0005-Fully-qualify-name-of-input-ed-files.patch |  1 -
 debian/patches/0006-Fix-for-ocamldoc-4.patch        |  1 -
 ...nfigure-check-that-ocamlbuild-has-the-same.patch | 21 +++++++++++++++++++++
 debian/patches/series                               |  1 +
 8 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/debian/patches/0001-Do-not-remove-ocamlbuild.Makefile.patch b/debian/patches/0001-Do-not-remove-ocamlbuild.Makefile.patch
index 44a9fa3..6dc8603 100644
--- a/debian/patches/0001-Do-not-remove-ocamlbuild.Makefile.patch
+++ b/debian/patches/0001-Do-not-remove-ocamlbuild.Makefile.patch
@@ -20,4 +20,3 @@ index ef32e7d..f8ee8ec 100644
  dist-clean distclean:: clean
 -	rm -f Makefile config.cache config.log config.status META version.ml myocamlbuild.ml ocamlbuild.Makefile simple.Makefile
 +	rm -f Makefile config.cache config.log config.status META version.ml myocamlbuild.ml simple.Makefile
--- 
diff --git a/debian/patches/0002-Create-man-dir-before-installing-into-it.patch b/debian/patches/0002-Create-man-dir-before-installing-into-it.patch
index 7e81305..c945739 100644
--- a/debian/patches/0002-Create-man-dir-before-installing-into-it.patch
+++ b/debian/patches/0002-Create-man-dir-before-installing-into-it.patch
@@ -20,4 +20,3 @@ index 07301a8..d4e835e 100644
  	cp -f $(BUILD)$(TOOL) $(BINDIR)/mlpost
  	cp -f mlpost.1 $(MANDIR)/man1
  
--- 
diff --git a/debian/patches/0003-Fix-hyphen-escapes-in-manpage.patch b/debian/patches/0003-Fix-hyphen-escapes-in-manpage.patch
index 9acecd9..1f873f3 100644
--- a/debian/patches/0003-Fix-hyphen-escapes-in-manpage.patch
+++ b/debian/patches/0003-Fix-hyphen-escapes-in-manpage.patch
@@ -52,4 +52,3 @@ index b41ec62..11afcb7 100644
  Don't remove intermediates files. The metapost backend use some
  intermediates files which are removed without this option.
  .TP
--- 
diff --git a/debian/patches/0004-myocamlmacroparser-use-.byte-instead-of-.native.patch b/debian/patches/0004-myocamlmacroparser-use-.byte-instead-of-.native.patch
index 9c52e2b..4d0a909 100644
--- a/debian/patches/0004-myocamlmacroparser-use-.byte-instead-of-.native.patch
+++ b/debian/patches/0004-myocamlmacroparser-use-.byte-instead-of-.native.patch
@@ -29,4 +29,3 @@ index e0f659c..f60cfaf 100644
        flag ["ocaml";"doc"] &
          S([A"-hide" ; A "Mlpost"; A"-g"; A "customdoc/img.cmo"]
              @ (if "@LABLGTK2@" = "yes"
--- 
diff --git a/debian/patches/0005-Fully-qualify-name-of-input-ed-files.patch b/debian/patches/0005-Fully-qualify-name-of-input-ed-files.patch
index 6595e9b..e5c8d67 100644
--- a/debian/patches/0005-Fully-qualify-name-of-input-ed-files.patch
+++ b/debian/patches/0005-Fully-qualify-name-of-input-ed-files.patch
@@ -21,4 +21,3 @@ index 71ed108..4469d51 100644
  
  %%redefinition
  def doexternalfigure (expr filename) text transformation =
--- 
diff --git a/debian/patches/0006-Fix-for-ocamldoc-4.patch b/debian/patches/0006-Fix-for-ocamldoc-4.patch
index 4140157..dbbde25 100644
--- a/debian/patches/0006-Fix-for-ocamldoc-4.patch
+++ b/debian/patches/0006-Fix-for-ocamldoc-4.patch
@@ -39,4 +39,3 @@ index 31eea9a..6dd316b 100644
    (* we need to deactivate the -html option of ocamldoc, otherwise our generator
     * is overwritten by the standard html generator. Ocamlbuild gives the -html
     * option to ocamldoc, so this is really required *)
--- 
diff --git a/debian/patches/0007-Disable-configure-check-that-ocamlbuild-has-the-same.patch b/debian/patches/0007-Disable-configure-check-that-ocamlbuild-has-the-same.patch
new file mode 100644
index 0000000..ce8ab83
--- /dev/null
+++ b/debian/patches/0007-Disable-configure-check-that-ocamlbuild-has-the-same.patch
@@ -0,0 +1,21 @@
+From: Stephane Glondu <steph at glondu.net>
+Date: Sat, 22 Jul 2017 19:29:26 +0200
+Subject: Disable configure check that ocamlbuild has the same version as ocaml
+
+---
+ configure.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.in b/configure.in
+index 91137f2..4c0f109 100644
+--- a/configure.in
++++ b/configure.in
+@@ -175,7 +175,7 @@ else
+           AC_MSG_RESULT(ok)
+         fi ;;
+       *)
+-        if test "$TMPVER" != "$OCAMLVERSION" ; then
++        if false && test "$TMPVER" != "$OCAMLVERSION" ; then
+           AC_MSG_ERROR(ocamlbuild version differs from ocamlc. Aborting.)
+         else
+           AC_MSG_RESULT(ok)
diff --git a/debian/patches/series b/debian/patches/series
index c18d115..3da9695 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@
 0004-myocamlmacroparser-use-.byte-instead-of-.native.patch
 0005-Fully-qualify-name-of-input-ed-files.patch
 0006-Fix-for-ocamldoc-4.patch
+0007-Disable-configure-check-that-ocamlbuild-has-the-same.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/mlpost.git