Merge lp:~khurshid-alam/unity-scope-calculator/fix-build-disco into lp:unity-scope-calculator

Proposed by Khurshid Alam
Status: Approved
Approved by: Marco Trevisan (Treviño)
Approved revision: 45
Proposed branch: lp:~khurshid-alam/unity-scope-calculator/fix-build-disco
Merge into: lp:unity-scope-calculator
Diff against target: 24 lines (+2/-1)
2 files modified
debian/control (+1/-0)
tests/test_calculator.py (+1/-1)
To merge this branch: bzr merge lp:~khurshid-alam/unity-scope-calculator/fix-build-disco
Reviewer Review Type Date Requested Status
Sebastien Bacher (community) Approve
Marco Trevisan (Treviño) Pending
Review via email: mp+361411@code.launchpad.net

Commit message

Fix build for disco

* Fix Gicon regression. See https://gitlab.gnome.org/GNOME/glib/issues/1513
* Add dh-python to build depends

To post a comment you must log in.
Revision history for this message
Sebastien Bacher (seb128) wrote :

Looks fine, thanks

review: Approve

Unmerged revisions

45. By Khurshid Alam

Fix build for disco

* Fix Gicon regression. See https://gitlab.gnome.org/GNOME/glib/issues/1513
* Add dh-python to build depends

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/control'
2--- debian/control 2013-05-17 13:00:35 +0000
3+++ debian/control 2019-01-07 07:26:38 +0000
4@@ -3,6 +3,7 @@
5 Priority: optional
6 Maintainer: David Callé <davidc@framli.eu>
7 Build-Depends: debhelper (>= 9),
8+ dh-python,
9 python3,
10 python3-distutils-extra,
11 python3-gi,
12
13=== modified file 'tests/test_calculator.py'
14--- tests/test_calculator.py 2013-05-10 05:39:22 +0000
15+++ tests/test_calculator.py 2019-01-07 07:26:38 +0000
16@@ -79,7 +79,7 @@
17 self.assertEqual(preview.props.title, "3")
18 self.assertEqual(preview.props.subtitle, "1+2")
19 self.assertNotEqual(preview.props.image, None)
20- self.assertEqual(preview.props.image.get_names(), ['gnome-calculator'])
21+ self.assertEqual(preview.props.image.get_names(), ['gnome-calculator', 'gnome-calculator-symbolic'])
22
23 if __name__ == '__main__':
24 unittest.main()

Subscribers

People subscribed via source and target branches

to all changes: