[Pkg-ocaml-maint-commits] [SCM] ocamlnet packaging branch, master, updated. debian/2.2.9-5-6-g72bcd27

Stefano Zacchiroli zack at upsilon.cc
Sat Feb 21 14:24:39 UTC 2009


The following commit has been merged in the master branch:
commit 2b8acad76b32a4cea90da4275aa3c7450d46e4b6
Author: Stefano Zacchiroli <zack at upsilon.cc>
Date:   Sat Feb 21 14:16:02 2009 +0100

    disable patches to build using camlp5
    
    * debian/patches/*
      - disable patches to build against camlp5: build_w_camlp5,
        camlp5_5_alias_pat. Now ocamlnet can be built using camlp4

diff --git a/debian/changelog b/debian/changelog
index b098088..1e67fe6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,9 @@ ocamlnet (2.2.9-6) UNRELEASED; urgency=low
   * debian/rules: use ocamldoc-apiref-config from /usr/share/ocaml/;
     accordingly: bump dependency on dh-ocaml to >= 0.2
   * debian/*.install.in: avoid specifying debian/tmp/ (is default now)
+  * debian/patches/*
+    - disable patches to build against camlp5: build_w_camlp5,
+      camlp5_5_alias_pat. Now ocamlnet can be built using camlp4
 
  -- Stefano Zacchiroli <zack at debian.org>  Thu, 19 Feb 2009 10:58:58 +0100
 
diff --git a/debian/patches/00list b/debian/patches/00list
index 09ac5b0..ae17d5f 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -1,10 +1,8 @@
-camlp5_5_alias_pat.dpatch
 camlrun_shared.dpatch
 rpath-apache.dpatch
 dont_install_gpl.dpatch
 mkdir_destdir.dpatch
 missing_shebangs.dpatch
-build_w_camlp5.dpatch
 no_apache_info.dpatch
 configure_kfreebsd.dpatch
 fix_ssl_bindings.dpatch
diff --git a/debian/patches/build_w_camlp5.dpatch b/debian/patches/build_w_camlp5.dpatch
deleted file mode 100755
index 8859334..0000000
--- a/debian/patches/build_w_camlp5.dpatch
+++ /dev/null
@@ -1,188 +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: Enable building against camlp5 (the "classical" version of camlp4)
-
- at DPATCH@
-diff -urNad trunk~/Makefile.rules trunk/Makefile.rules
---- trunk~/Makefile.rules	2007-07-31 18:20:57.000000000 +0200
-+++ trunk/Makefile.rules	2007-09-08 12:42:33.000000000 +0200
-@@ -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-07-31 18:20:59.000000000 +0200
-+++ trunk/src/equeue-gtk1/Makefile	2007-09-08 12:42:33.000000000 +0200
-@@ -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-07-31 18:20:59.000000000 +0200
-+++ trunk/src/equeue-gtk1/Makefile.pre	2007-09-08 12:42:33.000000000 +0200
-@@ -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-07-31 18:20:59.000000000 +0200
-+++ trunk/src/equeue-gtk2/Makefile.pre	2007-09-08 12:42:33.000000000 +0200
-@@ -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-07-31 18:20:59.000000000 +0200
-+++ trunk/src/nethttpd-for-netcgi1/Makefile	2007-09-08 12:42:33.000000000 +0200
-@@ -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-09-08 12:42:32.000000000 +0200
-+++ trunk/src/nethttpd-for-netcgi1/Makefile.pre	2007-09-08 12:42:33.000000000 +0200
-@@ -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-netcgi1/nethttpd_types.mli trunk/src/nethttpd-for-netcgi1/nethttpd_types.mli
---- trunk~/src/nethttpd-for-netcgi1/nethttpd_types.mli	2007-07-31 18:20:59.000000000 +0200
-+++ trunk/src/nethttpd-for-netcgi1/nethttpd_types.mli	2007-09-08 12:43:01.000000000 +0200
-@@ -117,10 +117,10 @@
-    *)
- 
- class redirected_environment : 
--        ?in_state : Netcgi1_compat.Netcgi_env.input_state ->
--        ?in_header : http_header ->
--        ?properties : (string * string) list ->
--        ?in_channel : Netchannels.in_obj_channel ->
-+        ?in_state: Netcgi1_compat.Netcgi_env.input_state ->
-+        ?in_header: http_header ->
-+        ?properties: (string * string) list ->
-+        ?in_channel: Netchannels.in_obj_channel ->
-         extended_environment ->
-           extended_environment
-   (** This class overlays the input-side containers of an existing environment.
-diff -urNad trunk~/src/nethttpd-for-netcgi2/Makefile trunk/src/nethttpd-for-netcgi2/Makefile
---- trunk~/src/nethttpd-for-netcgi2/Makefile	2007-07-31 18:20:59.000000000 +0200
-+++ trunk/src/nethttpd-for-netcgi2/Makefile	2007-09-08 12:42:33.000000000 +0200
-@@ -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-09-08 12:42:32.000000000 +0200
-+++ trunk/src/nethttpd-for-netcgi2/Makefile.pre	2007-09-08 12:42:33.000000000 +0200
-@@ -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-07-31 18:21:00.000000000 +0200
-+++ trunk/src/netplex/Makefile	2007-09-08 12:42:33.000000000 +0200
-@@ -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-07-31 18:21:00.000000000 +0200
-+++ trunk/src/netplex/Makefile.pre	2007-09-08 12:42:33.000000000 +0200
-@@ -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-07-31 18:21:00.000000000 +0200
-+++ trunk/src/netplex/netplex_config.ml	2007-09-08 12:42:33.000000000 +0200
-@@ -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-07-31 18:20:58.000000000 +0200
-+++ trunk/src/netstring/Makefile.def	2007-09-08 12:42:33.000000000 +0200
-@@ -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/netmime.ml trunk/src/netstring/netmime.ml
---- trunk~/src/netstring/netmime.ml	2007-07-31 18:20:58.000000000 +0200
-+++ trunk/src/netstring/netmime.ml	2007-09-08 12:42:33.000000000 +0200
-@@ -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
diff --git a/debian/patches/camlp5_5_alias_pat.dpatch b/debian/patches/camlp5_5_alias_pat.dpatch
deleted file mode 100755
index aa07425..0000000
--- a/debian/patches/camlp5_5_alias_pat.dpatch
+++ /dev/null
@@ -1,81 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## camlp5_5_alias_pat.dpatch by Stefano Zacchiroli <zack at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: parhentesize alias patterns to ensure buildability against camlp5 >= 5.00
-
- at DPATCH@
-diff -urNad trunk~/src/netstring/mimestring.ml trunk/src/netstring/mimestring.ml
---- trunk~/src/netstring/mimestring.ml	2007-07-31 18:20:58.000000000 +0200
-+++ trunk/src/netstring/mimestring.ml	2007-10-01 09:33:58.000000000 +0200
-@@ -653,7 +653,7 @@
- 		      let et, t = tok in
- 		      target.last_token <- t;
- 		      tok
--		  | (et,t) as pair :: ws_list' ->
-+		  | ((et,t) as pair) :: ws_list' ->
- 		      List.iter
- 			(fun (et',_) -> 
- 			   Queue.add et' target.scanned_tokens)
-@@ -1320,11 +1320,11 @@
- 
-   let rec output_tokens last tl =
-     match tl with
--	Atom atext as cur :: tl' ->
-+	(Atom atext as cur) :: tl' ->
- 	  separate_words last;
- 	  output_nobreak atext;
- 	  output_tokens cur tl'
--      | Control c as cur :: tl' ->
-+      | (Control c as cur) :: tl' ->
- 	  output_nobreak (String.make 1 c);
- 	  output_tokens cur tl'
-       | (Special ' ' | Special '\t' | Comment as cur) :: tl' ->
-@@ -1348,22 +1348,22 @@
- 		  assert false
- 	  );
- 	  output_tokens cur tl'
--      | Special c as cur :: tl' ->
-+      | (Special c as cur) :: tl' ->
- 	  output_nobreak (String.make 1 c);
- 	  output_tokens cur tl'
--      | QString s as cur :: tl' ->
-+      | (QString s as cur) :: tl' ->
- 	  separate_words last;
- 	  output_nobreak "\"";
- 	  output_quoted '"' '"' fold_qstring s;
- 	  output_nobreak "\"";
- 	  output_tokens cur tl'
--      | DomainLiteral s as cur :: tl' ->
-+      | (DomainLiteral s as cur) :: tl' ->
- 	  separate_words last;
- 	  output_nobreak "[";
- 	  output_quoted '[' ']' fold_literal s;
- 	  output_nobreak "]";
- 	  output_tokens cur tl'
--      | EncodedWord((cs,lang),enc,_) as cur :: _ ->
-+      | (EncodedWord((cs,lang),enc,_) as cur) :: _ ->
- 	  separate_words last;
- 	  let (textlist, tl'') = collect_words cs lang enc tl in
- 	  let text = String.concat "" textlist in
-diff -urNad trunk~/src/netstring/netchannels.ml trunk/src/netstring/netchannels.ml
---- trunk~/src/netstring/netchannels.ml	2007-07-31 18:20:58.000000000 +0200
-+++ trunk/src/netstring/netchannels.ml	2007-10-01 09:33:46.000000000 +0200
-@@ -667,7 +667,7 @@
-       match eol_result with
- 	  EOL_not_found :: eol_result' ->
- 	    find_best_eol best eol_result'
--	| EOL_partially_found pos as r :: eol_result' ->
-+	| (EOL_partially_found pos as r) :: eol_result' ->
- 	    ( match best with
- 		  EOL_partially_found pos' ->
- 		    if pos < pos' then
-@@ -677,7 +677,7 @@
- 		| _ ->
- 		    find_best_eol r eol_result'
- 	    )
--	| EOL_found(pos,len) as r :: eol_result' ->
-+	| (EOL_found(pos,len) as r) :: eol_result' ->
- 	    ( match best with
- 		  EOL_found(pos',len') ->
- 		    if pos < pos' || (pos = pos' && len > len') then

-- 
ocamlnet packaging



More information about the Pkg-ocaml-maint-commits mailing list