[Pkg-ocaml-maint-commits] [otags] 01/02: Fix FTBFS with OCaml 4.02.3

[Mehdi Dogguy]

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

mehdi pushed a commit to branch master
in repository otags.

commit a9a545be3891a20ef331f730003b3ec35102e8e2
Author: Mehdi Dogguy <mehdi at debian.org>
Date:   Fri Oct 16 23:05:29 2015 +0200

    Fix FTBFS with OCaml 4.02.3
---
 debian/changelog                                   |  7 +++++++
 debian/control                                     |  3 +--
 .../0001-Set-required-version-to-4.02.patch        | 22 ++++++++++++++++++++++
 debian/patches/series                              |  2 +-
 4 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2c58933..9de52d5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+otags (4.01.1-2) UNRELEASED; urgency=medium
+
+  * Set OCaml 4.02 as required version
+  * Use camlp4 (>= 4.02) instead of camlp4-extra
+
+ -- Mehdi Dogguy <mehdi at debian.org>  Fri, 16 Oct 2015 23:04:18 +0200
+
 otags (4.01.1-1) unstable; urgency=medium
 
   * Team upload
diff --git a/debian/control b/debian/control
index e434df4..7e3ed9c 100644
--- a/debian/control
+++ b/debian/control
@@ -10,8 +10,7 @@ Build-Depends:
  ocaml-best-compilers,
  debhelper (>= 9),
  dh-ocaml (>= 0.9~),
- camlp4-extra (>= 4.01),
- camlp4-extra (<< 4.02),
+ camlp4 (>= 4.02),
  libsexplib-camlp4-dev
 Standards-Version: 3.9.5
 Homepage: http://askra.de/software/otags/
diff --git a/debian/patches/0001-Set-required-version-to-4.02.patch b/debian/patches/0001-Set-required-version-to-4.02.patch
new file mode 100644
index 0000000..6797ebf
--- /dev/null
+++ b/debian/patches/0001-Set-required-version-to-4.02.patch
@@ -0,0 +1,22 @@
+From: Mehdi Dogguy <mehdi at debian.org>
+Date: Fri, 16 Oct 2015 23:03:47 +0200
+Subject: Set required version to 4.02
+
+---
+ configure | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure b/configure
+index d0e1bd3..e9e0c60 100755
+--- a/configure
++++ b/configure
+@@ -29,7 +29,7 @@
+ 
+ set -e
+ 
+-REQUIRED_OCAML_VERSION=4.01
++REQUIRED_OCAML_VERSION=4.02
+ OTAGS_VERSION=1
+ 
+ root=/usr/local
+-- 
diff --git a/debian/patches/series b/debian/patches/series
index 1bb8bf6..1f71c49 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1 @@
-# empty
+0001-Set-required-version-to-4.02.patch

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