[Pkg-ocaml-maint-commits] [SCM] liquidsoap packaging branch, master, updated. debian/0.9.2-3-4-g05073e4

[Romain Beauxis]

The following commit has been merged in the master branch:
commit 05073e48b5ee2e2ceb05e8360fab752cfe59dd56
Author: Romain Beauxis <toots at rastageeks.org>
Date:   Tue Aug 3 10:33:39 2010 -0500

    Added audio/mpegurl mime patch

diff --git a/debian/patches/add_mpeg_url_to_playlists.patch b/debian/patches/add_mpeg_url_to_playlists.patch
new file mode 100644
index 0000000..97ca201
--- /dev/null
+++ b/debian/patches/add_mpeg_url_to_playlists.patch
@@ -0,0 +1,11 @@
+Index: liquidsoap/src/playlists/playlist_basic.ml
+===================================================================
+--- liquidsoap.orig/src/playlists/playlist_basic.ml	2009-10-30 15:35:23.000000000 -0500
++++ liquidsoap/src/playlists/playlist_basic.ml	2010-08-03 10:32:38.000000000 -0500
+@@ -70,4 +70,5 @@
+ 
+ let () =
+   Playlist_parser.parsers#register "audio/x-scpls" { Playlist_parser.strict = true; Playlist_parser.parser = parse_scpls } ;
+-  Playlist_parser.parsers#register "audio/x-mpegurl" { Playlist_parser.strict = false; Playlist_parser.parser = parse_mpegurl }
++  Playlist_parser.parsers#register "audio/x-mpegurl" { Playlist_parser.strict = false; Playlist_parser.parser = parse_mpegurl } ;
++  Playlist_parser.parsers#register "audio/mpegurl" { Playlist_parser.strict = false; Playlist_parser.parser = parse_mpegurl }
diff --git a/debian/patches/fix_harbor_get_args.patch b/debian/patches/fix_harbor_get_args.patch
index 756e33b..5e526c4 100644
--- a/debian/patches/fix_harbor_get_args.patch
+++ b/debian/patches/fix_harbor_get_args.patch
@@ -1,8 +1,8 @@
 Index: liquidsoap/src/tools/harbor.ml
 ===================================================================
---- liquidsoap.orig/src/tools/harbor.ml	2009-10-30 15:35:23.000000000 -0500
-+++ liquidsoap/src/tools/harbor.ml	2010-06-10 13:09:30.000000000 -0500
-@@ -391,7 +391,15 @@
+--- liquidsoap.orig/src/tools/harbor.ml	2010-08-03 10:33:02.000000000 -0500
++++ liquidsoap/src/tools/harbor.ml	2010-08-03 10:33:07.000000000 -0500
+@@ -405,7 +405,15 @@
      | Not_found -> uri,""
    in
    log#f 3 "GET request on %s." base_uri ;
diff --git a/debian/patches/series b/debian/patches/series
index d2637b5..e71d869 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
+add_mpeg_url_to_playlists.patch
 harbor_recode_tags.patch
 magic_follow_symlink.patch
 fix_sdl_output.patch

-- 
liquidsoap packaging