[Pkg-ocaml-maint-commits] [SCM] camlp5 packaging branch, experimental/master, updated. debian/5.14-1-18-g85f83f0

[Stephane Glondu]

The following commit has been merged in the experimental/master branch:
commit 85f83f0e9460d3eb17c0a07967826c0cc01f0f3e
Author: Stephane Glondu <steph at glondu.net>
Date:   Mon Nov 15 15:39:38 2010 +0100

    New upstream release

diff --git a/debian/changelog b/debian/changelog
index 267ac49..46f6d0c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-camlp5 (6.01-1) UNRELEASED; urgency=low
+camlp5 (6.02-1) UNRELEASED; urgency=low
 
   * New upstream release
   * Put the full text of BSD license in debian/copyright
@@ -6,7 +6,7 @@ camlp5 (6.01-1) UNRELEASED; urgency=low
     - replace Conflicts (with old ocaml-nox) with Breaks
     - bump Standards-Version to 3.9.1
 
- -- Stéphane Glondu <glondu at debian.org>  Mon, 08 Nov 2010 15:44:27 +0100
+ -- Stéphane Glondu <glondu at debian.org>  Mon, 15 Nov 2010 15:39:29 +0100
 
 camlp5 (5.14-1) unstable; urgency=low
 
diff --git a/debian/patches/0001-Compatibility-bugfixes.patch b/debian/patches/0001-Compatibility-bugfixes.patch
deleted file mode 100644
index a99bde0..0000000
--- a/debian/patches/0001-Compatibility-bugfixes.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From: Stephane Glondu <steph at glondu.net>
-Date: Mon, 8 Nov 2010 21:07:21 +0100
-Subject: [PATCH] Compatibility bugfixes
-
-Author: Daniel de Rauglaudre <daniel.de_rauglaudre at inria.fr>
-Origin: https://sympa-roc.inria.fr/wws/arc/coqdev/2010-11/msg00014.html
----
- etc/pa_o.ml  |    5 +++--
- top/Makefile |    2 +-
- 2 files changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/etc/pa_o.ml b/etc/pa_o.ml
-index 03a1421..f991f02 100644
---- a/etc/pa_o.ml
-+++ b/etc/pa_o.ml
-@@ -610,6 +610,8 @@ EXTEND
-               | _ -> <:expr< $e1$ $e2$ >> ] ]
-       | "assert"; e = SELF -> <:expr< assert $e$ >>
-       | "lazy"; e = SELF -> <:expr< lazy ($e$) >> ]
-+    | "!"
-+      [ "!"; e = SELF -> <:expr< $e$ . val >> ]
-     | "." LEFTA
-       [ e1 = SELF; "."; "("; op = operator_rparen ->
-           <:expr< $e1$ .( $lid:op$ ) >>
-@@ -626,8 +628,7 @@ EXTEND
-           in
-           loop e1 e2 ]
-     | "~-" NONA
--      [ "!"; e = SELF -> <:expr< $e$ . val >>
--      | "~-"; e = SELF -> <:expr< ~- $e$ >>
-+      [ "~-"; e = SELF -> <:expr< ~- $e$ >>
-       | "~-."; e = SELF -> <:expr< ~-. $e$ >>
-       | f = prefixop; e = SELF -> <:expr< $lid:f$ $e$ >> ]
-     | "simple" LEFTA
-diff --git a/top/Makefile b/top/Makefile
-index dcdc211..eadc50c 100644
---- a/top/Makefile
-+++ b/top/Makefile
-@@ -12,7 +12,7 @@ ROBJS=$(CAMLP5_OBJS) ../meta/pa_r.cmo ../meta/pa_rp.cmo rprint.cmo $(CTOP)
- OOBJS=$(CAMLP5_OBJS) ../etc/pa_o.cmo ../etc/pa_op.cmo $(CTOP)
- SOBJS=$(CAMLP5_OBJS) ../etc/pa_scheme.cmo $(CTOP)
- OOOBJS=$(CAMLP5_OBJS) ../etc/pa_o.cmo ../etc/pa_oop.cmo $(CTOP)
--OBJS=$(OTOP)/utils/pconfig.cmo ../main/quotation.cmo ../main/reloc.cmo ../main/prtools.cmo ../main/pcaml.cmo camlp5_top.cmo
-+OBJS=$(OTOP)/utils/pconfig.cmo ../main/quotation.cmo ../main/reloc.cmo ../main/prtools.cmo ../main/pcaml.cmo ../main/ast2pt.cmo camlp5_top.cmo
- 
- TARGET=camlp5o.cma camlp5r.cma camlp5sch.cma camlp5_top.cma
- 
--- 
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index a78e88c..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-0001-Compatibility-bugfixes.patch

-- 
camlp5 packaging