[Pkg-ocaml-maint-commits] r1341 - in trunk/packages/syslog-ocaml: . debian debian/patches

[Eric Cooper]

Author: ecc-guest
Date: 2005-04-30 20:00:52 +0000 (Sat, 30 Apr 2005)
New Revision: 1341

Added:
   trunk/packages/syslog-ocaml/syslog-ocaml_1.2.orig.tar.gz
Removed:
   trunk/packages/syslog-ocaml/debian/patches/syslog-ng.dpatch
   trunk/packages/syslog-ocaml/syslog-ocaml_1.0.orig.tar.gz
Modified:
   trunk/packages/syslog-ocaml/debian/changelog
   trunk/packages/syslog-ocaml/debian/copyright
   trunk/packages/syslog-ocaml/debian/patches/00list
   trunk/packages/syslog-ocaml/debian/rules
Log:
new upstream release incorporating syslog-ng support


Modified: trunk/packages/syslog-ocaml/debian/changelog
===================================================================
--- trunk/packages/syslog-ocaml/debian/changelog	2005-04-29 18:08:19 UTC (rev 1340)
+++ trunk/packages/syslog-ocaml/debian/changelog	2005-04-30 20:00:52 UTC (rev 1341)
@@ -1,3 +1,9 @@
+syslog-ocaml (1.2-1) unstable; urgency=low
+
+  * New upstream release incorporating syslog-ng support.
+
+ -- Eric Cooper <ecc@cmu.edu>  Sat, 30 Apr 2005 15:50:47 -0400
+
 syslog-ocaml (1.0-3) unstable; urgency=low
 
   * Support SOCK_STREAM log sockets for syslog-ng (closes: #305019)

Modified: trunk/packages/syslog-ocaml/debian/copyright
===================================================================
--- trunk/packages/syslog-ocaml/debian/copyright	2005-04-29 18:08:19 UTC (rev 1340)
+++ trunk/packages/syslog-ocaml/debian/copyright	2005-04-30 20:00:52 UTC (rev 1341)
@@ -1,12 +1,12 @@
 Packaged for Debian by
     Eric Cooper <ecc@cmu.edu>
-    Wed, 23 Feb 2005 12:00:04 -0500
-Downloaded from http://www.csun.edu/~eric/syslog-1.0.tar.gz
+    Wed, 30 Apr 2005 15:50:00 -0500
+Downloaded from http://www.csun.edu/~eric/syslog-1.2.tar.gz
 
 syslog(3) routines for ocaml
 This library is based on Shawn Wagner's original syslog
 library as included in annexlib, with significant modifications
-by by Eric Stokes <eric.stokes@csun.edu>.
+by Eric Stokes <eric.stokes@csun.edu>.
 
 Copyright (C) 2002 Shawn Wagner <raevnos@pennmush.org>
 Copyright (C) 2005 Eric Stokes <eric.stokes@csun.edu>

Modified: trunk/packages/syslog-ocaml/debian/patches/00list
===================================================================
--- trunk/packages/syslog-ocaml/debian/patches/00list	2005-04-29 18:08:19 UTC (rev 1340)
+++ trunk/packages/syslog-ocaml/debian/patches/00list	2005-04-30 20:00:52 UTC (rev 1341)
@@ -1,2 +1 @@
 Makefile.dpatch
-syslog-ng.dpatch

Deleted: trunk/packages/syslog-ocaml/debian/patches/syslog-ng.dpatch
===================================================================
--- trunk/packages/syslog-ocaml/debian/patches/syslog-ng.dpatch	2005-04-29 18:08:19 UTC (rev 1340)
+++ trunk/packages/syslog-ocaml/debian/patches/syslog-ng.dpatch	2005-04-30 20:00:52 UTC (rev 1341)
@@ -1,26 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## syslog-ng.dpatch by Eric Cooper <ecc@cmu.edu>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: support SOCK_STREAM log socket for syslog-ng
-
-@DPATCH@
-diff -u syslog-1.0/syslog.ml syslog-1.0-new/syslog.ml
---- syslog-1.0/syslog.ml	2005-02-16 19:59:17.000000000 -0500
-+++ syslog-1.0-new/syslog.ml	2005-04-17 12:19:54.441839339 -0400
-@@ -100,8 +100,13 @@
- 	(match (Unix.stat logpath).Unix.st_kind with
- 	     Unix.S_SOCK -> 
- 	       let logaddr = Unix.ADDR_UNIX logpath in
--		 loginfo.fd <- Unix.socket Unix.PF_UNIX SOCK_DGRAM 0;
--		 Unix.connect loginfo.fd logaddr;
-+	         (try
-+		    loginfo.fd <- Unix.socket Unix.PF_UNIX SOCK_DGRAM 0;
-+		    Unix.connect loginfo.fd logaddr
-+		  with Unix.Unix_error (Unix.EPROTOTYPE, _, _) ->
-+		    (* try again with a stream socket for syslog-ng *)
-+		    loginfo.fd <- Unix.socket Unix.PF_UNIX SOCK_STREAM 0;
-+		    Unix.connect loginfo.fd logaddr);
- 		 loginfo.connected <- true;
- 	   | Unix.S_FIFO -> 	
- 	       loginfo.fd <- Unix.openfile logpath [Unix.O_WRONLY] 0o666;

Modified: trunk/packages/syslog-ocaml/debian/rules
===================================================================
--- trunk/packages/syslog-ocaml/debian/rules	2005-04-29 18:08:19 UTC (rev 1340)
+++ trunk/packages/syslog-ocaml/debian/rules	2005-04-30 20:00:52 UTC (rev 1341)
@@ -45,7 +45,7 @@
 binary-arch: build install
 	dh_testdir
 	dh_testroot
-	dh_installchangelogs
+	dh_installchangelogs Changelog
 	dh_installdocs
 	dh_installexamples
 #	dh_install

Deleted: trunk/packages/syslog-ocaml/syslog-ocaml_1.0.orig.tar.gz
===================================================================
(Binary files differ)

Added: trunk/packages/syslog-ocaml/syslog-ocaml_1.2.orig.tar.gz
===================================================================
(Binary files differ)


Property changes on: trunk/packages/syslog-ocaml/syslog-ocaml_1.2.orig.tar.gz
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream