diff -Nru subdownloader-2.0.14/debian/changelog subdownloader-2.0.14/debian/changelog --- subdownloader-2.0.14/debian/changelog 2013-06-15 00:14:04.000000000 +0000 +++ subdownloader-2.0.14/debian/changelog 2012-11-10 11:43:16.000000000 +0000 @@ -1,3 +1,14 @@ +subdownloader (2.0.14-1.1) unstable; urgency=low + + * Non-maintainer upload. + * debian/patches/fix-non-ascii-download-path.patch: + + Fix downloading subtitles in folders containing non-ASCII characters + (Closes: #606993), (LP: #913453, #306589) + * debian/source/format: + Update to "3.0 (quilt)" to apply the previous patch in a proper way + + -- Emilien Klein Sat, 10 Nov 2012 12:43:07 +0100 + subdownloader (2.0.14-1) unstable; urgency=low * New upstream version. diff -Nru subdownloader-2.0.14/debian/patches/fix-non-ascii-download-path.patch subdownloader-2.0.14/debian/patches/fix-non-ascii-download-path.patch --- subdownloader-2.0.14/debian/patches/fix-non-ascii-download-path.patch 1970-01-01 00:00:00.000000000 +0000 +++ subdownloader-2.0.14/debian/patches/fix-non-ascii-download-path.patch 2012-11-09 20:31:45.000000000 +0000 @@ -0,0 +1,19 @@ +From: Emilien Klein +Subject: Fix downloading subtitles in folders containing non-ASCII characters + +* gui/main.py: Remove call to .decode() + +Origin: upstream, http://bazaar.launchpad.net/~subdownloader-developers/subdownloader/trunk/revision/552 +Bug: https://bugs.launchpad.net/subdownloader/+bug/913453 +Bug-Debian: http://bugs.debian.org/606993 +--- a/gui/main.py ++++ b/gui/main.py +@@ -1009,7 +1009,7 @@ + folderPath = video.getFolderPath() + dir = QDir(QString(folderPath)) + #downloadFullPath = dir.filePath(QString(subFileName)).__str__() +- downloadFullPath = os.path.join(folderPath, subFileName).decode('utf8') ++ downloadFullPath = os.path.join(folderPath, subFileName) + log.debug("Downloading to: %r"% downloadFullPath) + elif optionWhereToDownload == QVariant("PREDEFINED_FOLDER"): + folderPath = settings.value("options/whereToDownloadFolder", QVariant("")).toString() diff -Nru subdownloader-2.0.14/debian/patches/series subdownloader-2.0.14/debian/patches/series --- subdownloader-2.0.14/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 +++ subdownloader-2.0.14/debian/patches/series 2012-11-09 19:23:25.000000000 +0000 @@ -0,0 +1 @@ +fix-non-ascii-download-path.patch diff -Nru subdownloader-2.0.14/debian/source/format subdownloader-2.0.14/debian/source/format --- subdownloader-2.0.14/debian/source/format 2013-06-15 00:14:04.000000000 +0000 +++ subdownloader-2.0.14/debian/source/format 2013-06-15 00:14:04.886466243 +0000 @@ -1 +1 @@ -1.0 +3.0 (quilt)