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

[Romain Beauxis]

The following commit has been merged in the master branch:
commit a40b81b639230e606c8c3c9bb7c934e9bcc26db7
Author: Romain Beauxis <toots at rastageeks.org>
Date:   Fri Jul 30 21:45:22 2010 -0500

    Added charset argument support in harbor_recode_tags.patch

diff --git a/debian/patches/harbor_recode_tags.patch b/debian/patches/harbor_recode_tags.patch
index da7d61b..b52b413 100644
--- a/debian/patches/harbor_recode_tags.patch
+++ b/debian/patches/harbor_recode_tags.patch
@@ -1,14 +1,20 @@
 Index: liquidsoap/src/tools/harbor.ml
 ===================================================================
---- liquidsoap.orig/src/tools/harbor.ml	2010-06-10 13:09:41.000000000 -0500
-+++ liquidsoap/src/tools/harbor.ml	2010-07-26 16:46:00.000000000 -0500
-@@ -377,6 +377,14 @@
+--- liquidsoap.orig/src/tools/harbor.ml	2010-07-26 16:46:09.000000000 -0500
++++ liquidsoap/src/tools/harbor.ml	2010-07-30 21:44:42.000000000 -0500
+@@ -377,6 +377,20 @@
                in
                Hashtbl.remove args "mount";
                Hashtbl.remove args "mode";
++              let encoding = 
++                try
++                  Some (Hashtbl.find args "charset")
++                with
++                  | Not_found -> None
++              in
 +              (* Recode tags.. *)
 +              let f x y m = 
-+                let g = Configure.recode_tag in
++                let g = Configure.recode_tag ?encoding in
 +                Hashtbl.add m (g x) (g y) ; m
 +              in
 +              let args = 

-- 
liquidsoap packaging