Merge lp:~vorlon/ubuntu-themes/trunk into lp:ubuntu-themes

[Steve Langasek]

ubuntu-themes needs to stop using python2 for building. I've pushed this change to the Ubuntu archive, please merge to your branch which I cannot push to.

=== modified file 'debian/changelog'
--- debian/changelog	2019-02-13 14:45:59 +0000
+++ debian/changelog	2019-11-14 18:32:13 +0000
@@ -1,3 +1,9 @@
+ubuntu-themes (19.04-0ubuntu2) focal; urgency=medium
+
+  * Move from using python to using python3.
+
+ -- Steve Langasek <[e-mail]>  Thu, 14 Nov 2019 10:17:18 -0800
+
 ubuntu-themes (19.04-0ubuntu1) disco; urgency=medium
 
   [ Khurshid Alam ]

=== modified file 'debian/control'
--- debian/control	2018-03-07 16:19:36 +0000
+++ debian/control	2019-11-14 18:32:13 +0000
@@ -5,7 +5,7 @@
 Build-Depends: debhelper (>= 10),
                gir1.2-rsvg-2.0,
                icon-naming-utils,
-               python,
+               python3,
                python3-gi-cairo,
                scour (>= 0.36)
 Standards-Version: 4.1.2

=== modified file 'scavenge.py'
--- scavenge.py	2012-12-11 09:58:35 +0000
+++ scavenge.py	2019-11-14 18:32:13 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # Copyright 2011 Canonical Ltd.  Distributed under the terms of the GNU GPLv3.
 # Combines multiple SVG files into a single SVG in batch mode
 # 2011-01-04 Mathieu Trudel-Lapierre <[e-mail]>
@@ -39,7 +39,7 @@
 
         # Pull-in '<svg>' tag, clear attributes and rename to '<g>'
         g = base.importNode(dom.getElementsByTagName("svg")[0], deep = True)
-        [g.removeAttribute(k) for k in g.attributes.keys() if k != 'id']
+        [g.removeAttribute(k) for k in list(g.attributes.keys()) if k != 'id']
         g.tagName = 'g'
 
         # Insert into first SVG with comments and spacing