[Python-apps-commits] r13510 - in packages/puddletag/trunk/debian (4 files)

[morph at users.alioth.debian.org]

    Date: Sunday, August 14, 2016 @ 18:05:51
  Author: morph
Revision: 13510

* debian/patches/88a3ad2e3a46c549dc03a408fab2813d02c0ea58.patch
  - support an updated python-mutagen; Closes: #833910

Added:
  packages/puddletag/trunk/debian/patches/
  packages/puddletag/trunk/debian/patches/88a3ad2e3a46c549dc03a408fab2813d02c0ea58.patch
  packages/puddletag/trunk/debian/patches/series
Modified:
  packages/puddletag/trunk/debian/changelog

Modified: packages/puddletag/trunk/debian/changelog
===================================================================
--- packages/puddletag/trunk/debian/changelog	2016-08-14 16:30:41 UTC (rev 13509)
+++ packages/puddletag/trunk/debian/changelog	2016-08-14 18:05:51 UTC (rev 13510)
@@ -1,3 +1,10 @@
+puddletag (1.1.1-2) UNRELEASED; urgency=medium
+
+  * debian/patches/88a3ad2e3a46c549dc03a408fab2813d02c0ea58.patch
+    - support an updated python-mutagen; Closes: #833910
+
+ -- Sandro Tosi <morph at debian.org>  Sun, 14 Aug 2016 19:05:27 +0100
+
 puddletag (1.1.1-1) unstable; urgency=medium
 
   * New upstream release

Added: packages/puddletag/trunk/debian/patches/88a3ad2e3a46c549dc03a408fab2813d02c0ea58.patch
===================================================================
--- packages/puddletag/trunk/debian/patches/88a3ad2e3a46c549dc03a408fab2813d02c0ea58.patch	                        (rev 0)
+++ packages/puddletag/trunk/debian/patches/88a3ad2e3a46c549dc03a408fab2813d02c0ea58.patch	2016-08-14 18:05:51 UTC (rev 13510)
@@ -0,0 +1,50 @@
+From 580094a58b542b094bdb532aee2c6c0c45961b1f Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=E8=B0=A2=E4=B8=9C=E5=B9=B3=20=28XIE=20Dongping=29?=
+ <dongping.xie.tud at gmail.com>
+Date: Wed, 11 May 2016 22:58:46 +0200
+Subject: [PATCH 1/2] Add CJK Encoding for Encoding Conversion Function
+
+Added encoding support for Chinese, Japanese and Korean
+---
+ source/puddlestuff/functions.py | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/source/puddlestuff/functions.py b/source/puddlestuff/functions.py
+index 265aac5..2c7909d 100755
+--- a/source/puddlestuff/functions.py
++++ b/source/puddlestuff/functions.py
+@@ -165,7 +165,8 @@ def eql(text, text1):
+ # Contributed by Stjujsckij Nickolaj
+ def enconvert(text, enc_name):
+     ''' Convert from non-standard encoding, "Convert to encoding: $0, Encoding: $1"
+-&Encoding, combo, cp1250, cp1251, cp1252, cp1253, cp1254, cp1255, cp1256, cp1257, cp1258'''
++&Encoding, combo, cp1250, cp1251, cp1252, cp1253, cp1254, cp1255, cp1256, cp1257, cp1258,\
++euc_jp, cp932, euc_jis_2004, shift_jis, johab, big5, big5hkscs, gb2312, gb18030, gbk, hz'''
+     return text.encode("latin1", 'replace').decode(enc_name, 'replace')
+ 
+ def filenametotag(m_tags, p_pattern):
+
+From 6fd73f9d3442c729a771d160430bd44fb003eb69 Mon Sep 17 00:00:00 2001
+From: b_b <brunobergot at gmail.com>
+Date: Wed, 27 Jul 2016 11:27:14 +0200
+Subject: [PATCH 2/2] Fix for BitPaddedInt import error
+
+This one fix an import error i get with latest python-mutagen 1.34.999+1301~0c8997f-0~ppa0~trusty from https://launchpad.net/~lazka/+archive/ubuntu/dumpingplace
+---
+ source/puddlestuff/audioinfo/_compatid3.py | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/source/puddlestuff/audioinfo/_compatid3.py b/source/puddlestuff/audioinfo/_compatid3.py
+index 7d73e27..a7a599f 100644
+--- a/source/puddlestuff/audioinfo/_compatid3.py
++++ b/source/puddlestuff/audioinfo/_compatid3.py
+@@ -23,7 +23,8 @@
+ import mutagen
+ from mutagen._util import insert_bytes
+ from mutagen.id3 import ID3, Frame, Frames, Frames_2_2, TextFrame, TORY, \
+-    TYER, TIME, APIC, IPLS, TDAT, BitPaddedInt, MakeID3v1
++    TYER, TIME, APIC, IPLS, TDAT, MakeID3v1
++from mutagen.id3._util import BitPaddedInt
+ 
+ SEPARATOR = ' / '
+ 

Added: packages/puddletag/trunk/debian/patches/series
===================================================================
--- packages/puddletag/trunk/debian/patches/series	                        (rev 0)
+++ packages/puddletag/trunk/debian/patches/series	2016-08-14 18:05:51 UTC (rev 13510)
@@ -0,0 +1 @@
+88a3ad2e3a46c549dc03a408fab2813d02c0ea58.patch