Bug#794836: sphinxcontrib-youtube: diff for NMU version 1.0-1.1

[Ondřej Nový]

Control: tags 938541 + patch


Dear maintainer,

I've prepared an NMU for sphinxcontrib-youtube (versioned as 1.0-1.1). The diff
is attached to this message.

Regards.

diff -Nru sphinxcontrib-youtube-1.0/debian/control 
sphinxcontrib-youtube-1.0/debian/control
--- sphinxcontrib-youtube-1.0/debian/control    2014-05-22 16:21:38.000000000 
+0200
+++ sphinxcontrib-youtube-1.0/debian/control    2019-10-27 20:14:58.000000000 
+0100
@@ -4,9 +4,6 @@
 Maintainer: Thomi Richards <thomi.richa...@canonical.com>
 Build-Depends: debhelper (>= 9.0.0),
                dh-python,
-               python-all (>= 2.6.6-3~),
-               python-setuptools,
-               python-setuptools,
                python3-all,
                python3-setuptools
 Standards-Version: 3.9.5
@@ -14,16 +11,6 @@
 X-Python3-Version: >= 3.2
 Homepage: http://bitbucket.org/birkenfeld/sphinx-contrib
 
-Package: python-sphinxcontrib.youtube
-Architecture: all
-Depends: ${python:Depends}, ${misc:Depends}
-Provides: ${python:Provides}
-Description: Sphinx "YouTube" extension
- This package contains the YouTube Sphinx extension. This extension enables
- you to insert YouTube videos in your Sphinx documents.
- .
- This is the Python 2 package.
-
 Package: python3-sphinxcontrib.youtube
 Architecture: all
 Depends: ${python3:Depends}, ${misc:Depends}
diff -Nru sphinxcontrib-youtube-1.0/debian/changelog 
sphinxcontrib-youtube-1.0/debian/changelog
--- sphinxcontrib-youtube-1.0/debian/changelog  2014-05-22 16:21:38.000000000 
+0200
+++ sphinxcontrib-youtube-1.0/debian/changelog  2019-10-27 20:16:04.000000000 
+0100
@@ -1,3 +1,11 @@
+sphinxcontrib-youtube (1.0-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Drop Python 2 support (Closes: #938541).
+  * Fix compatibility with Python 3 (Closes: #794836).
+
+ -- Ondřej Nový <on...@debian.org>  Sun, 27 Oct 2019 20:16:04 +0100
+
 sphinxcontrib-youtube (1.0-1) unstable; urgency=low
 
   * Initial release. Closes: #748912
diff -Nru sphinxcontrib-youtube-1.0/debian/patches/python3-fix.patch 
sphinxcontrib-youtube-1.0/debian/patches/python3-fix.patch
--- sphinxcontrib-youtube-1.0/debian/patches/python3-fix.patch  1970-01-01 
01:00:00.000000000 +0100
+++ sphinxcontrib-youtube-1.0/debian/patches/python3-fix.patch  2019-10-27 
20:16:04.000000000 +0100
@@ -0,0 +1,11 @@
+--- a/sphinxcontrib/youtube.py
++++ b/sphinxcontrib/youtube.py
+@@ -19,7 +19,7 @@
+     return int(m.group(1)), m.group(2) or "px"
+ 
+ def css(d):
+-    return "; ".join(sorted("%s: %s" % kv for kv in d.iteritems()))
++    return "; ".join(sorted("%s: %s" % kv for kv in d.items()))
+ 
+ class youtube(nodes.General, nodes.Element): pass
+ 
diff -Nru sphinxcontrib-youtube-1.0/debian/patches/series 
sphinxcontrib-youtube-1.0/debian/patches/series
--- sphinxcontrib-youtube-1.0/debian/patches/series     1970-01-01 
01:00:00.000000000 +0100
+++ sphinxcontrib-youtube-1.0/debian/patches/series     2019-10-27 
20:16:04.000000000 +0100
@@ -0,0 +1 @@
+python3-fix.patch
diff -Nru sphinxcontrib-youtube-1.0/debian/python-sphinxcontrib.youtube.docs 
sphinxcontrib-youtube-1.0/debian/python-sphinxcontrib.youtube.docs
--- sphinxcontrib-youtube-1.0/debian/python-sphinxcontrib.youtube.docs  
2014-05-22 16:21:38.000000000 +0200
+++ sphinxcontrib-youtube-1.0/debian/python-sphinxcontrib.youtube.docs  
1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-README.rst
\ Chybí znak konce řádku na konci souboru
diff -Nru sphinxcontrib-youtube-1.0/debian/rules 
sphinxcontrib-youtube-1.0/debian/rules
--- sphinxcontrib-youtube-1.0/debian/rules      2014-05-22 16:21:38.000000000 
+0200
+++ sphinxcontrib-youtube-1.0/debian/rules      2019-10-27 20:14:57.000000000 
+0100
@@ -7,7 +7,7 @@
 export PYBUILD_NAME=sphinxcontrib.youtube
 
 %:
-       dh $@ --with python2,python3 --buildsystem=pybuild
+       dh $@ --with python3 --buildsystem=pybuild
 
 get-orig-source:
        hg clone https://bitbucket.org/birkenfeld/sphinx-contrib