[Pkg-ocaml-maint-commits] r4825 - in /trunk/packages/liquidsoap/trunk/debian: changelog control control.in patches/00list patches/add_http_timeout.patch patches/series rules
toots at users.alioth.debian.org
toots at users.alioth.debian.org
Thu Nov 22 01:09:26 UTC 2007
Author: toots
Date: Thu Nov 22 01:09:26 2007
New Revision: 4825
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=4825
Log:
Prepared liquidsoap 0.3.5-3
Added:
trunk/packages/liquidsoap/trunk/debian/patches/add_http_timeout.patch
trunk/packages/liquidsoap/trunk/debian/patches/series
Removed:
trunk/packages/liquidsoap/trunk/debian/patches/00list
Modified:
trunk/packages/liquidsoap/trunk/debian/changelog
trunk/packages/liquidsoap/trunk/debian/control
trunk/packages/liquidsoap/trunk/debian/control.in
trunk/packages/liquidsoap/trunk/debian/rules
Modified: trunk/packages/liquidsoap/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/liquidsoap/trunk/debian/changelog?rev=4825&op=diff
==============================================================================
--- trunk/packages/liquidsoap/trunk/debian/changelog (original)
+++ trunk/packages/liquidsoap/trunk/debian/changelog Thu Nov 22 01:09:26 2007
@@ -1,3 +1,11 @@
+liquidsoap (0.3.5-3) unstable; urgency=low
+
+ * Initial upload to sid
+ * Enabled all available bindings
+ * Backported patch to add timeout to http connections
+
+ -- Romain Beauxis <toots at rastageeks.org> Thu, 22 Nov 2007 01:30:29 +0100
+
liquidsoap (0.3.5-2) experimental; urgency=low
* Added README.Debian with informations about mp3 output.
Modified: trunk/packages/liquidsoap/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/liquidsoap/trunk/debian/control?rev=4825&op=diff
==============================================================================
--- trunk/packages/liquidsoap/trunk/debian/control (original)
+++ trunk/packages/liquidsoap/trunk/debian/control Thu Nov 22 01:09:26 2007
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Liquidsoap Debian Packaging <savonet-debian at lists.sourceforge.net>
Uploaders: Romain Beauxis <toots at rastageeks.org>, Samuel Mimram <smimram at debian.org>
-Build-Depends: cdbs (>= 0.4.23-1.1), debhelper (>= 4.2.0), dpatch, ocaml-nox, ocaml-findlib, libshout-ocaml-dev, libogg-ocaml-dev (>= 0.1.1), libvorbis-ocaml-dev (>= 0.4.0), libmad-ocaml-dev (>= 0.3.2), libid3tag0-dev, libdtools-ocaml-dev (>= 0.1.4), libcamomile-ocaml-dev, festival, wget, libxml-dom-perl, texlive, python-gtk2-dev, python, python-support (>= 0.3), libao-ocaml-dev, libalsa-ocaml-dev (>= 0.1.2), libpcre-ocaml-dev, libxml-light-ocaml-dev, libextlib-ocaml-dev
+Build-Depends: debhelper (>= 4.2.0), quilt, patchutils (>= 0.2.25), cdbs (>= 0.4.27-1), ocaml-nox, ocaml-findlib, libshout-ocaml-dev, libogg-ocaml-dev (>= 0.1.1), libvorbis-ocaml-dev (>= 0.4.0), libmad-ocaml-dev (>= 0.3.2), libid3tag0-dev, libdtools-ocaml-dev (>= 0.1.4), libcamomile-ocaml-dev, festival, wget, libxml-dom-perl, texlive, python-gtk2-dev, python, python-support (>= 0.3), libao-ocaml-dev, libalsa-ocaml-dev (>= 0.1.2), libpcre-ocaml-dev, libxml-light-ocaml-dev, libextlib-ocaml-dev, libladspa-ocaml-dev, libportaudio-ocaml-dev, libsoundtouch-ocaml-dev
Standards-Version: 3.7.2
Vcs-Svn: svn://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/liquidsoap
Vcs-Browser: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/liquidsoap/trunk/
Modified: trunk/packages/liquidsoap/trunk/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/liquidsoap/trunk/debian/control.in?rev=4825&op=diff
==============================================================================
--- trunk/packages/liquidsoap/trunk/debian/control.in (original)
+++ trunk/packages/liquidsoap/trunk/debian/control.in Thu Nov 22 01:09:26 2007
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Liquidsoap Debian Packaging <savonet-debian at lists.sourceforge.net>
Uploaders: Romain Beauxis <toots at rastageeks.org>, Samuel Mimram <smimram at debian.org>
-Build-Depends: @cdbs@, ocaml-nox, ocaml-findlib, libshout-ocaml-dev, libogg-ocaml-dev (>= 0.1.1), libvorbis-ocaml-dev (>= 0.4.0), libmad-ocaml-dev (>= 0.3.2), libid3tag0-dev, libdtools-ocaml-dev (>= 0.1.4), libcamomile-ocaml-dev, festival, wget, libxml-dom-perl, texlive, python-gtk2-dev, python, python-support (>= 0.3), libao-ocaml-dev, libalsa-ocaml-dev (>= 0.1.2), libpcre-ocaml-dev, libxml-light-ocaml-dev, libextlib-ocaml-dev
+Build-Depends: @cdbs@, ocaml-nox, ocaml-findlib, libshout-ocaml-dev, libogg-ocaml-dev (>= 0.1.1), libvorbis-ocaml-dev (>= 0.4.0), libmad-ocaml-dev (>= 0.3.2), libid3tag0-dev, libdtools-ocaml-dev (>= 0.1.4), libcamomile-ocaml-dev, festival, wget, libxml-dom-perl, texlive, python-gtk2-dev, python, python-support (>= 0.3), libao-ocaml-dev, libalsa-ocaml-dev (>= 0.1.2), libpcre-ocaml-dev, libxml-light-ocaml-dev, libextlib-ocaml-dev, libladspa-ocaml-dev, libportaudio-ocaml-dev, libsoundtouch-ocaml-dev
Standards-Version: 3.7.2
Vcs-Svn: svn://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/liquidsoap
Vcs-Browser: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/liquidsoap/trunk/
Added: trunk/packages/liquidsoap/trunk/debian/patches/add_http_timeout.patch
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/liquidsoap/trunk/debian/patches/add_http_timeout.patch?rev=4825&op=file
==============================================================================
--- trunk/packages/liquidsoap/trunk/debian/patches/add_http_timeout.patch (added)
+++ trunk/packages/liquidsoap/trunk/debian/patches/add_http_timeout.patch Thu Nov 22 01:09:26 2007
@@ -1,0 +1,61 @@
+Index: liquidsoap-0.3.5/src/sources/http_source.ml
+===================================================================
+--- liquidsoap-0.3.5.orig/src/sources/http_source.ml 2007-11-22 01:57:59.000000000 +0100
++++ liquidsoap-0.3.5/src/sources/http_source.ml 2007-11-22 01:58:22.000000000 +0100
+@@ -267,7 +267,7 @@
+ in
+ self#log#f 4 "Connecting to <http://%s:%d%s>..." host port mount ;
+ try
+- let socket = Http.connect host port in
++ let socket = Http.connect ~timeout:(Some bufferize) host port in
+ try
+ let (_, status, status_msg), fields = Http.request socket request in
+ let content_type =
+Index: liquidsoap-0.3.5/src/tools/http.ml
+===================================================================
+--- liquidsoap-0.3.5.orig/src/tools/http.ml 2007-11-22 01:57:59.000000000 +0100
++++ liquidsoap-0.3.5/src/tools/http.ml 2007-11-22 01:58:22.000000000 +0100
+@@ -105,8 +105,16 @@
+
+ (** HTTP functions. *)
+
+-let connect host port =
++let connect ~timeout host port =
+ let socket = Unix.socket Unix.PF_INET Unix.SOCK_STREAM 0 in
++ begin
++ match timeout with
++ | None -> ()
++ | Some t ->
++ (* Add some timeout *)
++ Unix.setsockopt_float socket Unix.SO_RCVTIMEO t ;
++ Unix.setsockopt_float socket Unix.SO_SNDTIMEO t
++ end ;
+ try
+ Unix.connect
+ socket
+Index: liquidsoap-0.3.5/src/tools/http.mli
+===================================================================
+--- liquidsoap-0.3.5.orig/src/tools/http.mli 2007-11-22 01:57:59.000000000 +0100
++++ liquidsoap-0.3.5/src/tools/http.mli 2007-11-22 01:58:22.000000000 +0100
+@@ -18,7 +18,7 @@
+ val args_split : string -> (string, string) Hashtbl.t
+
+ (** Connect to an http server given an host and a port. *)
+-val connect : string -> int -> connection
++val connect : timeout:float option -> string -> int -> connection
+
+ (** Disconnect from an http server. *)
+ val disconnect : connection -> unit
+Index: liquidsoap-0.3.5/src/tools/lastfm.ml
+===================================================================
+--- liquidsoap-0.3.5.orig/src/tools/lastfm.ml 2007-11-22 01:58:35.000000000 +0100
++++ liquidsoap-0.3.5/src/tools/lastfm.ml 2007-11-22 01:59:03.000000000 +0100
+@@ -59,7 +59,7 @@
+
+ let request ?(post="") ?(headers=[]) ?(host=host) ?(port=port) req =
+ try
+- let socket = Http.connect host port in
++ let socket = Http.connect ~timeout:(Some 10.) host port in
+ let http_req =
+ if post <> "" then
+ Http.post ~headers:headers post
Added: trunk/packages/liquidsoap/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/liquidsoap/trunk/debian/patches/series?rev=4825&op=file
==============================================================================
--- trunk/packages/liquidsoap/trunk/debian/patches/series (added)
+++ trunk/packages/liquidsoap/trunk/debian/patches/series Thu Nov 22 01:09:26 2007
@@ -1,0 +1,1 @@
+add_http_timeout.patch
Modified: trunk/packages/liquidsoap/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/liquidsoap/trunk/debian/rules?rev=4825&op=diff
==============================================================================
--- trunk/packages/liquidsoap/trunk/debian/rules (original)
+++ trunk/packages/liquidsoap/trunk/debian/rules Thu Nov 22 01:09:26 2007
@@ -2,7 +2,7 @@
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/autotools.mk
-include /usr/share/cdbs/1/rules/dpatch.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
# In order to regenerate 'debian/control' :
# DEB_AUTO_UPDATE_DEBIAN_CONTROL=yes fakeroot debian/rules clean
More information about the Pkg-ocaml-maint-commits
mailing list