[Pkg-ocaml-maint-commits] [SCM] pxp packaging branch, master, updated. debian/1.2.0.test1-3-23-g6f305b2
Stefano Zacchiroli
zack at upsilon.cc
Mon Mar 16 16:25:42 UTC 2009
The following commit has been merged in the master branch:
commit 171218899bd9cc19cee0a86cb6e17d03d928087b
Author: Stefano Zacchiroli <zack at upsilon.cc>
Date: Mon Mar 16 17:05:27 2009 +0100
remove no longer needed patch: build_w_camlp5
diff --git a/debian/changelog b/debian/changelog
index 915ffc3..4fa4327 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,9 @@ pxp (1.2.1-1) UNRELEASED; urgency=low
[ Stefano Zacchiroli ]
* New Upstream Version
* update watch file
+ * debian/patches
+ - remove patch build_w_camlp5 (no longer needed, pxp now builds fine
+ with legacy camlp4 and ulex)
[ Stephane Glondu ]
* Switching packaging to git
diff --git a/debian/patches/00list b/debian/patches/00list
index 4c1a7be..806a429 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -1,2 +1 @@
install_destdir.dpatch
-build_w_camlp5.dpatch
diff --git a/debian/patches/build_w_camlp5.dpatch b/debian/patches/build_w_camlp5.dpatch
deleted file mode 100755
index a9253d3..0000000
--- a/debian/patches/build_w_camlp5.dpatch
+++ /dev/null
@@ -1,148 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## build_w_camlp5.dpatch by Stefano Zacchiroli <zack at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: ensure PXP builds properly against camlp5/ulex08
-
- at DPATCH@
-diff -urNad trunk~/configure trunk/configure
---- trunk~/configure 2007-05-15 10:21:01.000000000 -0400
-+++ trunk/configure 2007-08-09 16:46:08.000000000 -0400
-@@ -211,7 +211,7 @@
-
- if [ $with_ulex -gt 0 ]; then
- printf "%s" "Checking for ulex... "
-- if ocamlfind query ulex >/dev/null 2>/dev/null; then
-+ if ocamlfind query ulex08 >/dev/null 2>/dev/null; then
- echo "found"
- else
- echo "not found"
-@@ -258,7 +258,7 @@
- raise_with_loc (0,0) Not_found;;
- EOF
-
--if ocamlc -c -I +camlp4 tmp.ml >/dev/null 2>/dev/null; then
-+if ocamlc -c -I +camlp5 tmp.ml >/dev/null 2>/dev/null; then
- echo "old style"
- camlp4_loc=""
- else
-diff -urNad trunk~/examples/preprocessor/Makefile trunk/examples/preprocessor/Makefile
---- trunk~/examples/preprocessor/Makefile 2007-05-15 10:21:02.000000000 -0400
-+++ trunk/examples/preprocessor/Makefile 2007-08-09 16:46:08.000000000 -0400
-@@ -1,6 +1,6 @@
- library.cgi: library.ml
- ocamlfind ocamlc -o library.cgi library.ml \
-- -package "pxp,pxp-pp,cgi" -syntax camlp4o,byte -linkpkg
-+ -package "pxp,pxp-pp,cgi" -syntax camlp5o,byte -linkpkg
-
- clean:
- rm *.cmo *.cmi *.cgi
-diff -urNad trunk~/examples/pullparser/Makefile trunk/examples/pullparser/Makefile
---- trunk~/examples/pullparser/Makefile 2007-05-15 10:21:02.000000000 -0400
-+++ trunk/examples/pullparser/Makefile 2007-08-09 16:46:08.000000000 -0400
-@@ -1,6 +1,6 @@
- pull.cma: pull.ml
-- ocamlfind ocamlc -a -o pull.cma -package "pxp,camlp4" \
-- -syntax camlp4o \
-+ ocamlfind ocamlc -a -o pull.cma -package "pxp,camlp5" \
-+ -syntax camlp5o \
- pull.ml
-
- clean:
-diff -urNad trunk~/gensrc/pxp-ulex-utf8/META.in trunk/gensrc/pxp-ulex-utf8/META.in
---- trunk~/gensrc/pxp-ulex-utf8/META.in 2007-05-15 10:21:03.000000000 -0400
-+++ trunk/gensrc/pxp-ulex-utf8/META.in 2007-08-09 16:46:08.000000000 -0400
-@@ -1,5 +1,5 @@
- description = "Polymorphic XML parser - Lexical analyzer for UTF-8 based on wlex"
--requires = "pxp-engine,ulex"
-+requires = "pxp-engine,ulex08"
- version = "@VERSION@"
-
- archive(byte) = "pxp_ulex_utf8.cma pxp_ulex_link_utf8.cmo"
-diff -urNad trunk~/gensrc/pxp-ulex-utf8/Makefile trunk/gensrc/pxp-ulex-utf8/Makefile
---- trunk~/gensrc/pxp-ulex-utf8/Makefile 2007-08-09 16:46:08.000000000 -0400
-+++ trunk/gensrc/pxp-ulex-utf8/Makefile 2007-08-09 16:46:08.000000000 -0400
-@@ -7,9 +7,10 @@
- ML = $(shell echo pxp_ulex_$(ENC)_*.ml)
- CMO = $(ML:.ml=.cmo)
- CMX = $(ML:.ml=.cmx)
--OCAMLC_OPTIONS += -I $(TOP_DIR)/src/pxp-engine -syntax camlp4o
--OCAMLOPT_OPTIONS += -I $(TOP_DIR)/src/pxp-engine -syntax camlp4o
--PACKAGES = netstring,ulex
-+OCAMLC_OPTIONS += -I $(TOP_DIR)/src/pxp-engine -syntax camlp5o
-+OCAMLOPT_OPTIONS += -I $(TOP_DIR)/src/pxp-engine -syntax camlp5o
-+ULEXPKG = ulex08
-+PACKAGES = netstring,$(ULEXPKG)
-
- .PHONY: all opt generate clean CLEAN distclean install uninstall
-
-@@ -37,7 +38,7 @@
-
- .PHONY: expand
- expand:
-- camlp4 -I `ocamlfind query ulex` pa_o.cmo pa_op.cmo pa_ulex.cma pr_o.cmo pxp_ulex_utf8_01.ml
-+ camlp5 -I `ocamlfind query $(ULEXPKG)` pa_o.cmo pa_op.cmo pa_ulex.cma pr_o.cmo pxp_ulex_utf8_01.ml
-
- clean:
- rm -f $(CLEAN_LIST) *.ml *.mll gen_done
-diff -urNad trunk~/src/pxp-pp/META.in trunk/src/pxp-pp/META.in
---- trunk~/src/pxp-pp/META.in 2007-05-15 10:21:03.000000000 -0400
-+++ trunk/src/pxp-pp/META.in 2007-08-09 16:46:08.000000000 -0400
-@@ -2,13 +2,13 @@
- version = "@VERSION@"
-
- # At runtime, we need at least pxp-engine.
--requires = "camlp4,pxp-engine"
-+requires = "camlp5,pxp-engine"
-
- # At preprocess time, we need netstring and ulex:
--requires(syntax) = "camlp4,netstring,ulex"
-+requires(syntax) = "camlp5,netstring,ulex08"
-
- # The toploop is the combination of both:
--requires(syntax,toploop) = "camlp4,netstring,ulex,pxp-engine"
-+requires(syntax,toploop) = "camlp5,netstring,ulex08,pxp-engine"
-
- # Specification of stand-alone preprocessor call:
- archive(syntax,preprocessor) = "pxp_pp.cma"
-diff -urNad trunk~/src/pxp-pp/Makefile trunk/src/pxp-pp/Makefile
---- trunk~/src/pxp-pp/Makefile 2007-08-09 16:46:08.000000000 -0400
-+++ trunk/src/pxp-pp/Makefile 2007-08-09 16:46:08.000000000 -0400
-@@ -2,9 +2,10 @@
-
- include $(TOP_DIR)/Makefile.rules
-
--PACKAGES = netstring,ulex,camlp4.quotations,camlp4.macro
-+ULEXPKG = ulex08
-+PACKAGES = netstring,$(ULEXPKG),camlp5.quotations,camlp5.macro
-
--OCAMLC_OPTIONS += -syntax camlp4o
-+OCAMLC_OPTIONS += -syntax camlp5o
- OCAMLC_OPTIONS += $(CAMLP4_LOC) -ppopt -loc -ppopt loc
-
-
-diff -urNad trunk~/src/pxp-pp/pxp_pp.ml trunk/src/pxp-pp/pxp_pp.ml
---- trunk~/src/pxp-pp/pxp_pp.ml 2007-05-15 10:21:03.000000000 -0400
-+++ trunk/src/pxp-pp/pxp_pp.ml 2007-08-09 16:46:39.000000000 -0400
-@@ -625,20 +625,7 @@
-
- let mkloc ((_p1_line,_p1_line_start,p1_pos))
- ((_p2_line,_p2_line_start,p2_pos)) =
-- (* Differs in O'Caml 3.07 and 3.08 *)
-- IFDEF OCAML_NEW_LOC THEN
-- let l1 = { Lexing.pos_fname = "";
-- Lexing.pos_lnum = _p1_line;
-- Lexing.pos_bol = _p1_line_start;
-- Lexing.pos_cnum = p1_pos } in
-- let l2 = { Lexing.pos_fname = "";
-- Lexing.pos_lnum = _p2_line;
-- Lexing.pos_bol = _p2_line_start;
-- Lexing.pos_cnum = p2_pos } in
-- (l1,l2)
-- ELSE
-- (p1_pos,p2_pos)
-- END
-+ Stdpp.make_lined_loc _p1_line _p1_line_start (p1_pos, p2_pos)
- ;;
-
-
--
pxp packaging
More information about the Pkg-ocaml-maint-commits
mailing list