[SCM] morituri/master: Fix encoding of non-ASCII HTOA track in .m3u

[lool at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 39ddd2e5f8d95c4fce8c8b482355c6345b75fdf9
Author: Loïc Minier <lool at dooz.org>
Date:   Wed Nov 10 00:52:23 2010 +0100

    Fix encoding of non-ASCII HTOA track in .m3u

diff --git a/debian/patches/1001_fix-non-ascii-htoa.patch b/debian/patches/1001_fix-non-ascii-htoa.patch
new file mode 100644
index 0000000..90a5523
--- /dev/null
+++ b/debian/patches/1001_fix-non-ascii-htoa.patch
@@ -0,0 +1,22 @@
+Description: Fix encoding of non-ASCII HTOA track in .m3u
+From: Loïc Minier <lool at dooz.org>
+Forwarded: yes
+Last-Update: 2010-10-10
+--- a/morituri/rip/cd.py
++++ b/morituri/rip/cd.py
+@@ -242,10 +242,12 @@
+         handle = open(m3uPath, 'w')
+         handle.write(u'#EXTM3U\n')
+         if htoapath:
+-            handle.write(u'#EXTINF:%d,%s\n' % (
++            u = u'#EXTINF:%d,%s\n' % (
+                 itable.getTrackStart(1) / common.FRAMES_PER_SECOND,
+-                    os.path.basename(htoapath[:-4])))
+-            handle.write(u'%s\n' % os.path.basename(htoapath))
++                    os.path.basename(htoapath[:-4]))
++            handle.write(u.encode('utf-8'))
++            u = u'%s\n' % os.path.basename(htoapath)
++            handle.write(u.encode('utf-8'))
+ 
+         for i, track in enumerate(itable.tracks):
+             if not track.audio:
diff --git a/debian/patches/series b/debian/patches/series
index 073d803..bf2287d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 0001_fix_support_non-utf-8_console.patch
+1001_fix-non-ascii-htoa.patch

-- 
morituri packaging