[Pkg-ocaml-maint-commits] r5767 - in /trunk/packages/liquidsoap/trunk/debian: changelog control control.in liquidsoap.install patches/ patches/fix_parameter_doc.patch patches/fix_vorbis_mono_output.patch patches/series rules
toots at users.alioth.debian.org
toots at users.alioth.debian.org
Sun Jun 15 12:53:23 UTC 2008
Author: toots
Date: Sun Jun 15 12:53:23 2008
New Revision: 5767
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=5767
Log:
Install logrotate, several backported fixes..
Added:
trunk/packages/liquidsoap/trunk/debian/patches/
trunk/packages/liquidsoap/trunk/debian/patches/fix_parameter_doc.patch
trunk/packages/liquidsoap/trunk/debian/patches/fix_vorbis_mono_output.patch
trunk/packages/liquidsoap/trunk/debian/patches/series
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/liquidsoap.install
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=5767&op=diff
==============================================================================
--- trunk/packages/liquidsoap/trunk/debian/changelog (original)
+++ trunk/packages/liquidsoap/trunk/debian/changelog Sun Jun 15 12:53:23 2008
@@ -1,7 +1,11 @@
-liquidsoap (0.3.7-2) UNRELEASED; urgency=low
+liquidsoap (0.3.7-2) unstable; urgency=low
* Install /usr/share/liquidsoap directory, needed for
liquidsoap user.
+ * Install logrotate file
+ * Backported several fixes from upstream:
+ + Fix vorbis mono output
+ + Fix parameter order in documentation
-- Romain Beauxis <toots at rastageeks.org> Thu, 12 Jun 2008 13:47:16 +0200
Modified: trunk/packages/liquidsoap/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/liquidsoap/trunk/debian/control?rev=5767&op=diff
==============================================================================
--- trunk/packages/liquidsoap/trunk/debian/control (original)
+++ trunk/packages/liquidsoap/trunk/debian/control Sun Jun 15 12:53:23 2008
@@ -3,7 +3,7 @@
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: cdbs (>= 0.4.23-1.1), debhelper (>= 4.2.0),
+Build-Depends: debhelper (>= 4.2.0), quilt, patchutils (>= 0.2.25), cdbs (>= 0.4.27),
ocaml-nox, ocaml-findlib, libshout-ocaml-dev,
libogg-ocaml-dev (>= 0.1.1), libvorbis-ocaml-dev (>= 0.4.0),
libmad-ocaml-dev (>= 0.3.4), libdtools-ocaml-dev (>= 0.1.4), libtaglib-ocaml-dev,
@@ -21,6 +21,7 @@
Package: liquidsoap
Architecture: any
Depends: ${shlibs:Depends}, libcamomile-ocaml-data, wget, adduser
+Recommends: logrotate
Suggests: icecast2, festival, liguidsoap
Description: audio streaming language
Liquidsoap is a powerful tool for building complex audio streaming systems,
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=5767&op=diff
==============================================================================
--- trunk/packages/liquidsoap/trunk/debian/control.in (original)
+++ trunk/packages/liquidsoap/trunk/debian/control.in Sun Jun 15 12:53:23 2008
@@ -21,6 +21,7 @@
Package: liquidsoap
Architecture: any
Depends: ${shlibs:Depends}, libcamomile-ocaml-data, wget, adduser
+Recommends: logrotate
Suggests: icecast2, festival, liguidsoap
Description: audio streaming language
Liquidsoap is a powerful tool for building complex audio streaming systems,
Modified: trunk/packages/liquidsoap/trunk/debian/liquidsoap.install
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/liquidsoap/trunk/debian/liquidsoap.install?rev=5767&op=diff
==============================================================================
--- trunk/packages/liquidsoap/trunk/debian/liquidsoap.install (original)
+++ trunk/packages/liquidsoap/trunk/debian/liquidsoap.install Sun Jun 15 12:53:23 2008
@@ -1,3 +1,4 @@
debian/tmp/usr/bin/liquidsoap
debian/tmp/usr/lib/liquidsoap
+debian/tmp/etc/logrotate.d/liquidsoap
examples/radio.liq etc/liquidsoap
Added: trunk/packages/liquidsoap/trunk/debian/patches/fix_parameter_doc.patch
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/liquidsoap/trunk/debian/patches/fix_parameter_doc.patch?rev=5767&op=file
==============================================================================
--- trunk/packages/liquidsoap/trunk/debian/patches/fix_parameter_doc.patch (added)
+++ trunk/packages/liquidsoap/trunk/debian/patches/fix_parameter_doc.patch Sun Jun 15 12:53:23 2008
@@ -1,0 +1,53 @@
+Index: liquidsoap-0.3.7/scripts/utils.liq
+===================================================================
+--- liquidsoap-0.3.7.orig/scripts/utils.liq 2008-06-03 01:41:03.000000000 +0200
++++ liquidsoap-0.3.7/scripts/utils.liq 2008-06-15 14:47:06.000000000 +0200
+@@ -15,8 +15,8 @@
+
+ # Alias for the <code>l[k]</code> notation.
+ # @category List
+-# @param a Key to look for
+ # @param l List of pairs (key,value)
++# @param a Key to look for
+ def list.assoc(a,l)
+ l[a]
+ end
+@@ -24,8 +24,8 @@
+ # list.mem_assoc(key,l) returns true if l contains a pair
+ # (key,value)
+ # @category List
+-# @param a Key to look for
+ # @param l List of pairs (key,value)
++# @param a Key to look for
+ def list.mem_assoc(a,l)
+ v = list.assoc(a,l)
+ # We check for existence, since "" may indicate
+@@ -35,8 +35,8 @@
+
+ # Remove a pair from an associative list
+ # @category List
+-# @param a Key of pair to be removed
+ # @param l List of pairs (key,value)
++# @param a Key of pair to be removed
+ def list.remove_assoc(a,l)
+ list.remove((a,list.assoc(a,l)),l)
+ end
+@@ -125,15 +125,15 @@
+ # Special track insensitive fallback that
+ # always skip current song before switching.
+ # @category Source / Track Processing
+-# @param s The input source
++# @param ~input The input source
+ # @param f The fallback source
+-def fallback.skip(s,f)
++def fallback.skip(~input,f)
+ def transition(a,b) =
+ source.skip(a)
+ # This eats the last remaining frame from a
+ sequence([a,b])
+ end
+- fallback(track_sensitive=false,transitions=[transition,transition],[s,f])
++ fallback(track_sensitive=false,transitions=[transition,transition],[input,f])
+ end
+
+ # Compress and normalize, producing a more uniform and "full" sound.
Added: trunk/packages/liquidsoap/trunk/debian/patches/fix_vorbis_mono_output.patch
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/liquidsoap/trunk/debian/patches/fix_vorbis_mono_output.patch?rev=5767&op=file
==============================================================================
--- trunk/packages/liquidsoap/trunk/debian/patches/fix_vorbis_mono_output.patch (added)
+++ trunk/packages/liquidsoap/trunk/debian/patches/fix_vorbis_mono_output.patch Sun Jun 15 12:53:23 2008
@@ -1,0 +1,95 @@
+Index: liquidsoap-0.3.7/src/outputs/vorbis_encoded.ml
+===================================================================
+--- liquidsoap-0.3.7.orig/src/outputs/vorbis_encoded.ml 2008-06-15 14:46:33.000000000 +0200
++++ liquidsoap-0.3.7/src/outputs/vorbis_encoded.ml 2008-06-15 14:47:07.000000000 +0200
+@@ -77,7 +77,7 @@
+ | None -> self#new_os e ;
+ Utils.get_some _os
+
+- method virtual new_encoder : Vorbis.Encoder.t
++ method virtual new_encoder : bool -> Vorbis.Encoder.t
+
+ method reset_encoder encoder m =
+ let get h k =
+@@ -100,7 +100,7 @@
+ | None -> "Unknown"
+ in
+ let flushed = self#end_of_os (Some encoder) in
+- let encoder = self#new_encoder in
++ let encoder = self#new_encoder stereo in
+ self#new_os
+ ~tags:(Some (Vorbis.tags
+ ?title:(getd m "title" def_title)
+@@ -117,7 +117,11 @@
+ let b =
+ if stereo then b else begin
+ for i = start to start+len-1 do
+- tmp.(0).(i) <- (b.(0).(i) +. b.(1).(i)) /. 2.
++ let n = Fmt.channels () in
++ let f i =
++ Array.fold_left (fun x y -> x +. y.(i)) 0. b
++ in
++ tmp.(0).(i) <- f i /. (float_of_int n)
+ done ;
+ tmp
+ end
+@@ -152,14 +156,16 @@
+ ~append ~perm ~dir_perm filename as to_file
+ inherit base freq stereo as base
+
+- method new_encoder =
++ method new_encoder stereo =
++ let channels =
++ if not stereo then 1 else Fmt.channels () in
+ let enc =
+ (* TODO: log message when the creation of the encoder fails *)
+ let nom,min,max = bitrate in
+ match mode with
+ | ABR
+- | CBR -> Vorbis.Encoder.create (Fmt.channels ()) freq max nom min
+- | VBR -> Vorbis.Encoder.create_vbr (Fmt.channels ()) freq quality
++ | CBR -> Vorbis.Encoder.create channels freq max nom min
++ | VBR -> Vorbis.Encoder.create_vbr channels freq quality
+ in
+ encoder <- Some enc ;
+ enc
+@@ -170,7 +176,7 @@
+ base#reset_encoder enc m
+
+ method output_start =
+- ignore(self#new_encoder) ;
++ ignore(self#new_encoder stereo) ;
+ to_file#file_output_start
+
+ method output_stop =
+Index: liquidsoap-0.3.7/src/outputs/vorbis_encoded_shout.ml
+===================================================================
+--- liquidsoap-0.3.7.orig/src/outputs/vorbis_encoded_shout.ml 2008-06-15 14:46:33.000000000 +0200
++++ liquidsoap-0.3.7/src/outputs/vorbis_encoded_shout.ml 2008-06-15 14:47:07.000000000 +0200
+@@ -96,20 +96,22 @@
+ ~bitrate:ibitrate ~mount ~name ~source p as super
+ inherit base freq stereo as base
+
+- method new_encoder =
++ method new_encoder stereo =
++ let channels =
++ if not stereo then 1 else Fmt.channels () in
+ let enc =
+ (* TODO: log message when the creation of the encoder fails *)
+ match mode with
+ | ABR
+- | CBR -> Vorbis.Encoder.create (Fmt.channels ()) freq
++ | CBR -> Vorbis.Encoder.create channels freq
+ (max_bitrate) (bitrate) (min_bitrate)(* max nom min *)
+- | VBR -> Vorbis.Encoder.create_vbr (Fmt.channels ()) freq quality
++ | VBR -> Vorbis.Encoder.create_vbr channels freq quality
+ in
+ encoder <- Some enc;
+ enc
+
+ method output_start =
+- ignore(self#new_encoder) ;
++ ignore(self#new_encoder stereo) ;
+ super#output_start
+
+ method output_stop =
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=5767&op=file
==============================================================================
--- trunk/packages/liquidsoap/trunk/debian/patches/series (added)
+++ trunk/packages/liquidsoap/trunk/debian/patches/series Sun Jun 15 12:53:23 2008
@@ -1,0 +1,2 @@
+fix_parameter_doc.patch
+fix_vorbis_mono_output.patch
Modified: trunk/packages/liquidsoap/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/liquidsoap/trunk/debian/rules?rev=5767&op=diff
==============================================================================
--- trunk/packages/liquidsoap/trunk/debian/rules (original)
+++ trunk/packages/liquidsoap/trunk/debian/rules Sun Jun 15 12:53:23 2008
@@ -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
More information about the Pkg-ocaml-maint-commits
mailing list