Merge lp:~tintou/light-locker-settings/light-locker-settings into lp:light-locker-settings

Proposed by Corentin Noël
Status: Merged
Merged at revision: 168
Proposed branch: lp:~tintou/light-locker-settings/light-locker-settings
Merge into: lp:light-locker-settings
Diff against target: 28 lines (+3/-2)
2 files modified
debian/rules (+2/-2)
light-locker-settings/light-locker-settings.py (+1/-0)
To merge this branch: bzr merge lp:~tintou/light-locker-settings/light-locker-settings
Reviewer Review Type Date Requested Status
Light Locker Settings Team Pending
Review via email: mp+378231@code.launchpad.net

Description of the change

As it currently fails to launch on focal this fixes issues with python3 not being explicitly used

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/rules'
--- debian/rules 2014-03-12 11:22:57 +0000
+++ debian/rules 2020-01-29 09:59:56 +0000
@@ -6,10 +6,10 @@
6DESTDIR := ${CURDIR}/debian/light-locker-settings6DESTDIR := ${CURDIR}/debian/light-locker-settings
77
8%:8%:
9 dh $@ --with python29 dh $@ --with python3
1010
11override_dh_auto_configure:11override_dh_auto_configure:
12 ./configure --prefix=/usr12 ./configure --prefix=/usr --python=python3
1313
14override_dh_auto_install:14override_dh_auto_install:
15 dh_auto_install15 dh_auto_install
1616
=== modified file 'light-locker-settings/light-locker-settings.py'
--- light-locker-settings/light-locker-settings.py 2016-05-14 01:24:41 +0000
+++ light-locker-settings/light-locker-settings.py 2020-01-29 09:59:56 +0000
@@ -26,6 +26,7 @@
26import shlex26import shlex
27import os27import os
28import subprocess28import subprocess
29gi.require_version('Gtk', '3.0')
29from gi.repository import Gtk, GLib, Gio30from gi.repository import Gtk, GLib, Gio
3031
31import psutil32import psutil

Subscribers

People subscribed via source and target branches