[Pkg-ocaml-maint-commits] r3818 - in /trunk/packages/syslog-ocaml/trunk/debian: changelog control libsyslog-ocaml.install.in patches/aux.dpatch

ecc-guest at users.alioth.debian.org ecc-guest at users.alioth.debian.org
Wed Jun 13 00:44:30 UTC 2007 

Author: ecc-guest
Date: Wed Jun 13 00:44:30 2007
New Revision: 3818

URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=3818
Log:


Added:
    trunk/packages/syslog-ocaml/trunk/debian/libsyslog-ocaml.install.in
Modified:
    trunk/packages/syslog-ocaml/trunk/debian/changelog
    trunk/packages/syslog-ocaml/trunk/debian/control
    trunk/packages/syslog-ocaml/trunk/debian/patches/aux.dpatch

Modified: trunk/packages/syslog-ocaml/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/syslog-ocaml/trunk/debian/changelog?rev=3818&op=diff
==============================================================================
--- trunk/packages/syslog-ocaml/trunk/debian/changelog (original)
+++ trunk/packages/syslog-ocaml/trunk/debian/changelog Wed Jun 13 00:44:30 2007
@@ -1,8 +1,9 @@
-syslog-ocaml (1.3-5) UNRELEASED; urgency=low
+syslog-ocaml (1.3-5) unstable; urgency=low
 
-  * NOT RELEASED YET
+  * Create libsyslog-ocaml as well as libsyslog-ocaml-dev
+    since there is now a stub library for bytecode client programs
 
- -- Sylvain Le Gall <gildor at debian.org>  Sat, 09 Jun 2007 23:54:17 +0200
+ -- Eric Cooper <ecc at cmu.edu>  Tue, 12 Jun 2007 16:51:37 -0400
 
 syslog-ocaml (1.3-4) unstable; urgency=low
 

Modified: trunk/packages/syslog-ocaml/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/syslog-ocaml/trunk/debian/control?rev=3818&op=diff
==============================================================================
--- trunk/packages/syslog-ocaml/trunk/debian/control (original)
+++ trunk/packages/syslog-ocaml/trunk/debian/control Wed Jun 13 00:44:30 2007
@@ -4,14 +4,26 @@
 Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
 Uploaders: Eric Cooper <ecc at cmu.edu>, Sven Luther <luther at debian.org>,
  Ralf Treinen <treinen at debian.org>
-Build-Depends: debhelper (>= 5.0), cdbs, dpatch, ocaml-nox (>= 3.09),  ocaml-findlib, ocamlmakefile
+Build-Depends: debhelper (>= 5.0), cdbs, dpatch, ocaml-nox (>= 3.09), ocamlmakefile, ocaml-findlib
 Standards-Version: 3.7.2
 XS-Vcs-Svn: svn://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/syslog-ocaml
 XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/syslog-ocaml/trunk/
 
+Package: libsyslog-ocaml
+Architecture: any
+Section: libs
+Depends: ocaml-base-nox-${F:OCamlABI}, ${shlibs:Depends}
+Description: syslog routines for OCaml
+ This library implements a syslog client in Objective Caml.
+ .
+ This package contains the shared runtime stub libraries.
+
 Package: libsyslog-ocaml-dev
 Architecture: any
 Section: libdevel
-Depends: ocaml-nox-${F:OCamlABI}
+Depends: ocaml-nox-${F:OCamlABI}, libsyslog-ocaml (= ${Source-Version})
 Description: syslog routines for OCaml
  This library implements a syslog client in Objective Caml.
+ .
+ This package contains the files needed to compile OCaml programs
+ that use the syslog library.

Added: trunk/packages/syslog-ocaml/trunk/debian/libsyslog-ocaml.install.in
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/syslog-ocaml/trunk/debian/libsyslog-ocaml.install.in?rev=3818&op=file
==============================================================================
--- trunk/packages/syslog-ocaml/trunk/debian/libsyslog-ocaml.install.in (added)
+++ trunk/packages/syslog-ocaml/trunk/debian/libsyslog-ocaml.install.in Wed Jun 13 00:44:30 2007
@@ -1,0 +1,1 @@
+dllsyslog_stubs.so	@OCamlStdlibDir@/stublibs

Modified: trunk/packages/syslog-ocaml/trunk/debian/patches/aux.dpatch
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/syslog-ocaml/trunk/debian/patches/aux.dpatch?rev=3818&op=diff
==============================================================================
--- trunk/packages/syslog-ocaml/trunk/debian/patches/aux.dpatch (original)
+++ trunk/packages/syslog-ocaml/trunk/debian/patches/aux.dpatch Wed Jun 13 00:44:30 2007
@@ -5,21 +5,23 @@
 ## DP: patch to add wrapper for send(2) with MSG_NOSIGNAL option
 
 @DPATCH@
