[Pkg-ocaml-maint-commits] [SCM] liquidsoap packaging branch, master, updated. debian/0.9.0-4-13-g92c566f
Romain Beauxis
toots at rastageeks.org
Mon Jun 22 16:58:34 UTC 2009
The following commit has been merged in the master branch:
commit ba446d8c9d6c89cfd91e667bfa45d0e42527be0f
Author: Romain Beauxis <toots at rastageeks.org>
Date: Mon Jun 22 18:51:21 2009 +0200
Prepared new upstream release
diff --git a/debian/changelog b/debian/changelog
index f078375..1f9c0eb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+liquidsoap (0.9.1-1) unstable; urgency=low
+
+ * New Upstream Version
+ * Dropped patch applied upstream.
+ * Thightened build-deps on ocaml-duppy and
+ ocaml-taglib to build against the fixed packages.
+ * Updated standards version to 3.8.2
+
+ -- Romain Beauxis <toots at rastageeks.org> Mon, 22 Jun 2009 18:42:50 +0200
+
liquidsoap (0.9.0-4) unstable; urgency=low
* Added patch from upstream:
diff --git a/debian/control b/debian/control
index 3a1bce0..0451a8d 100644
--- a/debian/control
+++ b/debian/control
@@ -3,19 +3,19 @@ Section: sound
Priority: optional
Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
Uploaders: Romain Beauxis <toots at rastageeks.org>, Samuel Mimram <smimram at debian.org>
-Build-Depends: debhelper (>= 7.0.1), quilt, patchutils (>= 0.2.25), cdbs (>= 0.4.27),
+Build-Depends: cdbs (>= 0.4.23-1.1), debhelper (>= 7.0.1),
ocaml-nox, ocaml-findlib, libshout-ocaml-dev,
libogg-ocaml-dev (>= 0.3.0), libvorbis-ocaml-dev (>= 0.5.0),
- libmad-ocaml-dev (>= 0.3.4), libdtools-ocaml-dev (>= 0.1.4), libtaglib-ocaml-dev,
+ libmad-ocaml-dev (>= 0.3.4), libdtools-ocaml-dev (>= 0.1.4), libtaglib-ocaml-dev (>= 0.1.3),
libcamomile-ocaml-dev, festival, libxml-dom-perl, python-gtk2-dev,
- python, python-support (>= 0.3), libao-ocaml-dev, libduppy-ocaml-dev (>= 0.1.2+2),
+ python, python-support (>= 0.3), libao-ocaml-dev, libduppy-ocaml-dev (>= 0.3.0),
libalsa-ocaml-dev (>= 0.1.2) [!kfreebsd-i386 !hurd-i386 !kfreebsd-amd64],
libpcre-ocaml-dev, libxml-light-ocaml-dev, libladspa-ocaml-dev,
libsoundtouch-ocaml-dev, liblastfm-ocaml-dev, sox,
- libspeex-ocaml-dev (>= 0.1.1-2), libgavl-ocaml-dev (>= 0.1.1-2), libtheora-ocaml-dev (>= 0.1.1-2),
- libportaudio-ocaml-dev, libpulse-ocaml-dev (>= 0.1.0-3), libsamplerate-ocaml-dev,
+ libspeex-ocaml-dev, libgavl-ocaml-dev, libtheora-ocaml-dev,
+ libportaudio-ocaml-dev, libpulse-ocaml-dev, libsamplerate-ocaml-dev,
libxmlplaylist-ocaml-dev, libmagic-ocaml-dev, libbjack-ocaml-dev (>= 0.1.1)
-Standards-Version: 3.8.1
+Standards-Version: 3.8.2
Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/liquidsoap.git
Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/liquidsoap.git
Homepage: http://savonet.sourceforge.net/
diff --git a/debian/control.in b/debian/control.in
index f7c5e7e..8c8e63b 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -6,16 +6,16 @@ Uploaders: Romain Beauxis <toots at rastageeks.org>, Samuel Mimram <smimram at debian.
Build-Depends: @cdbs@,
ocaml-nox, ocaml-findlib, libshout-ocaml-dev,
libogg-ocaml-dev (>= 0.3.0), libvorbis-ocaml-dev (>= 0.5.0),
- libmad-ocaml-dev (>= 0.3.4), libdtools-ocaml-dev (>= 0.1.4), libtaglib-ocaml-dev,
+ libmad-ocaml-dev (>= 0.3.4), libdtools-ocaml-dev (>= 0.1.4), libtaglib-ocaml-dev (>= 0.1.3),
libcamomile-ocaml-dev, festival, libxml-dom-perl, python-gtk2-dev,
- python, python-support (>= 0.3), libao-ocaml-dev, libduppy-ocaml-dev (>= 0.1.2+2),
+ python, python-support (>= 0.3), libao-ocaml-dev, libduppy-ocaml-dev (>= 0.3.0),
libalsa-ocaml-dev (>= 0.1.2) [!kfreebsd-i386 !hurd-i386 !kfreebsd-amd64],
libpcre-ocaml-dev, libxml-light-ocaml-dev, libladspa-ocaml-dev,
libsoundtouch-ocaml-dev, liblastfm-ocaml-dev, sox,
libspeex-ocaml-dev, libgavl-ocaml-dev, libtheora-ocaml-dev,
libportaudio-ocaml-dev, libpulse-ocaml-dev, libsamplerate-ocaml-dev,
libxmlplaylist-ocaml-dev, libmagic-ocaml-dev, libbjack-ocaml-dev (>= 0.1.1)
-Standards-Version: 3.8.1
+Standards-Version: 3.8.2
Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/liquidsoap.git
Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/liquidsoap.git
Homepage: http://savonet.sourceforge.net/
diff --git a/debian/patches/fix_append.patch b/debian/patches/fix_append.patch
deleted file mode 100644
index b031000..0000000
--- a/debian/patches/fix_append.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Index: liquidsoap/src/operators/append.ml
-===================================================================
---- liquidsoap.orig/src/operators/append.ml 2009-04-02 11:47:59.000000000 +0200
-+++ liquidsoap/src/operators/append.ml 2009-06-11 02:17:48.000000000 +0200
-@@ -51,7 +51,11 @@
- if finished then
- if append#is_ready then begin
- state <- `Append append ;
-- if merge then self#get_frame buf
-+ if merge then
-+ let pos = Frame.position buf in
-+ self#get_frame buf ;
-+ Frame.set_breaks buf
-+ (Utils.remove_one ((=) pos) (Frame.breaks buf))
- end else begin
- self#log#f 3
- "Track ends and append source is not ready: \
-@@ -74,7 +78,11 @@
- if Frame.is_partial buf then
- if a#is_ready then begin
- state <- `Append a ;
-- if merge then self#get_frame buf
-+ if merge then
-+ let pos = Frame.position buf in
-+ self#get_frame buf ;
-+ Frame.set_breaks buf
-+ (Utils.remove_one ((=) pos) (Frame.breaks buf))
- end else begin
- self#log#f 3
- "Track ends and append source is not ready: won't append." ;
diff --git a/debian/patches/fix_math_h_usage.patch b/debian/patches/fix_math_h_usage.patch
deleted file mode 100644
index d57e33a..0000000
--- a/debian/patches/fix_math_h_usage.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Index: liquidsoap/src/stream/rgb_c.c
-===================================================================
---- liquidsoap.orig/src/stream/rgb_c.c 2009-05-19 22:39:54.000000000 +1100
-+++ liquidsoap/src/stream/rgb_c.c 2009-05-19 22:40:09.000000000 +1100
-@@ -612,10 +612,10 @@
- for (i = ox; i < dst.width - ox; i++)
- {
- dx = (i - ox) / ax;
-- i2 = floorl(dx);
-+ i2 = floor(dx);
- dx -= i2;
- dy = (j - oy) / ay;
-- j2 = floorl(dy);
-+ j2 = floor(dy);
- dy -= j2;
- for (c = 0; c < Rgb_elems_per_pixel; c++)
- Color(&dst, c, i, j) =
-@@ -940,7 +940,7 @@
- for (j = 0; j < rgb.height; j++)
- for (i = 0; i < rgb.width; i++)
- {
-- r = sqrtl((i - x) * (i - x) + (j - y) * (j - y));
-+ r = sqrt((i - x) * (i - x) + (j - y) * (j - y));
- if (r > radius)
- Alpha(&rgb, i, j) = 0;
- }
diff --git a/debian/patches/fix_req_task.patch b/debian/patches/fix_req_task.patch
deleted file mode 100644
index 3354db1..0000000
--- a/debian/patches/fix_req_task.patch
+++ /dev/null
@@ -1,204 +0,0 @@
-Index: liquidsoap/src/sources/request_source.ml
-===================================================================
---- liquidsoap.orig/src/sources/request_source.ml 2009-04-02 11:47:59.000000000 +0200
-+++ liquidsoap/src/sources/request_source.ml 2009-06-11 02:15:52.000000000 +0200
-@@ -167,42 +167,41 @@
- val mutable queue_length = 0 (* Frames *)
- val mutable resolving = None
-
-- (** State should be `Sleeping on awakening, and is then turned to `Running.
-- * Eventually #sleep puts it to `Tired, then waits for it to be `Sleeping,
-- * meaning that the feeding tasks exited. *)
-- val mutable state = `Sleeping
-- val state_lock = Mutex.create ()
-- val state_cond = Condition.create ()
- val mutable task = None
-+ val task_m = Mutex.create ()
-+
-+ method private create_task =
-+ Tutils.mutexify task_m
-+ (fun () ->
-+ begin
-+ match task with
-+ | Some reload -> reload := false
-+ | None -> ()
-+ end ;
-+ let reload = ref true in
-+ Duppy.Task.add Tutils.scheduler
-+ { Duppy.Task.
-+ priority = priority ;
-+ events = [`Delay 0.] ;
-+ handler = self#feed_queue reload } ;
-+ task <- Some reload) ()
-+
-+ method private stop_task =
-+ Tutils.mutexify task_m
-+ (fun () ->
-+ begin
-+ match task with
-+ | Some reload -> reload := false
-+ | None -> ()
-+ end;
-+ task <- None) ()
-
- method private wake_up activation =
- assert (task = None) ;
-- Tutils.mutexify state_lock
-- (fun () ->
-- assert (state = `Sleeping) ;
-- state <- `Running) () ;
-- let t =
-- Duppy.Async.add Tutils.scheduler ~priority
-- (fun () -> Duppy.Task.add Tutils.scheduler
-- { Duppy.Task.
-- priority = priority ;
-- events = [`Delay 0.] ;
-- handler = (fun _ -> self#feed_queue () ; []) })
-- in
-- Duppy.Async.wake_up t ;
-- task <- Some t
-+ self#create_task
-
- method private sleep =
-- (* Ask the feeding task to die. *)
-- Tutils.mutexify state_lock
-- (fun () ->
-- assert (state = `Running) ;
-- state <- `Tired) () ;
-- (* Make sure the task is awake so it can die and let us know about it. *)
-- Duppy.Async.wake_up (Utils.get_some task) ;
-- Tutils.wait state_cond state_lock (fun () -> state = `Sleeping) ;
-- Duppy.Async.stop (Utils.get_some task) ;
-- task <- None ;
-+ self#stop_task ;
- (* No more feeding task, we can go to sleep. *)
- super#sleep ;
- begin try
-@@ -213,16 +212,6 @@
- done
- with e -> Mutex.unlock qlock ; if e <> Queue.Empty then raise e end
-
-- (** This method should be called whenever the feeding task has a new
-- * opportunity to feed the queue, in case it is sleeping. *)
-- method private notify_new_request =
-- (* Don't wake up the task while we're trying to shut down,
-- * it could avoid its death and run forever in the wild. *)
-- if Tutils.mutexify state_lock (fun () -> state) () = `Running then
-- match task with
-- | Some task -> Duppy.Async.wake_up task
-- | None -> ()
--
- (** A function that returns delays for tasks, making sure that these tasks
- * don't repeat too fast.
- * The current scheme is to return 0. as long as there are no more than
-@@ -242,33 +231,23 @@
- next
-
- (** The body of the feeding task *)
-- method private feed_queue () : unit =
-- (* If the test fails, the task sleeps. *)
-- if
-- Tutils.mutexify state_lock
-- (fun () ->
-- if state <> `Tired then true else begin
-- state <- `Sleeping ;
-- Condition.signal state_cond ;
-- false
-- end) ()
-- then
-- if queue_length < min_queue_length then
-+ method private feed_queue reload =
-+ (fun _ ->
-+ if !reload && queue_length < min_queue_length then
- match self#prefetch with
- | Finished ->
-- Duppy.Task.add Tutils.scheduler
-- { Duppy.Task.
-- priority = priority ;
-- events = [`Delay 0.] ;
-- handler = (fun _ -> self#feed_queue (); []) }
-+ [{ Duppy.Task.
-+ priority = priority ;
-+ events = [`Delay 0.] ;
-+ handler = self#feed_queue reload }]
- | Retry ->
- (* Reschedule the task later *)
-- Duppy.Task.add Tutils.scheduler
-- { Duppy.Task.
-- priority = priority ;
-- events = [`Delay (adaptative_delay ())] ;
-- handler = (fun _ -> self#feed_queue (); []) }
-- | Empty -> ()
-+ [{ Duppy.Task.
-+ priority = priority ;
-+ events = [`Delay (adaptative_delay ())] ;
-+ handler = self#feed_queue reload }]
-+ | Empty -> []
-+ else [])
-
- (** Try to feed the queue with a new request.
- * Return false if there was no new request to try,
-@@ -319,7 +298,7 @@
- None
- in
- Mutex.unlock qlock ;
-- self#notify_new_request ;
-+ self#create_task ;
- ans
-
- method copy_queue =
-Index: liquidsoap/src/sources/request_source.mli
-===================================================================
---- liquidsoap.orig/src/sources/request_source.mli 2009-04-02 11:47:59.000000000 +0200
-+++ liquidsoap/src/sources/request_source.mli 2009-06-11 02:15:52.000000000 +0200
-@@ -44,9 +44,9 @@
- (** You should only define this. *)
- method virtual get_next_request : Request.audio Request.t option
-
-- (** This method should be called whenever the feeding task gets
-+ (** This method should be called whenever the source gets
- * a new opportunity to add more data into the queue. *)
-- method private notify_new_request : unit
-+ method private create_task : unit
-
- inherit unqueued
-
-Index: liquidsoap/src/sources/req_queue.ml
-===================================================================
---- liquidsoap.orig/src/sources/req_queue.ml 2009-04-02 11:47:59.000000000 +0200
-+++ liquidsoap/src/sources/req_queue.ml 2009-06-11 02:15:52.000000000 +0200
-@@ -79,7 +79,7 @@
- (string_of_int (Queue.length requests)) ;
- Request.set_root_metadata req "queue" "secondary" ;
- Mutex.unlock reqlock ;
-- self#notify_new_request
-+ self#create_task
-
- method copy_queue_init q =
- Mutex.lock reqlock ;
-Index: liquidsoap/src/sources/req_equeue.ml
-===================================================================
---- liquidsoap.orig/src/sources/req_equeue.ml 2009-04-02 11:47:59.000000000 +0200
-+++ liquidsoap/src/sources/req_equeue.ml 2009-06-11 02:15:52.000000000 +0200
-@@ -64,7 +64,7 @@
- f req ;
- Request.add_log req "Entering the secondary queue." ;
- Request.set_root_metadata req "queue" "secondary" ;
-- self#notify_new_request ;
-+ self#create_task ;
- (string_of_int (Request.get_id req))
- | None -> "Unable to create a request!"
- in
-Index: liquidsoap/src/sources/playlist.ml
-===================================================================
---- liquidsoap.orig/src/sources/playlist.ml 2009-04-02 11:47:59.000000000 +0200
-+++ liquidsoap/src/sources/playlist.ml 2009-06-11 02:15:52.000000000 +0200
-@@ -379,7 +379,7 @@
-
- method reload_playlist_internal a b c =
- pl#reload_playlist_internal a b c ;
-- super#notify_new_request
-+ super#create_task
-
- method wake_up activation =
- (* The queued request source should be prepared first,
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index e8e62e9..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,3 +0,0 @@
-fix_math_h_usage.patch
-fix_append.patch
-fix_req_task.patch
diff --git a/debian/rules b/debian/rules
index 30d6100..dd70487 100755
--- a/debian/rules
+++ b/debian/rules
@@ -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/patchsys-quilt.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
--
liquidsoap packaging
More information about the Pkg-ocaml-maint-commits
mailing list