[Pkg-ocaml-maint-commits] r4071 - in /trunk/packages/ocamlnet/trunk/debian: changelog control patches/00list patches/build_w_camlp5.dpatch
zack at users.alioth.debian.org
zack at users.alioth.debian.org
Mon Jul 16 13:04:33 UTC 2007
Author: zack
Date: Mon Jul 16 13:04:33 2007
New Revision: 4071
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=4071
Log:
* debian/patches/
- add patch build_w_camlp5, which enables building against legacy camlp5
Added:
trunk/packages/ocamlnet/trunk/debian/patches/build_w_camlp5.dpatch (with props)
Modified:
trunk/packages/ocamlnet/trunk/debian/changelog
trunk/packages/ocamlnet/trunk/debian/control
trunk/packages/ocamlnet/trunk/debian/patches/00list
Modified: trunk/packages/ocamlnet/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocamlnet/trunk/debian/changelog?rev=4071&op=diff
==============================================================================
--- trunk/packages/ocamlnet/trunk/debian/changelog (original)
+++ trunk/packages/ocamlnet/trunk/debian/changelog Mon Jul 16 13:04:33 2007
@@ -7,11 +7,12 @@
libequeue-ocaml belongs to libs
- add build-dep on camlp4, now in a separate package
- s/Source-Version/binary:Version/
- * debian/patches
+ * debian/patches/
+ - add patch build_w_camlp5, which enables building against legacy camlp5
- remove patch no_debugging_info, we agree upon compiling *with* debugging
info OCaml libraries
- -- Stefano Zacchiroli <zack at debian.org> Mon, 16 Jul 2007 12:26:42 +0000
+ -- Stefano Zacchiroli <zack at debian.org> Mon, 16 Jul 2007 12:32:11 +0000
ocamlnet (2.2.7-1) unstable; urgency=low
Modified: trunk/packages/ocamlnet/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocamlnet/trunk/debian/control?rev=4071&op=diff
==============================================================================
--- trunk/packages/ocamlnet/trunk/debian/control (original)
+++ trunk/packages/ocamlnet/trunk/debian/control Mon Jul 16 13:04:33 2007
@@ -2,7 +2,7 @@
Section: devel
Priority: optional
Maintainer: Stefano Zacchiroli <zack at debian.org>
-Build-Depends: debhelper (>> 5.0.0), dpatch, cdbs, ocaml-nox (>= 3.10.0), camlp4 (>= 3.10.0), ocaml-findlib, libpcre-ocaml-dev (>= 5.11.1), liblablgtk2-ocaml-dev, libcryptgps-ocaml-dev, libssl-ocaml-dev
+Build-Depends: debhelper (>> 5.0.0), dpatch, cdbs, ocaml-nox (>= 3.10.0), camlp5, ocaml-findlib, libpcre-ocaml-dev (>= 5.11.1), liblablgtk2-ocaml-dev, libcryptgps-ocaml-dev, libssl-ocaml-dev
Standards-Version: 3.7.2
XS-Vcs-Svn: svn://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/ocamlnet
XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocamlnet/trunk/
Modified: trunk/packages/ocamlnet/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocamlnet/trunk/debian/patches/00list?rev=4071&op=diff
==============================================================================
--- trunk/packages/ocamlnet/trunk/debian/patches/00list (original)
+++ trunk/packages/ocamlnet/trunk/debian/patches/00list Mon Jul 16 13:04:33 2007
@@ -1,3 +1,4 @@
dont_install_gpl.dpatch
mkdir_destdir.dpatch
missing_shebangs.dpatch
+build_w_camlp5.dpatch
Added: trunk/packages/ocamlnet/trunk/debian/patches/build_w_camlp5.dpatch
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocamlnet/trunk/debian/patches/build_w_camlp5.dpatch?rev=4071&op=file
==============================================================================
--- trunk/packages/ocamlnet/trunk/debian/patches/build_w_camlp5.dpatch (added)
+++ trunk/packages/ocamlnet/trunk/debian/patches/build_w_camlp5.dpatch Mon Jul 16 13:04:33 2007
@@ -1,0 +1,182 @@
+#! /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: Enable building against camlp5 (the "classical" version of camlp4)
+
+ at DPATCH@
+diff -urNad trunk~/Makefile.rules trunk/Makefile.rules
+--- trunk~/Makefile.rules 2007-04-09 13:37:08.000000000 +0000
++++ trunk/Makefile.rules 2007-07-16 12:57:40.000000000 +0000
+@@ -13,7 +13,7 @@
+ OCAMLFIND = ocamlfind
+ OCAMLYACC = ocamlyacc
+ OCAMLLEX = ocamllex
+-CAMLP4 = camlp4
++CAMLP4 = camlp5
+ OCAMLMKLIB = ocamlmklib
+ OCAMLDOC = $(OCAMLFIND) ocamldoc
+
+diff -urNad trunk~/src/equeue-gtk1/Makefile trunk/src/equeue-gtk1/Makefile
+--- trunk~/src/equeue-gtk1/Makefile 2007-04-09 13:37:11.000000000 +0000
++++ trunk/src/equeue-gtk1/Makefile 2007-07-16 12:57:40.000000000 +0000
+@@ -9,7 +9,7 @@
+
+ INCLUDES += $(INC_EQUEUE)
+
+-PP_OPTIONS = -syntax camlp4o -package camlp4.macro $(GTK_DEFINES)
++PP_OPTIONS = -syntax camlp5o -package camlp5.macro $(GTK_DEFINES)
+
+ include $(TOP_DIR)/Makefile.rules
+
+diff -urNad trunk~/src/equeue-gtk1/Makefile.pre trunk/src/equeue-gtk1/Makefile.pre
+--- trunk~/src/equeue-gtk1/Makefile.pre 2007-04-09 13:37:11.000000000 +0000
++++ trunk/src/equeue-gtk1/Makefile.pre 2007-07-16 12:57:40.000000000 +0000
+@@ -6,6 +6,6 @@
+
+ include ./Makefile.gtk
+
+-PP_OPTIONS = -syntax camlp4o -package camlp4.macro $(GTK_DEFINES)
++PP_OPTIONS = -syntax camlp5o -package camlp5.macro $(GTK_DEFINES)
+
+ include $(TOP_DIR)/Makefile.rules
+diff -urNad trunk~/src/equeue-gtk2/Makefile.pre trunk/src/equeue-gtk2/Makefile.pre
+--- trunk~/src/equeue-gtk2/Makefile.pre 2007-04-09 13:37:11.000000000 +0000
++++ trunk/src/equeue-gtk2/Makefile.pre 2007-07-16 12:57:40.000000000 +0000
+@@ -6,7 +6,7 @@
+
+ include ./Makefile.gtk
+
+-PP_OPTIONS = -syntax camlp4o -package camlp4.macro $(GTK_DEFINES)
++PP_OPTIONS = -syntax camlp5o -package camlp5.macro $(GTK_DEFINES)
+
+ include $(TOP_DIR)/Makefile.rules
+
+diff -urNad trunk~/src/nethttpd-for-netcgi1/Makefile trunk/src/nethttpd-for-netcgi1/Makefile
+--- trunk~/src/nethttpd-for-netcgi1/Makefile 2007-04-09 13:37:10.000000000 +0000
++++ trunk/src/nethttpd-for-netcgi1/Makefile 2007-07-16 12:57:40.000000000 +0000
+@@ -8,7 +8,7 @@
+ nethttpd_engine.mli nethttpd_services.mli nethttpd_plex.mli
+
+ INCLUDES += $(INC_EQUEUE) $(INC_NETSTRING) $(INC_NETCGI1) $(INC_NETPLEX)
+-PP_OPTIONS = -package "camlp4, camlp4.macro" -syntax "camlp4o"
++PP_OPTIONS = -package "camlp5, camlp5.macro" -syntax "camlp5o"
+
+ #PP_OPTIONS_FINDLIB += -ppopt "-DTesting"
+ # do this to enable test coverage calculations
+diff -urNad trunk~/src/nethttpd-for-netcgi1/Makefile.pre trunk/src/nethttpd-for-netcgi1/Makefile.pre
+--- trunk~/src/nethttpd-for-netcgi1/Makefile.pre 2007-07-16 12:57:40.000000000 +0000
++++ trunk/src/nethttpd-for-netcgi1/Makefile.pre 2007-07-16 12:57:40.000000000 +0000
+@@ -6,6 +6,6 @@
+
+ INSTALL_EXTRA +=
+
+-PP_OPTIONS = -package "camlp4, camlp4.macro" -syntax "camlp4o"
++PP_OPTIONS = -package "camlp5, camlp5.macro" -syntax "camlp5o"
+
+ include $(TOP_DIR)/Makefile.rules
+diff -urNad trunk~/src/nethttpd-for-netcgi2/Makefile trunk/src/nethttpd-for-netcgi2/Makefile
+--- trunk~/src/nethttpd-for-netcgi2/Makefile 2007-04-09 13:37:10.000000000 +0000
++++ trunk/src/nethttpd-for-netcgi2/Makefile 2007-07-16 12:57:40.000000000 +0000
+@@ -9,7 +9,7 @@
+ nethttpd_intro.txt
+
+ INCLUDES += $(INC_EQUEUE) $(INC_NETSTRING) $(INC_NETCGI2) $(INC_NETPLEX)
+-PP_OPTIONS = -package "camlp4, camlp4.macro" -syntax "camlp4o"
++PP_OPTIONS = -package "camlp5, camlp5.macro" -syntax "camlp5o"
+
+ #PP_OPTIONS_FINDLIB += -ppopt "-DTesting"
+ # do this to enable test coverage calculations
+diff -urNad trunk~/src/nethttpd-for-netcgi2/Makefile.pre trunk/src/nethttpd-for-netcgi2/Makefile.pre
+--- trunk~/src/nethttpd-for-netcgi2/Makefile.pre 2007-07-16 12:57:40.000000000 +0000
++++ trunk/src/nethttpd-for-netcgi2/Makefile.pre 2007-07-16 12:57:40.000000000 +0000
+@@ -15,7 +15,7 @@
+
+ INSTALL_EXTRA +=
+
+-PP_OPTIONS = -package "camlp4, camlp4.macro" -syntax "camlp4o"
++PP_OPTIONS = -package "camlp5, camlp5.macro" -syntax "camlp5o"
+
+ include $(TOP_DIR)/Makefile.rules
+
+diff -urNad trunk~/src/netplex/Makefile trunk/src/netplex/Makefile
+--- trunk~/src/netplex/Makefile 2007-04-09 13:37:11.000000000 +0000
++++ trunk/src/netplex/Makefile 2007-07-16 12:57:40.000000000 +0000
+@@ -19,7 +19,7 @@
+ ALLMT_EXTRA = netplex_mt.cmo
+ OPTMT_EXTRA = netplex_mt.cmx
+
+-PP_OPTIONS = -syntax camlp4o -package camlp4
++PP_OPTIONS = -syntax camlp5o -package camlp5
+
+ OCAMLC_OPTIONS_FOR_netplex_mt.ml = $(THREAD)
+ OCAMLOPT_OPTIONS_FOR_netplex_mt.ml = $(THREAD)
+diff -urNad trunk~/src/netplex/Makefile.pre trunk/src/netplex/Makefile.pre
+--- trunk~/src/netplex/Makefile.pre 2007-04-09 13:37:11.000000000 +0000
++++ trunk/src/netplex/Makefile.pre 2007-07-16 12:57:40.000000000 +0000
+@@ -9,7 +9,7 @@
+ INSTALL_EXTRA = netplex-packlist netplex_mt.cmo netplex_mt.cmx netplex_mt.o
+ INSTOTHER = install-netplex-admin
+
+-PP_OPTIONS = -syntax camlp4o -package camlp4
++PP_OPTIONS = -syntax camlp5o -package camlp5
+
+ include $(TOP_DIR)/Makefile.rules
+
+diff -urNad trunk~/src/netplex/netplex_config.ml trunk/src/netplex/netplex_config.ml
+--- trunk~/src/netplex/netplex_config.ml 2007-04-09 13:37:11.000000000 +0000
++++ trunk/src/netplex/netplex_config.ml 2007-07-16 12:58:18.000000000 +0000
+@@ -29,7 +29,7 @@
+ and semi_parse_tree_list =
+ parser
+ | [< 'Kwd ";";
+- tl = parse_tree_list;
++ tl = parse_tree_list
+ >] -> tl
+ | [< >] -> []
+
+@@ -47,7 +47,7 @@
+ and parse_rhs =
+ parser
+ | [< 'Kwd "=";
+- v = parse_param_value;
++ v = parse_param_value
+ >] ->
+ `Parameter v
+ | [< 'Kwd "{";
+diff -urNad trunk~/src/netstring/Makefile.def trunk/src/netstring/Makefile.def
+--- trunk~/src/netstring/Makefile.def 2007-04-09 13:37:09.000000000 +0000
++++ trunk/src/netstring/Makefile.def 2007-07-16 12:57:40.000000000 +0000
+@@ -46,7 +46,7 @@
+ netchannels_tut.txt netmime_tut.txt netsendmail_tut.txt \
+ netulex_tut.txt neturl_tut.txt
+
+-PP_OPTIONS = -package camlp4 -syntax camlp4o
++PP_OPTIONS = -package camlp5 -syntax camlp5o
+
+ OCAMLC_OPTIONS_FOR_netstring_mt.ml = $(THREAD)
+ OCAMLOPT_OPTIONS_FOR_netstring_mt.ml = $(THREAD)
+diff -urNad trunk~/src/netstring/nethttp.ml trunk/src/netstring/nethttp.ml
+--- trunk~/src/netstring/nethttp.ml 2007-04-09 13:37:09.000000000 +0000
++++ trunk/src/netstring/nethttp.ml 2007-07-16 12:57:40.000000000 +0000
+@@ -755,7 +755,7 @@
+ v = (fun stream ->
+ match stream with parser
+ | [< '(Atom v) >] -> v
+- | [< '(QString v) >] -> v);
++ | [< '(QString v) >] -> v)
+ >] -> Some v
+ | [< >] -> None
+
+diff -urNad trunk~/src/netstring/netmime.ml trunk/src/netstring/netmime.ml
+--- trunk~/src/netstring/netmime.ml 2007-04-09 13:37:09.000000000 +0000
++++ trunk/src/netstring/netmime.ml 2007-07-16 12:57:40.000000000 +0000
+@@ -579,7 +579,7 @@
+ ;;
+
+
+-let storage ?ro ?fin : store -> (mime_body * out_obj_channel) = function
++let storage ?ro ?fin = function
+ `Memory ->
+ let body = new memory_mime_body_int ~ro_first:false ?ro "" in
+ let body_ch = body#open_value_wr() in
Propchange: trunk/packages/ocamlnet/trunk/debian/patches/build_w_camlp5.dpatch
------------------------------------------------------------------------------
svn:executable = *
More information about the Pkg-ocaml-maint-commits
mailing list