[Pkg-ocaml-maint-commits] [SCM] camlp5 packaging branch, master, updated. debian/6.02.1-1-4-g2477533
Stephane Glondu
steph at glondu.net
Wed Mar 16 22:58:25 UTC 2011
The following commit has been merged in the master branch:
commit 31a248962a833f9dd019560eff1f190db84fe6fb
Author: Stephane Glondu <steph at glondu.net>
Date: Wed Mar 16 14:36:48 2011 +0100
New upstream release
diff --git a/debian/changelog b/debian/changelog
index 08010e4..5d039dc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+camlp5 (6.02.2-1) UNRELEASED; urgency=low
+
+ * New upstream release
+ - remove upstream patches (merged upstream)
+
+ -- Stéphane Glondu <glondu at debian.org> Wed, 16 Mar 2011 14:42:30 +0100
+
camlp5 (6.02.1-1) unstable; urgency=low
* New upstream release
diff --git a/debian/patches/0001-Upstream-patch-6.02.1-1.patch b/debian/patches/0001-Upstream-patch-6.02.1-1.patch
deleted file mode 100644
index d23a1ac..0000000
--- a/debian/patches/0001-Upstream-patch-6.02.1-1.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From: Daniel de Rauglaudre <daniel.de_rauglaudre at inria.fr>
-Date: Thu, 27 Jan 2011 10:42:43 +0100
-Subject: Upstream patch 6.02.1-1
-
-Fix regression in pretty-printing of labelled arguments.
-
-Origin: upstream, http://pauillac.inria.fr/~ddr/camlp5/distrib/src/patch-6.02.1-1
----
- etc/pr_o.ml | 4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/etc/pr_o.ml b/etc/pr_o.ml
-index ad8d6b9..6187a76 100644
---- a/etc/pr_o.ml
-+++ b/etc/pr_o.ml
-@@ -1,5 +1,5 @@
- (* camlp5r *)
--(* $Id: pr_o.ml,v 6.48 2010-11-21 17:17:45 deraugla Exp $ *)
-+(* $Id: pr_o.ml,v 6.49 2010-12-06 10:31:00 deraugla Exp $ *)
- (* Copyright (c) INRIA 2007-2010 *)
-
- #directory ".";
-@@ -2080,7 +2080,7 @@ value poly_type pc =
- value label_ipatt expr pc (p, oe) =
- match Pcaml.unvala oe with
- [ Some e -> pprintf pc "~%p:%p" patt p expr e
-- | None -> patt pc p ]
-+ | None -> pprintf pc "~%p" patt p ]
- ;
-
- EXTEND_PRINTER
---
diff --git a/debian/patches/0002-Upstream-patch-6.02.1-2.patch b/debian/patches/0002-Upstream-patch-6.02.1-2.patch
deleted file mode 100644
index 12c6c3c..0000000
--- a/debian/patches/0002-Upstream-patch-6.02.1-2.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From: Daniel de Rauglaudre <daniel.de_rauglaudre at inria.fr>
-Date: Thu, 27 Jan 2011 10:45:18 +0100
-Subject: Upstream patch 6.02.1-2
-
-Fix handling of private types.
-
-Origin: upstream, http://pauillac.inria.fr/~ddr/camlp5/distrib/src/patch-6.02.1-2
----
- main/ast2pt.ml | 4 +++-
- ocaml_src/main/ast2pt.ml | 2 ++
- 2 files changed, 5 insertions(+), 1 deletions(-)
-
-diff --git a/main/ast2pt.ml b/main/ast2pt.ml
-index 1770ff6..40f294c 100644
---- a/main/ast2pt.ml
-+++ b/main/ast2pt.ml
-@@ -1,5 +1,5 @@
- (* camlp5r *)
--(* $Id: ast2pt.ml,v 6.26 2010-11-21 17:17:45 deraugla Exp $ *)
-+(* $Id: ast2pt.ml,v 6.27 2011-01-18 01:02:43 deraugla Exp $ *)
-
- #load "q_MLast.cmo";
- #load "pa_macro.cmo";
-@@ -392,8 +392,10 @@ value mktvariant loc ctl priv =
- value type_decl tl priv cl =
- fun
- [ TyMan loc t pf <:ctyp< { $list:ltl$ } >> ->
-+ let priv = if uv pf then Private else Public in
- mktype loc tl cl (mktrecord ltl (uv pf)) priv (Some (ctyp t))
- | TyMan loc t pf <:ctyp< [ $list:ctl$ ] >> ->
-+ let priv = if uv pf then Private else Public in
- mktype loc tl cl (mktvariant loc ctl (uv pf)) priv (Some (ctyp t))
- | TyRec loc ltl ->
- mktype loc tl cl (mktrecord (uv ltl) False) priv None
-diff --git a/ocaml_src/main/ast2pt.ml b/ocaml_src/main/ast2pt.ml
-index 8fc8076..47f89dc 100644
---- a/ocaml_src/main/ast2pt.ml
-+++ b/ocaml_src/main/ast2pt.ml
-@@ -394,8 +394,10 @@ let mktvariant loc ctl priv =
- let type_decl tl priv cl =
- function
- TyMan (loc, t, pf, MLast.TyRec (_, ltl)) ->
-+ let priv = if uv pf then Private else Public in
- mktype loc tl cl (mktrecord ltl (uv pf)) priv (Some (ctyp t))
- | TyMan (loc, t, pf, MLast.TySum (_, ctl)) ->
-+ let priv = if uv pf then Private else Public in
- mktype loc tl cl (mktvariant loc ctl (uv pf)) priv (Some (ctyp t))
- | TyRec (loc, ltl) -> mktype loc tl cl (mktrecord (uv ltl) false) priv None
- | TySum (loc, ctl) ->
---
diff --git a/debian/patches/0003-Upstream-patch-6.02.1-3.patch b/debian/patches/0003-Upstream-patch-6.02.1-3.patch
deleted file mode 100644
index c5d709d..0000000
--- a/debian/patches/0003-Upstream-patch-6.02.1-3.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-From: Daniel de Rauglaudre <daniel.de_rauglaudre at inria.fr>
-Date: Thu, 27 Jan 2011 10:46:42 +0100
-Subject: Upstream patch 6.02.1-3
-
-Fix handling of '$' in plain OCaml sources with camlp5o.opt.
-
-Origin: upstream, http://pauillac.inria.fr/~ddr/camlp5/distrib/src/patch-6.02.1-3
----
- compile/Makefile | 4 ++--
- compile/comp_head.ml.tpl | 4 ++--
- compile/compile.ml | 5 +++--
- 3 files changed, 7 insertions(+), 6 deletions(-)
-
-diff --git a/compile/Makefile b/compile/Makefile
-index d11f9c1..ab6a933 100644
---- a/compile/Makefile
-+++ b/compile/Makefile
-@@ -1,4 +1,4 @@
--# $Id: Makefile,v 6.1 2010-09-15 16:00:18 deraugla Exp $
-+# $Id: Makefile,v 6.2 2011-01-26 12:31:48 deraugla Exp $
-
- TOP=..
- include ../config/Makefile
-@@ -24,7 +24,7 @@ camlp5$D.fast.opt: pa_$D_fast.cmx
- cd ../main; $(MAKE) optp5 CAMLP5OPT=../compile/camlp5$D.fast.opt CAMLP5M="../compile/pa_$D_fast.cmx ../meta/pr_dump.cmx"
-
- pa_$D_fast.ml: comp_head.ml.tpl $D_fast.ml.tmp comp_trail.ml.tpl
-- cat $(SRC) | sed -e "s/Plexer.gmake ()/P.lexer/" -e "/EXTEND/,/END/d" -e "/Grammar.Entry.of_parser/d" -e "/Grammar.Entry.gcreate/d" -e "/Grammar.Entry.create/d" | grep -v '#load' | cat comp_head.ml.tpl - $D_fast.ml.tmp comp_trail.ml.tpl > pa_$D_fast.ml
-+ cat $(SRC) | sed -e "s/Plexer.gmake ()/Lazy.force P.lexer/" -e "/EXTEND/,/END/d" -e "/Grammar.Entry.of_parser/d" -e "/Grammar.Entry.gcreate/d" -e "/Grammar.Entry.create/d" | grep -v '#load' | cat comp_head.ml.tpl - $D_fast.ml.tmp comp_trail.ml.tpl > pa_$D_fast.ml
-
- $D_fast.ml.tmp: compile.cmo $(SRC)
- EXE=$(EXE) ./compile.sh $(COMP_OPT) $(SRC) > $D_fast.ml.tmp
-diff --git a/compile/comp_head.ml.tpl b/compile/comp_head.ml.tpl
-index 97c7191..f4e90f4 100644
---- a/compile/comp_head.ml.tpl
-+++ b/compile/comp_head.ml.tpl
-@@ -1,5 +1,5 @@
- (* camlp5r *)
--(* $Id: comp_head.ml.tpl,v 6.2 2010-09-19 08:51:16 deraugla Exp $ *)
-+(* $Id: comp_head.ml.tpl,v 6.3 2011-01-26 12:31:48 deraugla Exp $ *)
- (* Copyright (c) INRIA 2007-2010 *)
-
- #load "q_MLast.cmo";
-@@ -78,7 +78,7 @@ module P =
- (if prev_symb = "" then "" else " after " ^ prev_symb) ^ " (in [" ^
- entry ^ "])"
- ;
-- value lexer = Plexer.gmake ();
-+ value lexer = lazy (Plexer.gmake ());
- end
- ;
-
-diff --git a/compile/compile.ml b/compile/compile.ml
-index 57e20c2..d2e4d7d 100644
---- a/compile/compile.ml
-+++ b/compile/compile.ml
-@@ -1,5 +1,5 @@
- (* camlp5r *)
--(* $Id: compile.ml,v 6.3 2010-09-30 16:22:19 deraugla Exp $ *)
-+(* $Id: compile.ml,v 6.4 2011-01-26 12:31:48 deraugla Exp $ *)
- (* Copyright (c) INRIA 2007-2010 *)
-
- #load "q_MLast.cmo";
-@@ -613,7 +613,8 @@ value compile () =
- let si2 =
- let list = list_sort compare keywords.val in
- <:str_item<
-- List.iter (fun kw -> P.lexer.Plexing.tok_using ("", kw))
-+ let lexer = Lazy.force P.lexer in
-+ List.iter (fun kw -> lexer.Plexing.tok_using ("", kw))
- $expr_list list$
- >>
- in
---
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index d37f5d4..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,3 +0,0 @@
-0001-Upstream-patch-6.02.1-1.patch
-0002-Upstream-patch-6.02.1-2.patch
-0003-Upstream-patch-6.02.1-3.patch
--
camlp5 packaging
More information about the Pkg-ocaml-maint-commits
mailing list