tag 519627 + patch thanks Stephane Glondu a écrit : > A binary NMU[1] has been recently requested for the OCaml 3.11.0 > transition, and your package fails to build[2], most likely because of > some change in OCaml 3.11.0. [..]
A fix is attached. Cheers, -- Stéphane
commit ee91b800c5c621a13eecc67b35f2b1e79b2207a0 Author: Stephane Glondu <st...@glondu.net> Date: Fri Mar 13 23:53:57 2009 +0100 Add 20-camlp4-3.11.dpatch (Closes: #519627) diff --git a/debian/changelog b/debian/changelog index cf85d92..9ccfc7e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +haxe (1:1.19-3.1) unstable; urgency=low + + * Non-maintainer upload + * Add 20-camlp4-3.11.dpatch (Closes: #519627) + + -- Stephane Glondu <st...@glondu.net> Fri, 13 Mar 2009 23:49:41 +0100 + haxe (1:1.19-3) unstable; urgency=low * Remove bashism in script. diff --git a/debian/patches/00list b/debian/patches/00list index 42c120e..3364f10 100644 --- a/debian/patches/00list +++ b/debian/patches/00list @@ -1 +1,2 @@ +20-camlp4-3.11 25-debian-file-locations diff --git a/debian/patches/20-camlp4-3.11.dpatch b/debian/patches/20-camlp4-3.11.dpatch new file mode 100644 index 0000000..a50a817 --- /dev/null +++ b/debian/patches/20-camlp4-3.11.dpatch @@ -0,0 +1,22 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 20-camlp4-3.11.dpatch by Stéphane Glondu <st...@glondu.net> +## +## DP: Remove extra semicolons no longer accepted by camlp4 3.11 + +...@dpatch@ +diff --git a/haxe/parser.ml b/haxe/parser.ml +--- a/haxe/parser.ml ++++ b/haxe/parser.ml +@@ -298,9 +298,9 @@ and parse_type_path1 pack = parser + } + + and parse_type_path_or_const = parser +- | [< '(Const (String s),_); >] -> TPConst (String s) +- | [< '(Const (Int i),_); >] -> TPConst (Int i) +- | [< '(Const (Float f),_); >] -> TPConst (Float f) ++ | [< '(Const (String s),_) >] -> TPConst (String s) ++ | [< '(Const (Int i),_) >] -> TPConst (Int i) ++ | [< '(Const (Float f),_) >] -> TPConst (Float f) + | [< t = parse_type_path >] -> TPType t + + and parse_type_path_next t = parser diff --git a/debian/patches/25-debian-file-locations.dpatch b/debian/patches/25-debian-file-locations.dpatch old mode 100644 new mode 100755
signature.asc
Description: OpenPGP digital signature