debian/0000775000000000000000000000000012344326401007167 5ustar debian/control0000664000000000000000000000134112320536102010564 0ustar Source: light-locker-settings Section: utils Priority: optional Maintainer: Ubuntu Developers XSBC-Original-Maintainer: Sean Davis Build-Depends: debhelper (>= 9), python (>= 2.6.6-3~), python-distutils-extra (>= 2.10) Standards-Version: 3.9.5 X-Python-Version: >= 2.6 Homepage: https://launchpad.net/light-locker-settings Package: light-locker-settings Architecture: all Depends: ${python:Depends}, ${misc:Depends}, gir1.2-glib-2.0, gir1.2-gtk-3.0, python-psutil, light-locker Description: simple configuration tool for light-locker light-locker-settings is a simple configuration utility that allows you to configure your screensaver and locking settings. debian/menu0000664000000000000000000000022412320536102010047 0ustar ?package(light-locker-settings):needs="X11" section="Applications/System/Security"\ title="light-locker-settings" command="light-locker-settings" debian/changelog0000664000000000000000000000275712344326401011054 0ustar light-locker-settings (1.2.1-0ubuntu1.1) trusty; urgency=medium * Add 01_xfpm_to_not_control_lock_on_suspend (LP: #1326741) -- Sean Davis Thu, 05 Jun 2014 23:26:41 -0400 light-locker-settings (1.2.1-0ubuntu1) trusty; urgency=medium * New upstream release. (LP: #1302484) - Fixes XFCE Power Manager setttings sync (LP: #1290737) -- Sean Davis Fri, 04 Apr 2014 06:46:52 -0400 light-locker-settings (1.2.0-0ubuntu1) trusty; urgency=medium * New upstream release. (LP: #1297058) -- Sean Davis Mon, 24 Mar 2014 22:31:55 -0400 light-locker-settings (1.0.1-0ubuntu2) trusty; urgency=medium * debian/control - Add python-psutil to Depends, it is now required in 1.0.1 (LP: #1291699) -- Sean Davis Wed, 12 Mar 2014 20:52:23 -0400 light-locker-settings (1.0.1-0ubuntu1) trusty; urgency=medium * New upstream release. (LP: #1291324) -- Sean Davis Wed, 12 Mar 2014 07:23:04 -0400 light-locker-settings (1.0.0-0ubuntu1) trusty; urgency=medium [ Sean Davis ] * Initial release (LP: #1281536) [ Iain Lane ] * Don't install INSTALL and COPYING.gz since these aren't useful for Debian packages - installation is handled by the package and license info is documented in the 'copyright' file. * Set Maintainer to Ubuntu Developers and Original Maintainer to Sean Davis. -- Sean Davis Wed, 19 Feb 2014 15:13:49 +0000 debian/source/0000775000000000000000000000000012320536102010462 5ustar debian/source/format0000664000000000000000000000001412320536102011670 0ustar 3.0 (quilt) debian/compat0000664000000000000000000000000112320536102010357 0ustar 9debian/patches/0000775000000000000000000000000012344326262010623 5ustar debian/patches/series0000664000000000000000000000005512344326262012040 0ustar 01_xfpm_to_not_control_lock_on_suspend.patch debian/patches/01_xfpm_to_not_control_lock_on_suspend.patch0000664000000000000000000000640012344326262021505 0ustar Description: Do not let xfpm or xfce4-session control lock on suspend There exists a conflict with lock-on-suspend being controlled by logind, xfce4-power-manager, and xfce4-session. This patch disables the latter 2 and toggles logind options in xfpm. Author: Sean Davis Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/xfce4-power-manager/+bug/1303736 --- This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ --- a/light-locker-settings/light-locker-settings.py +++ b/light-locker-settings/light-locker-settings.py @@ -245,11 +245,6 @@ screen_blank_timeout, screen_off_timeout = \ self.get_screen_blank_timeout() - # Replace settings with xfce4-session - if self.check_running_process("xfce4-session"): - session_sync = light_locker_xfsync.XfceSessionSync() - lock_on_suspend = session_sync.get_lock() - # Replace settings with xfce4-power-manager if self.check_running_process("xfce4-power-manager"): xfpm_sync = light_locker_xfsync.XfpmSync() @@ -456,9 +451,6 @@ session_sync = light_locker_xfsync.XfceSessionSync() session_sync.set_lock(lock_on_suspend) - # If xfce4-session manages locking, disable it for light-locker. - settings['lock-on-suspend'] = False - # If xfce4-power-manager is running, sync the DPMS settings. if self.check_running_process("xfce4-power-manager"): xfpm_sync = light_locker_xfsync.XfpmSync() @@ -467,9 +459,6 @@ xfpm_sync.set_dpms(screen_blank, screen_off) xfpm_sync.set_lock(lock_on_suspend) - # If xfpm manages locking, disable it for light-locker. - settings['lock-on-suspend'] = False - # Apply the remaining settings to light-locker. self.apply_light_locker_settings(settings) self.apply_screen_blank_settings(settings) --- a/light-locker-settings/light_locker_xfsync.py +++ b/light-locker-settings/light_locker_xfsync.py @@ -98,7 +98,8 @@ '/xfce4-power-manager/dpms-on-ac-sleep': 10, '/xfce4-power-manager/dpms-on-ac-off': 15, '/xfce4-power-manager/lock-screen-suspend-hibernate': - False + False, + '/xfce4-power-manager/logind-handle-lid-switch': True } current_settings = self._get_xfpm_settings() self._update_settings(current_settings) @@ -188,3 +189,12 @@ prop_name = '/xfce4-power-manager/lock-screen-suspend-hibernate' xfconf_set_property('xfce4-power-manager', prop_name, value) self.settings[prop_name] = value + + # /xfce4-power-manager/logind-handle-lid-switch = TRUE + # handle-power-key:handle-suspend-key:handle-hibernate-key:handle-lid-switch + # /xfce4-power-manager/logind-handle-lid-switch = FALSE + # handle-power-key:handle-suspend-key:handle-hibernate-key + # So if lock-screen-suspend-hibernate is true, make this false. + prop_name = '/xfce4-power-manager/logind-handle-lid-switch' + xfconf_set_property('xfce4-power-manager', prop_name, not value) + self.settings[prop_name] = not value debian/copyright0000664000000000000000000000222312320536102011114 0ustar Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: Light-locker-settings Upstream-Contact: Thomas Molloy Source: https://launchpad.net/light-locker-settings Files: * Copyright: 2014, Thomas Molloy License: GPL-3 Files: debian/* Copyright: 2014, Sean Davis License: GPL-3 License: GPL-3 This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License version 3, as published by the Free Software Foundation. . This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. . You should have received a copy of the GNU General Public License along with this package; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA . On Debian systems, the full text of the GNU General Public License version 3 can be found in the file `/usr/share/common-licenses/GPL-3'.debian/watch0000664000000000000000000000022512320536102010212 0ustar version=3 https://launchpad.net/light-locker-settings \ (?:.*/|)light-locker-settings(?:-|_|_v|\.|V|)(\d\S*)\.(?:tar\.(?:gz|bz2|xz)|tgz|tbz2|txz|zip)debian/rules0000775000000000000000000000066512320536102010251 0ustar #!/usr/bin/make -f # Uncomment this to turn on verbose mode. export DH_VERBOSE=1 DESTDIR := ${CURDIR}/debian/light-locker-settings %: dh $@ --with python2 override_dh_auto_configure: ./configure --prefix=/usr override_dh_auto_install: dh_auto_install find $(DESTDIR)/usr/share -type f -exec chmod a-x '{}' ';' rm $(DESTDIR)/usr/share/doc/light-locker-settings/COPYING \ $(DESTDIR)/usr/share/doc/light-locker-settings/INSTALL