[Pkg-ocaml-maint-commits] r4452 - in /trunk/packages/ocamlnet/trunk/debian: changelog control patches/build_w_camlp5.dpatch
zack at users.alioth.debian.org
zack at users.alioth.debian.org
Sat Sep 8 10:50:18 UTC 2007
Author: zack
Date: Sat Sep 8 10:50:18 2007
New Revision: 4452
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=4452
Log:
* new upstream release
* debian/control
- bump camlp5 version to the latest available (to ensure some syntax quirk
work properly)
* debian/patches/
- refresh build_w_camlp5 patch: some old changes are no longer needed with
the current version of camlp5, some new code require patches
Modified:
trunk/packages/ocamlnet/trunk/debian/changelog
trunk/packages/ocamlnet/trunk/debian/control
trunk/packages/ocamlnet/trunk/debian/patches/build_w_camlp5.dpatch
Modified: trunk/packages/ocamlnet/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocamlnet/trunk/debian/changelog?rev=4452&op=diff
==============================================================================
--- trunk/packages/ocamlnet/trunk/debian/changelog (original)
+++ trunk/packages/ocamlnet/trunk/debian/changelog Sat Sep 8 10:50:18 2007
@@ -1,8 +1,14 @@
-ocamlnet (2.2.7-3) UNRELEASED; urgency=low
-
- * NOT RELEASED YET
-
- -- Stefano Zacchiroli <zack at debian.org> Mon, 16 Jul 2007 13:20:21 +0000
+ocamlnet (2.2.8.1-1) UNRELEASED; urgency=low
+
+ * new upstream release
+ * debian/control
+ - bump camlp5 version to the latest available (to ensure some syntax quirk
+ work properly)
+ * debian/patches/
+ - refresh build_w_camlp5 patch: some old changes are no longer needed with
+ the current version of camlp5, some new code require patches
+
+ -- Stefano Zacchiroli <zack at debian.org> Sat, 08 Sep 2007 12:44:47 +0200
ocamlnet (2.2.7-2) experimental; 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=4452&op=diff
==============================================================================
--- trunk/packages/ocamlnet/trunk/debian/control (original)
+++ trunk/packages/ocamlnet/trunk/debian/control Sat Sep 8 10:50:18 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), camlp5, 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 (>= 4.08), 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/build_w_camlp5.dpatch
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocamlnet/trunk/debian/patches/build_w_camlp5.dpatch?rev=4452&op=diff
==============================================================================
--- trunk/packages/ocamlnet/trunk/debian/patches/build_w_camlp5.dpatch (original)
+++ trunk/packages/ocamlnet/trunk/debian/patches/build_w_camlp5.dpatch Sat Sep 8 10:50:18 2007
@@ -6,8 +6,8 @@
@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
+--- 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
@@ -18,8 +18,8 @@
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
+--- 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)
@@ -30,8 +30,8 @@
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
+--- 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
@@ -41,8 +41,8 @@
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
+--- 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
@@ -53,8 +53,8 @@
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
+--- 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
@@ -65,8 +65,8 @@
#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
+--- 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 +=
@@ -75,9 +75,27 @@
+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-04-09 13:37:10.000000000 +0000
-+++ trunk/src/nethttpd-for-netcgi2/Makefile 2007-07-16 12:57:40.000000000 +0000
+--- 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
@@ -88,8 +106,8 @@
#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
+--- 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 +=
@@ -100,8 +118,8 @@
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
+--- 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
@@ -112,8 +130,8 @@
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
+--- 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
@@ -124,8 +142,8 @@
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
+--- 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
@@ -145,8 +163,8 @@
`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
+--- 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
@@ -156,21 +174,9 @@
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
+--- 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 @@
;;
More information about the Pkg-ocaml-maint-commits
mailing list