[Pkg-ocaml-maint-commits] [SCM] syslog-ocaml packaging branch, master, updated. debian/1.4-1-6-g9cbd1d1
Eric Cooper
ecc at cmu.edu
Tue Mar 3 01:54:28 UTC 2009
The following commit has been merged in the master branch:
commit 4d32767a1973d70b6390885ed79f32704f5909d0
Author: Eric Cooper <ecc at cmu.edu>
Date: Mon Mar 2 20:43:37 2009 -0500
remove dpatch and convert patches to commits on master branch
update for OCaml 3.11 transition
diff --git a/debian/changelog b/debian/changelog
index 722ea81..a1598be 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,15 +1,18 @@
-syslog-ocaml (1.4-2) UNRELEASED; urgency=low
-
- [ Stefano Zacchiroli ]
- * NOT RELEASED YET
+syslog-ocaml (1.4-2) unstable; urgency=low
[ Eric Cooper]
* Update standards version
+ * Update versioned build-dep on ocaml-nox
+ * Remove dpatch and apply patches to master git branch instead
+ * Use upstream OCamlMakefile and remove build-dep on ocamlmakefile
+ * Add build-dep on dh-ocaml
+ * Change debhelper version build-dep and debian/compat to 7
+ * Add misc:Depends to debian/control
[ Stephane Glondu ]
* Switching packaging to git
- -- Eric Cooper <ecc at cmu.edu> Mon, 15 Dec 2008 09:26:59 -0500
+ -- Eric Cooper <ecc at cmu.edu> Sun, 01 Mar 2009 20:17:27 -0500
syslog-ocaml (1.4-1) unstable; urgency=low
diff --git a/debian/compat b/debian/compat
index 7ed6ff8..7f8f011 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+7
diff --git a/debian/control b/debian/control
index 9e5296a..117f3fc 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
Uploaders: Eric Cooper <ecc at cmu.edu>, Ralf Treinen <treinen at debian.org>
DM-Upload-Allowed: yes
-Build-Depends: debhelper (>= 5.0), cdbs, dpatch, ocaml-nox (>= 3.10), ocamlmakefile, ocaml-findlib
+Build-Depends: debhelper (>= 7.0), cdbs, ocaml-nox (>= 3.11), dh-ocaml, ocaml-findlib
Standards-Version: 3.8.0
Homepage: http://homepage.mac.com/letaris
Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/syslog-ocaml.git
@@ -13,7 +13,7 @@ Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/syslog-ocaml.git
Package: libsyslog-ocaml
Architecture: any
Section: libs
-Depends: ocaml-base-nox-${F:OCamlABI}, ${shlibs:Depends}
+Depends: ocaml-base-nox-${F:OCamlABI}, ${shlibs:Depends}, ${misc:Depends}
Description: syslog routines for OCaml
This library implements a syslog client in Objective Caml.
.
@@ -22,7 +22,7 @@ Description: syslog routines for OCaml
Package: libsyslog-ocaml-dev
Architecture: any
Section: libdevel
-Depends: ocaml-nox-${F:OCamlABI}, libsyslog-ocaml (= ${binary:Version})
+Depends: ocaml-nox-${F:OCamlABI}, libsyslog-ocaml (= ${binary:Version}), ${misc:Depends}
Description: syslog routines for OCaml
This library implements a syslog client in Objective Caml.
.
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index 6f8b24c..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile.dpatch
-aux.dpatch
diff --git a/debian/patches/Makefile.dpatch b/debian/patches/Makefile.dpatch
deleted file mode 100755
index 2abeffa..0000000
--- a/debian/patches/Makefile.dpatch
+++ /dev/null
@@ -1,29 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## Makefile.dpatch by Eric Cooper <ecc at cmu.edu>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Makefile patches
-
- at DPATCH@
---- syslog-1.3/Makefile 2005-02-16 18:31:49.000000000 -0500
-+++ syslog-ocaml/Makefile 2006-07-19 14:13:13.000000000 -0400
-@@ -1,10 +1,12 @@
---include Makefile.conf
-+OCAMLMAKEFILE = /usr/share/ocamlmakefile/OCamlMakefile
-+DESTDIR = $(shell ocamlc -where | sed s:/usr/lib/:/usr/local/lib/:)
-+OCAMLFIND_INSTFLAGS = -destdir $(DESTDIR)
-
- SOURCES=syslog.mli syslog.ml
- RESULT=syslog
- PACKS=unix
-
- LIBINSTALL_FILES=$(wildcard *.mli *.cmi *.cma *.cmx *.cmxa *.a *.so)
-
- all: byte-code-library
- opt: native-code-library
-@@ -13,4 +15,4 @@
- uninstall: libuninstall
- doc: htdoc
-
---include OCamlMakefile
-+include $(OCAMLMAKEFILE)
diff --git a/debian/patches/aux.dpatch b/debian/patches/aux.dpatch
deleted file mode 100755
index eaa146e..0000000
--- a/debian/patches/aux.dpatch
+++ /dev/null
@@ -1,94 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## aux.dpatch by Eric Cooper <ecc at cmu.edu>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: patch to add wrapper for send(2) with MSG_NOSIGNAL option
-
- at DPATCH@
-diff -urNad syslog-ocaml-1.4~/Makefile syslog-ocaml-1.4/Makefile
---- syslog-ocaml-1.4~/Makefile 2007-11-01 15:42:18.000000000 -0400
-+++ syslog-ocaml-1.4/Makefile 2007-11-01 15:42:18.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.4~/aux.ml syslog-ocaml-1.4/aux.ml
---- syslog-ocaml-1.4~/aux.ml 1969-12-31 19:00:00.000000000 -0500
-+++ syslog-ocaml-1.4/aux.ml 2007-11-01 15:42:18.000000000 -0400
-@@ -0,0 +1,14 @@
-+type msg_flag =
-+ MSG_OOB
-+ | MSG_DONTROUTE
-+ | MSG_PEEK
-+ | MSG_NOSIGNAL
-+
-+external unsafe_send :
-+ Unix.file_descr -> string -> int -> int -> msg_flag list -> int
-+ = "aux_send"
-+
-+let send fd buf ofs len flags =
-+ if ofs < 0 || len < 0 || ofs > String.length buf - len
-+ then invalid_arg "Unix.send"
-+ else unsafe_send fd buf ofs len flags
-diff -urNad syslog-ocaml-1.4~/aux_stubs.c syslog-ocaml-1.4/aux_stubs.c
---- syslog-ocaml-1.4~/aux_stubs.c 1969-12-31 19:00:00.000000000 -0500
-+++ syslog-ocaml-1.4/aux_stubs.c 2007-11-01 15:42:18.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
-+#define UNIX_BUFFER_SIZE 16384
-+extern void uerror (char * cmdname, value arg) Noreturn;
-+
-+static int msg_flag_table[] = {
-+ MSG_OOB, MSG_DONTROUTE, MSG_PEEK, MSG_NOSIGNAL
-+};
-+
-+CAMLprim value aux_send(value sock, value buff, value ofs, value len,
-+ value flags)
-+{
-+ int ret, cv_flags;
-+ long numbytes;
-+ char iobuf[UNIX_BUFFER_SIZE];
-+
-+ cv_flags = convert_flag_list(flags, msg_flag_table);
-+ numbytes = Long_val(len);
-+ if (numbytes > UNIX_BUFFER_SIZE) numbytes = UNIX_BUFFER_SIZE;
-+ memmove(iobuf, &Byte(buff, Long_val(ofs)), numbytes);
-+ enter_blocking_section();
-+ ret = send(Int_val(sock), iobuf, (int) numbytes, cv_flags);
-+ leave_blocking_section();
-+ if (ret == -1) uerror("send", (value) 0);
-+ return Val_int(ret);
-+}
-diff -urNad syslog-ocaml-1.4~/syslog.ml syslog-ocaml-1.4/syslog.ml
---- syslog-ocaml-1.4~/syslog.ml 2007-11-01 15:42:17.000000000 -0400
-+++ syslog-ocaml-1.4/syslog.ml 2007-11-01 15:51:55.000000000 -0400
-@@ -191,14 +191,11 @@
- (try open_connection loginfo with _ -> ());
- if List.mem `LOG_CONS loginfo.flags then log_console str
- in
-- let prev = Sys.signal Sys.sigpipe (Sys.Signal_handle fallback) in
- try
-- ignore (write loginfo.fd str 0 (String.length str));
-- Sys.set_signal Sys.sigpipe prev
-+ ignore (Aux.send loginfo.fd str 0 (String.length str) [Aux.MSG_NOSIGNAL])
- with Unix_error (_, _, _) ->
- (* on error, attempt to reconnect *)
-- fallback ();
-- Sys.set_signal Sys.sigpipe prev
-+ fallback ()
-
- let syslog ?fac loginfo lev str =
- let msg = Buffer.create 64 in
diff --git a/debian/rules b/debian/rules
index b885669..594b892 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,8 +2,7 @@
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/makefile.mk
-include /usr/share/cdbs/1/rules/dpatch.mk
-include /usr/share/cdbs/1/class/ocaml.mk
+include /usr/share/cdbs/1/rules/ocaml.mk
OCAML_OCAMLDOC_PACKAGES = $(OCAML_LIBDEV_PACKAGES)
--
syslog-ocaml packaging
More information about the Pkg-ocaml-maint-commits
mailing list