[Python-apps-commits] r11403 - in packages/subdownloader/trunk/debian (7 files)

[e2jk-guest at users.alioth.debian.org]

    Date: Sunday, October 12, 2014 @ 17:42:14
  Author: e2jk-guest
Revision: 11403

Import debian source package into SVN for released version 2.0.14-1.1

Added:
  packages/subdownloader/trunk/debian/patches/
  packages/subdownloader/trunk/debian/patches/fix-non-ascii-download-path.patch
  packages/subdownloader/trunk/debian/patches/series
Modified:
  packages/subdownloader/trunk/debian/changelog
  packages/subdownloader/trunk/debian/control
  packages/subdownloader/trunk/debian/source/format
  packages/subdownloader/trunk/debian/watch

Modified: packages/subdownloader/trunk/debian/changelog
===================================================================
--- packages/subdownloader/trunk/debian/changelog	2014-10-11 07:09:12 UTC (rev 11402)
+++ packages/subdownloader/trunk/debian/changelog	2014-10-12 17:42:14 UTC (rev 11403)
@@ -1,9 +1,13 @@
-subdownloader (2.0.14-2) UNRELEASED; urgency=low
+subdownloader (2.0.14-1.1) unstable; urgency=low
 
-  * Use canonical URIs for Vcs-* fields.
-  * Fix watch file.
+  * 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
 
- -- Jakub Wilk <jwilk at debian.org>  Mon, 27 May 2013 21:05:46 +0200
+ -- Emilien Klein <emilien+debian at klein.st>  Sat, 10 Nov 2012 12:43:07 +0100
 
 subdownloader (2.0.14-1) unstable; urgency=low
 

Modified: packages/subdownloader/trunk/debian/control
===================================================================
--- packages/subdownloader/trunk/debian/control	2014-10-11 07:09:12 UTC (rev 11402)
+++ packages/subdownloader/trunk/debian/control	2014-10-12 17:42:14 UTC (rev 11403)
@@ -6,8 +6,8 @@
 Build-Depends: debhelper (>= 7), python (>= 2.5.2-3)
 Build-Depends-Indep: python-support (>= 0.5.6), pyqt4-dev-tools
 Standards-Version: 3.9.1
-Vcs-Svn: svn://anonscm.debian.org/python-apps/packages/subdownloader/trunk/
-Vcs-Browser: http://anonscm.debian.org/viewvc/python-apps/packages/subdownloader/trunk/
+Vcs-Svn: svn://svn.debian.org/python-apps/packages/subdownloader/trunk
+Vcs-Browser: http://svn.debian.org/viewsvn/python-apps/packages/subdownloader/trunk/
 XS-Python-Version: >= 2.5
 Homepage: http://www.subdownloader.net/
 

Added: packages/subdownloader/trunk/debian/patches/fix-non-ascii-download-path.patch
===================================================================
--- packages/subdownloader/trunk/debian/patches/fix-non-ascii-download-path.patch	                        (rev 0)
+++ packages/subdownloader/trunk/debian/patches/fix-non-ascii-download-path.patch	2014-10-12 17:42:14 UTC (rev 11403)
@@ -0,0 +1,19 @@
+From: Emilien Klein <emilien+debian at klein.st>
+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()

Added: packages/subdownloader/trunk/debian/patches/series
===================================================================
--- packages/subdownloader/trunk/debian/patches/series	                        (rev 0)
+++ packages/subdownloader/trunk/debian/patches/series	2014-10-12 17:42:14 UTC (rev 11403)
@@ -0,0 +1 @@
+fix-non-ascii-download-path.patch

Modified: packages/subdownloader/trunk/debian/source/format
===================================================================
--- packages/subdownloader/trunk/debian/source/format	2014-10-11 07:09:12 UTC (rev 11402)
+++ packages/subdownloader/trunk/debian/source/format	2014-10-12 17:42:14 UTC (rev 11403)
@@ -1 +1 @@
-1.0
+3.0 (quilt)

Modified: packages/subdownloader/trunk/debian/watch
===================================================================
--- packages/subdownloader/trunk/debian/watch	2014-10-11 07:09:12 UTC (rev 11402)
+++ packages/subdownloader/trunk/debian/watch	2014-10-12 17:42:14 UTC (rev 11403)
@@ -1,3 +1,3 @@
 version=3
 https://launchpad.net/subdownloader/+download \
-https://launchpad.net/subdownloader/(?:.*)/(?:.*)/\+download/subdownloader-(.*)\.tar\.gz
+http://launchpad.net/subdownloader/(?:.*)/(?:.*)/\+download/subdownloader-(.*)\.tar\.gz