[Pkg-ocaml-maint-commits] r4142 - in /trunk/packages/pxp/trunk/debian: changelog compat control patches/00list patches/build_w_camlp5.dpatch
zack at users.alioth.debian.org
zack at users.alioth.debian.org
Thu Aug 9 20:28:51 UTC 2007
Author: zack
Date: Thu Aug 9 20:28:51 2007
New Revision: 4142
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=4142
Log:
build against camlp5/ulex08
Added:
trunk/packages/pxp/trunk/debian/patches/build_w_camlp5.dpatch (with props)
Modified:
trunk/packages/pxp/trunk/debian/changelog
trunk/packages/pxp/trunk/debian/compat
trunk/packages/pxp/trunk/debian/control
trunk/packages/pxp/trunk/debian/patches/00list
Modified: trunk/packages/pxp/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/pxp/trunk/debian/changelog?rev=4142&op=diff
==============================================================================
--- trunk/packages/pxp/trunk/debian/changelog (original)
+++ trunk/packages/pxp/trunk/debian/changelog Thu Aug 9 20:28:51 2007
@@ -1,10 +1,14 @@
-pxp (1.1.96-9) UNRELEASED; urgency=low
-
+pxp (1.2.0~test1-1) UNRELEASED; urgency=low
+
+ * new upstream release
+ * rebuild with OCaml 3.10 (whereas using camlp5 and ulex 0.8)
* debian/watch
- - added watch file (for the development version, the one we have in
- Debian)
-
- -- Stefano Zacchiroli <zack at debian.org> Mon, 4 Dec 2006 14:15:11 +0100
+ - add watch file (for the development version)
+ * bump debhelper deps and compatibility level to 5
+ * debian/control
+ - add build-dep on camlp5, ocaml-ulex08
+
+ -- Stefano Zacchiroli <zack at debian.org> Sun, 22 Jul 2007 22:52:52 +0000
pxp (1.1.96-8) unstable; urgency=low
Modified: trunk/packages/pxp/trunk/debian/compat
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/pxp/trunk/debian/compat?rev=4142&op=diff
==============================================================================
--- trunk/packages/pxp/trunk/debian/compat (original)
+++ trunk/packages/pxp/trunk/debian/compat Thu Aug 9 20:28:51 2007
@@ -1,1 +1,1 @@
-4
+5
Modified: trunk/packages/pxp/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/pxp/trunk/debian/control?rev=4142&op=diff
==============================================================================
--- trunk/packages/pxp/trunk/debian/control (original)
+++ trunk/packages/pxp/trunk/debian/control Thu Aug 9 20:28:51 2007
@@ -2,14 +2,14 @@
Section: libdevel
Priority: optional
Maintainer: Stefano Zacchiroli <zack at debian.org>
-Build-Depends: debhelper (>> 4.0.0), ocaml-nox (>= 3.09.2-7), ocaml-findlib (>= 1.1), libocamlnet-ocaml-dev (>= 1.1-12), ocaml-ulex (>= 0.8-2), dpatch, cdbs
+Build-Depends: debhelper (>> 5.0.0), ocaml-nox (>= 3.10.0), camlp5, ocaml-findlib (>= 1.1), libocamlnet-ocaml-dev (>= 1.1-12), ocaml-ulex08, dpatch, cdbs
Standards-Version: 3.7.2
XS-Vcs-Svn: svn://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/pxp
XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/pxp/trunk/
Package: libpxp-ocaml-dev
Architecture: any
-Depends: ocaml-nox-${F:OCamlABI}, libocamlnet-ocaml-dev (>= 1.1-12), ocaml-findlib (>= 1.1), ocaml-ulex (>= 0.8-2)
+Depends: ocaml-nox-${F:OCamlABI}, libocamlnet-ocaml-dev (>= 1.1-12), ocaml-findlib (>= 1.1), ocaml-ulex08
Description: OCaml library that implement an XML-1.0 validating parser
PXP is a validating parser for XML-1.0 which has been written entirely
in Objective Caml.
Modified: trunk/packages/pxp/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/pxp/trunk/debian/patches/00list?rev=4142&op=diff
==============================================================================
--- trunk/packages/pxp/trunk/debian/patches/00list (original)
+++ trunk/packages/pxp/trunk/debian/patches/00list Thu Aug 9 20:28:51 2007
@@ -1,1 +1,2 @@
01_build
+build_w_camlp5.dpatch
Added: trunk/packages/pxp/trunk/debian/patches/build_w_camlp5.dpatch
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/pxp/trunk/debian/patches/build_w_camlp5.dpatch?rev=4142&op=file
==============================================================================
--- trunk/packages/pxp/trunk/debian/patches/build_w_camlp5.dpatch (added)
+++ trunk/packages/pxp/trunk/debian/patches/build_w_camlp5.dpatch Thu Aug 9 20:28:51 2007
@@ -1,0 +1,123 @@
+#! /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: No description.
+
+ at DPATCH@
+diff -urNad trunk~/configure trunk/configure
+--- trunk~/configure 2007-05-15 10:21:01.000000000 -0400
++++ trunk/configure 2007-08-09 16:12:28.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:11:35.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:11:35.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:14:19.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:11:35.000000000 -0400
++++ trunk/gensrc/pxp-ulex-utf8/Makefile 2007-08-09 16:14:06.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:15:26.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:11:35.000000000 -0400
++++ trunk/src/pxp-pp/Makefile 2007-08-09 16:15:12.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
+
+
Propchange: trunk/packages/pxp/trunk/debian/patches/build_w_camlp5.dpatch
------------------------------------------------------------------------------
svn:executable = *
More information about the Pkg-ocaml-maint-commits
mailing list