Bug#756907: cinnamon-screensaver: no longer buildable on non-linux

[Philipp Kern]

On Sun, Aug 03, 2014 at 01:50:24PM +0200, Cyril Brulebois wrote:
> Source: cinnamon-screensaver
> Version: 2.2.4-4
> Severity: serious
> Justification: FTBFS
> 
> Hi,
> 
> your package can no longer be built on non-linux architectures:
> | cinnamon-screensaver build-depends on missing:
> | - libsystemd-login-dev
> 
> as can be seen here:
>   
> https://buildd.debian.org/status/package.php?p=cinnamon-screensaver&suite=sid
> 
> The outdated binaries on kfreebsd-* are therefore preventing your
> package from migrating. Hence this pseudo-FTBFS serious bug report.

AFAICS the following patch should fix this:

diff -Nru cinnamon-screensaver-2.2.4/debian/control 
cinnamon-screensaver-2.2.4/debian/control
--- cinnamon-screensaver-2.2.4/debian/control   2014-07-26 15:52:14.000000000 
+0000
+++ cinnamon-screensaver-2.2.4/debian/control   2014-08-10 10:22:49.000000000 
+0000
@@ -16,7 +16,7 @@
                libgnomekbd-dev (>= 2.91.91),
                libgtk-3-dev (>= 3.0.0),
                libpam0g-dev,
-               libsystemd-login-dev,
+               libsystemd-login-dev [linux-any],
                libx11-dev,
                libxext-dev,
                libxklavier-dev,
diff -Nru cinnamon-screensaver-2.2.4/debian/rules 
cinnamon-screensaver-2.2.4/debian/rules
--- cinnamon-screensaver-2.2.4/debian/rules     2014-07-26 15:52:14.000000000 
+0000
+++ cinnamon-screensaver-2.2.4/debian/rules     2014-08-10 10:17:44.000000000 
+0000
@@ -2,6 +2,8 @@
 
 export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+LOGIN_INFRA_YES := $(shell dpkg-architecture -qDEB_HOST_ARCH -ilinux-any && 
echo systemd || echo console-kit)
+LOGIN_INFRA_NO := $(shell dpkg-architecture -qDEB_HOST_ARCH -ilinux-any && 
echo console-kit || echo systemd)
 
 %:
        dh $@ --parallel --with=autoreconf,gnome
@@ -12,8 +14,8 @@
 override_dh_auto_configure:
        dh_auto_configure -- \
            --enable-locking \
-           --with-console-kit=no \
-           --enable-systemd \
+           --with-$(LOGIN_INFRA_YES)=yes \
+           --with-$(LOGIN_INFRA_NO)=no \
            
--libexecdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH)/cinnamon-screensaver
 
 override_dh_install:

Note that --enable-systemd was wrong, it's actually --with-systemd. But it
defaults to auto, so that's good. consolekit does not need additional build
dependencies as the application is just talking dbus to the service.

Kind regards
Philipp Kern

signature.asc
Description: Digital signature