-diff -Naur syslog-ocaml-1.3/syslog.ml syslog-ocaml-1.3-new/syslog.ml
---- syslog-ocaml-1.3/syslog.ml	2007-06-08 16:02:22.000000000 -0400
-+++ syslog-ocaml-1.3-new/syslog.ml	2007-06-08 16:05:40.000000000 -0400
-@@ -209,7 +209,7 @@
- 	  String.blit "<truncated>" 0 !realmsg 1012 11
- 	end;
- 	begin try
--	  ignore (Unix.write loginfo.fd !realmsg 0 (String.length !realmsg))
-+	  ignore (Aux.send loginfo.fd !realmsg 0 (String.length !realmsg) [Aux.MSG_NOSIGNAL])
- 	with 
- 	  | Unix.Unix_error(_,_,_) -> (* on error, attempt to reconnect *)
- 	      (try close loginfo.fd
-diff -Naur syslog-ocaml-1.3/aux.ml syslog-ocaml-1.3-new/aux.ml
---- syslog-ocaml-1.3/aux.ml	1969-12-31 19:00:00.000000000 -0500
-+++ syslog-ocaml-1.3-new/aux.ml	2007-06-08 16:05:40.000000000 -0400
+diff -urNad syslog-ocaml-1.3~/Makefile syslog-ocaml-1.3/Makefile
+--- syslog-ocaml-1.3~/Makefile	2007-06-12 10:55:52.000000000 -0400
++++ syslog-ocaml-1.3/Makefile	2007-06-12 10:56:31.000000000 -0400
+@@ -1,8 +1,9 @@
+ OCAMLMAKEFILE = /usr/share/ocamlmakefile/OCamlMakefile
+ DESTDIR = $(shell ocamlc -where | sed s:/usr/lib/:/usr/local/lib/:)
+ OCAMLFIND_INSTFLAGS = -destdir $(DESTDIR)
++NO_CUSTOM = yes
+ 
+-SOURCES=syslog.mli syslog.ml
++SOURCES=syslog.mli aux.ml syslog.ml aux_stubs.c
+ RESULT=syslog
+ PACKS=unix
+ 
+diff -urNad syslog-ocaml-1.3~/aux.ml syslog-ocaml-1.3/aux.ml
+--- syslog-ocaml-1.3~/aux.ml	1969-12-31 19:00:00.000000000 -0500
++++ syslog-ocaml-1.3/aux.ml	2007-06-12 10:55:52.000000000 -0400
 @@ -0,0 +1,14 @@
 +type msg_flag =
 +    MSG_OOB
@@ -35,13 +37,14 @@
 +  if ofs < 0 || len < 0 || ofs > String.length buf - len
 +  then invalid_arg "Unix.send"
 +  else unsafe_send fd buf ofs len flags
-diff -Naur syslog-ocaml-1.3/aux_stubs.c syslog-ocaml-1.3-new/aux_stubs.c
---- syslog-ocaml-1.3/aux_stubs.c	1969-12-31 19:00:00.000000000 -0500
-+++ syslog-ocaml-1.3-new/aux_stubs.c	2007-06-08 16:05:40.000000000 -0400
-@@ -0,0 +1,30 @@
+diff -urNad syslog-ocaml-1.3~/aux_stubs.c syslog-ocaml-1.3/aux_stubs.c
+--- syslog-ocaml-1.3~/aux_stubs.c	1969-12-31 19:00:00.000000000 -0500
++++ syslog-ocaml-1.3/aux_stubs.c	2007-06-12 10:56:49.000000000 -0400
+@@ -0,0 +1,31 @@
 +#include <string.h>
 +#include <sys/socket.h>
 +#include <caml/mlvalues.h>
++#include <caml/alloc.h>
 +#include <caml/signals.h>
 +
 +// These are from .../otherlibs/unix/unixsupport.h
@@ -69,14 +72,15 @@
 +  if (ret == -1) uerror("send", (value) 0);
 +  return Val_int(ret);
 +}
-diff -Naur syslog-ocaml-1.3/Makefile syslog-ocaml-1.3-new/Makefile
---- syslog-ocaml-1.3/Makefile	2007-06-08 16:02:22.000000000 -0400
-+++ syslog-ocaml-1.3-new/Makefile	2007-06-08 16:05:40.000000000 -0400
-@@ -1,6 +1,6 @@
- -include Makefile.conf
- 
--SOURCES=syslog.mli syslog.ml
-+SOURCES=syslog.mli aux.ml syslog.ml aux_stubs.c
- RESULT=syslog
- PACKS=unix
- 
+diff -urNad syslog-ocaml-1.3~/syslog.ml syslog-ocaml-1.3/syslog.ml
+--- syslog-ocaml-1.3~/syslog.ml	2007-06-12 10:52:49.000000000 -0400
++++ syslog-ocaml-1.3/syslog.ml	2007-06-12 10:55:52.000000000 -0400
+@@ -209,7 +209,7 @@
+ 	  String.blit "<truncated>" 0 !realmsg 1012 11
+ 	end;
+ 	begin try
+-	  ignore (Unix.write loginfo.fd !realmsg 0 (String.length !realmsg))
++	  ignore (Aux.send loginfo.fd !realmsg 0 (String.length !realmsg) [Aux.MSG_NOSIGNAL])
+ 	with 
+ 	  | Unix.Unix_error(_,_,_) -> (* on error, attempt to reconnect *)
+ 	      (try close loginfo.fd

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