[SCM] sddm packaging branch, master, updated. debian/0.11.0-1-4-g659070a

[Pino Toscano]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-std/sddm.git;a=commitdiff;h=659070a

The following commit has been merged in the master branch:
commit 659070a14178cd5d4d3324aff534deb3319601dc
Author: Pino Toscano <pino at debian.org>
Date:   Sat Jul 4 09:18:08 2015 +0200

    Make sddm build on non-Linux architectures
    
    - limit the libsystemd-login-dev build dependency as linux-any
    - properly use DEB_HOST_ARCH_OS for detecting the current target OS
    - explicitly disable systemd and journald on non-Linux archs
    - disable installation of the upstream lib/systemd/system/sddm.service
      (installed only with systemd support enabled), as there is a local
      debian/sddm.service which will be used anyway instead
---
 debian/changelog    |  9 +++++++++
 debian/control      |  2 +-
 debian/rules        | 10 ++++++++--
 debian/sddm.install |  3 ++-
 4 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b321d1e..e5f654f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,15 @@ sddm (0.11.0-2~) UNRELEASED; urgency=medium
   * Re-enable patches kubuntu_use_breeze.diff, kubuntu_minimum_vt.diff,
     upstream_add-graphical.target.diff.
 
+  [ Pino Toscano ]
+  * Make sddm build on non-Linux architectures:
+    - limit the libsystemd-login-dev build dependency as linux-any
+    - properly use DEB_HOST_ARCH_OS for detecting the current target OS
+    - explicitly disable systemd and journald on non-Linux archs
+    - disable installation of the upstream lib/systemd/system/sddm.service
+      (installed only with systemd support enabled), as there is a local
+      debian/sddm.service which will be used anyway instead
+
  -- Maximiliano Curia <maxy at debian.org>  Sat, 28 Mar 2015 09:40:09 +0100
 
 sddm (0.11.0-1) experimental; urgency=medium
diff --git a/debian/control b/debian/control
index 1ba1252..c8a0bac 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Build-Depends: cmake (>= 2.8.8),
                debhelper (>= 9),
                dh-systemd [linux-any],
                libpam0g-dev,
-               libsystemd-login-dev,
+               libsystemd-login-dev [linux-any],
                libupower-glib-dev,
                libxcb-xkb-dev,
                libxcb1-dev,
diff --git a/debian/rules b/debian/rules
index 04e9fa5..fbb6c9a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,7 +3,12 @@
 #export DH_VERBOSE=1
 
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
-WITH_SYSTEMD := $(shell dpkg-architecture -qDEB_HOST_ARCH -ilinux-any && echo --with systemd)
+DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
+ifeq ($(DEB_HOST_ARCH_OS),linux)
+  WITH_SYSTEMD := --with systemd
+else
+  CMAKE_ARGS += -DNO_SYSTEMD=ON -DENABLE_JOURNALD=OFF
+endif
 
 %:
 	dh $@ ${WITH_SYSTEMD} --parallel
@@ -14,7 +19,8 @@ override_dh_strip:
 override_dh_auto_configure:
 	dh_auto_configure -- \
 	    -DCMAKE_INSTALL_LIBEXECDIR=/usr/lib/${DEB_HOST_MULTIARCH}/sddm \
-	    -DSESSION_COMMAND="/etc/X11/Xsession"
+	    -DSESSION_COMMAND="/etc/X11/Xsession" \
+	    ${CMAKE_ARGS}
 
 override_dh_systemd_start:
 	dh_systemd_start -psddm --no-start -r sddm.service
diff --git a/debian/sddm.install b/debian/sddm.install
index a4b2c08..0c3a672 100644
--- a/debian/sddm.install
+++ b/debian/sddm.install
@@ -1,6 +1,7 @@
 etc/dbus-1/system.d/sddm_org.freedesktop.DisplayManager.conf
 etc/pam.d
-lib/systemd/system/sddm.service
+# not installed, as the Debian version is used instead
+#lib/systemd/system/sddm.service
 usr/bin/sddm*
 usr/lib/*/qt5/qml/SddmComponents/
 usr/lib/*/sddm/

-- 
sddm packaging