[Pkg-xfce-commits] r8416 - in /goodies/trunk/lightdm/debian: changelog control lightdm.postinst lightdm.service rules
Yves-Alexis Perez
corsac at moszumanska.debian.org
Sun Apr 27 09:12:30 UTC 2014
Author: corsac
Date: Sun Apr 27 09:12:30 2014
New Revision: 8416
URL: http://svn.debian.org/wsvn/pkg-xfce/?sc=1&rev=8416
Log:
* debian/control:
- add build-dep on dh-systemd.
* debian/lightdm.postinst:
- handle symlinks for systemd service files according to the currently
selected display manager.
* debian/lightdm.service:
- add systemd service file, thanks Martin Pitt for the work.closes: #733220
* debian/rules:
- use dh systemd addon and configure it to not start the lightdm service
at once.
Added:
goodies/trunk/lightdm/debian/lightdm.service
Modified:
goodies/trunk/lightdm/debian/changelog
goodies/trunk/lightdm/debian/control
goodies/trunk/lightdm/debian/lightdm.postinst
goodies/trunk/lightdm/debian/rules
Modified: goodies/trunk/lightdm/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-xfce/goodies/trunk/lightdm/debian/changelog?rev=8416&op=diff
==============================================================================
--- goodies/trunk/lightdm/debian/changelog (original)
+++ goodies/trunk/lightdm/debian/changelog Sun Apr 27 09:12:30 2014
@@ -1,3 +1,18 @@
+lightdm (1.10.0-3) UNRELEASED; urgency=medium
+
+ * debian/control:
+ - add build-dep on dh-systemd.
+ * debian/lightdm.postinst:
+ - handle symlinks for systemd service files according to the currently
+ selected display manager.
+ * debian/lightdm.service:
+ - add systemd service file, thanks Martin Pitt for the work.closes: #733220
+ * debian/rules:
+ - use dh systemd addon and configure it to not start the lightdm service
+ at once.
+
+ -- Yves-Alexis Perez <corsac at debian.org> Sun, 27 Apr 2014 00:09:13 +0200
+
lightdm (1.10.0-2) unstable; urgency=medium
* Upload to unstable.
Modified: goodies/trunk/lightdm/debian/control
URL: http://svn.debian.org/wsvn/pkg-xfce/goodies/trunk/lightdm/debian/control?rev=8416&op=diff
==============================================================================
--- goodies/trunk/lightdm/debian/control (original)
+++ goodies/trunk/lightdm/debian/control Sun Apr 27 09:12:30 2014
@@ -9,7 +9,8 @@
libdbus-glib-1-dev, libxcb1-dev, libxdmcp-dev, libpam-dev, libxklavier-dev,
libgtk-3-dev, libck-connector-dev, gnome-doc-utils, libqt4-dev,
valac, gobject-introspection, dpkg-dev (>= 1.16.1),
- gtk-doc-tools, itstool, libgcrypt11-dev, libgirepository1.0-dev
+ gtk-doc-tools, itstool, libgcrypt11-dev, libgirepository1.0-dev,
+ dh-systemd (>= 1.14)
Standards-Version: 3.9.5
Homepage: https://launchpad.net/lightdm
Vcs-Svn: svn://anonscm.debian.org/pkg-xfce/goodies/trunk/lightdm
Modified: goodies/trunk/lightdm/debian/lightdm.postinst
URL: http://svn.debian.org/wsvn/pkg-xfce/goodies/trunk/lightdm/debian/lightdm.postinst?rev=8416&op=diff
==============================================================================
--- goodies/trunk/lightdm/debian/lightdm.postinst (original)
+++ goodies/trunk/lightdm/debian/lightdm.postinst Sun Apr 27 09:12:30 2014
@@ -62,6 +62,16 @@
if [ "$1" = "configure" ];
then
invoke-rc.d dbus reload || true
+
+ # set default-display-manager systemd service link according to our config
+ if [ -e "$DEFAULT_DISPLAY_MANAGER_FILE" -a -d /etc/systemd/system/ ]; then
+ SERVICE=/lib/systemd/system/$(basename $(cat "$DEFAULT_DISPLAY_MANAGER_FILE")).service
+ if [ -e "$SERVICE" ]; then
+ ln -sf "$SERVICE" /etc/systemd/system/display-manager.service
+ else
+ echo "ERROR: $SERVICE is the selected default display manager but does not exist" >&2
+ fi
+ fi
fi
#DEBHELPER#
Added: goodies/trunk/lightdm/debian/lightdm.service
URL: http://svn.debian.org/wsvn/pkg-xfce/goodies/trunk/lightdm/debian/lightdm.service?rev=8416&op=file
==============================================================================
--- goodies/trunk/lightdm/debian/lightdm.service (added)
+++ goodies/trunk/lightdm/debian/lightdm.service Sun Apr 27 09:12:30 2014
@@ -0,0 +1,12 @@
+[Unit]
+Description=Light Display Manager
+Documentation=man:lightdm(1)
+After=systemd-user-sessions.service
+
+[Service]
+# temporary safety check until all DMs are converted to correct
+# display-manager.service symlink handling
+ExecStartPre=/bin/sh -c '[ "$(cat /etc/X11/default-display-manager 2>/dev/null)" = "/usr/sbin/lightdm" ]'
+ExecStart=/usr/sbin/lightdm
+Restart=always
+BusName=org.freedesktop.DisplayManager
Modified: goodies/trunk/lightdm/debian/rules
URL: http://svn.debian.org/wsvn/pkg-xfce/goodies/trunk/lightdm/debian/rules?rev=8416&op=diff
==============================================================================
--- goodies/trunk/lightdm/debian/rules (original)
+++ goodies/trunk/lightdm/debian/rules Sun Apr 27 09:12:30 2014
@@ -21,6 +21,9 @@
dh_install --fail-missing -X etc/init/lightdm.conf
%:
- dh $@ --parallel
+ dh $@ --with systemd --parallel
override_dh_auto_test:
+
+override_dh_systemd_start:
+ dh_systemd_start -plightdm --no-start -r lightdm.service
More information about the Pkg-xfce-commits
mailing list