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

Proposed by Steve Langasek
Status: Merged
Merged at revision: 632
Proposed branch: lp:~vorlon/ubuntu-themes/trunk
Merge into: lp:ubuntu-themes
Diff against target: 45 lines (+9/-3)
3 files modified
debian/changelog (+6/-0)
debian/control (+1/-1)
scavenge.py (+2/-2)
To merge this branch: bzr merge lp:~vorlon/ubuntu-themes/trunk
Reviewer Review Type Date Requested Status
Ubuntu Artwork Packagers Pending
Review via email: mp+375565@code.launchpad.net

Description of the change

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.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
1ubuntu-themes (19.04-0ubuntu2) focal; urgency=medium
2
3 * Move from using python to using python3.
4
5 -- Steve Langasek <steve.langasek@ubuntu.com> Thu, 14 Nov 2019 10:17:18 -0800
6
1ubuntu-themes (19.04-0ubuntu1) disco; urgency=medium7ubuntu-themes (19.04-0ubuntu1) disco; urgency=medium
28
3 [ Khurshid Alam ]9 [ Khurshid Alam ]
410
=== 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 @@
5Build-Depends: debhelper (>= 10),5Build-Depends: debhelper (>= 10),
6 gir1.2-rsvg-2.0,6 gir1.2-rsvg-2.0,
7 icon-naming-utils,7 icon-naming-utils,
8 python,8 python3,
9 python3-gi-cairo,9 python3-gi-cairo,
10 scour (>= 0.36)10 scour (>= 0.36)
11Standards-Version: 4.1.211Standards-Version: 4.1.2
1212
=== 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 @@
1#!/usr/bin/env python1#!/usr/bin/env python3
2# Copyright 2011 Canonical Ltd. Distributed under the terms of the GNU GPLv3.2# Copyright 2011 Canonical Ltd. Distributed under the terms of the GNU GPLv3.
3# Combines multiple SVG files into a single SVG in batch mode3# Combines multiple SVG files into a single SVG in batch mode
4# 2011-01-04 Mathieu Trudel-Lapierre <mathieu.trudel-lapierre@canonical.com>4# 2011-01-04 Mathieu Trudel-Lapierre <mathieu.trudel-lapierre@canonical.com>
@@ -39,7 +39,7 @@
3939
40 # Pull-in '<svg>' tag, clear attributes and rename to '<g>'40 # Pull-in '<svg>' tag, clear attributes and rename to '<g>'
41 g = base.importNode(dom.getElementsByTagName("svg")[0], deep = True)41 g = base.importNode(dom.getElementsByTagName("svg")[0], deep = True)
42 [g.removeAttribute(k) for k in g.attributes.keys() if k != 'id']42 [g.removeAttribute(k) for k in list(g.attributes.keys()) if k != 'id']
43 g.tagName = 'g'43 g.tagName = 'g'
4444
45 # Insert into first SVG with comments and spacing45 # Insert into first SVG with comments and spacing

Subscribers

People subscribed via source and target branches