light-locker-settings

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

  1. light-locker-settings
  2. Merge into trunk
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
1=== modified file 'debian/rules'
2--- debian/rules 2014-03-12 11:22:57 +0000
3+++ debian/rules 2020-01-29 09:59:56 +0000
4@@ -6,10 +6,10 @@
5 DESTDIR := ${CURDIR}/debian/light-locker-settings
6
7 %:
8- dh $@ --with python2
9+ dh $@ --with python3
10
11 override_dh_auto_configure:
12- ./configure --prefix=/usr
13+ ./configure --prefix=/usr --python=python3
14
15 override_dh_auto_install:
16 dh_auto_install
17
18=== modified file 'light-locker-settings/light-locker-settings.py'
19--- light-locker-settings/light-locker-settings.py 2016-05-14 01:24:41 +0000
20+++ light-locker-settings/light-locker-settings.py 2020-01-29 09:59:56 +0000
21@@ -26,6 +26,7 @@
22 import shlex
23 import os
24 import subprocess
25+gi.require_version('Gtk', '3.0')
26 from gi.repository import Gtk, GLib, Gio
27
28 import psutil

Subscribers

People subscribed via source and target branches