debian/changelog | 7 ++++ debian/control | 2 - debian/patches/0001-Add-suport-for-new-libsystemd.patch | 28 ++++++++++++++++ debian/patches/series | 1 4 files changed, 37 insertions(+), 1 deletion(-)
New commits: commit 2f6606c04d7177e24f72cf794be5f827d06ebf7a Author: Héctor Orón Martínez <zu...@debian.org> Date: Tue Sep 1 14:19:29 2015 +0200 Release Debian version weston-1.8.0-3 Signed-off-by: Héctor Orón Martínez <zu...@debian.org> diff --git a/debian/changelog b/debian/changelog index cf9674a..eb5e0e2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +weston (1.8.0-3) unstable; urgency=medium + + * Add support for new libsystemd. + (Closes: #779754) + + -- Hector Oron <zu...@debian.org> Tue, 01 Sep 2015 13:32:59 +0200 + weston (1.8.0-2) unstable; urgency=medium * d/control: bump wayland versioned build dependency commit 290e86ef44ff8ab746cae9b73383fb9c475fb204 Author: Héctor Orón Martínez <zu...@debian.org> Date: Tue Sep 1 14:19:11 2015 +0200 Add support for building against new libsystemd. Signed-off-by: Héctor Orón Martínez <zu...@debian.org> diff --git a/debian/control b/debian/control index 4519559..f561495 100644 --- a/debian/control +++ b/debian/control @@ -37,7 +37,7 @@ Build-Depends: libmtdev-dev, libpam0g-dev, libvpx-dev, - libsystemd-login-dev, + libsystemd-dev, libinput-dev (>= 0.8.0), Standards-Version: 3.9.6 Homepage: http://wayland.freedesktop.org/ diff --git a/debian/patches/0001-Add-suport-for-new-libsystemd.patch b/debian/patches/0001-Add-suport-for-new-libsystemd.patch new file mode 100644 index 0000000..23b7762 --- /dev/null +++ b/debian/patches/0001-Add-suport-for-new-libsystemd.patch @@ -0,0 +1,28 @@ +From fe00842e1562d78f2811c8dad46125041cccab87 Mon Sep 17 00:00:00 2001 +From: Michael Biebl <bi...@debian.org> +Date: Thu, 9 Jul 2015 16:18:39 +0200 +Subject: [PATCH] Add suport for new libsystemd + +In systemd v209, the various libraries were merged into a single +libsystemd library. When checking for systemd > 209, use the new library +name instead of the deprecated libsystemd-login. +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 2c55e1b..034f4a5 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -349,7 +349,7 @@ AS_IF([test "x$have_systemd_login" = "xyes"], + [AC_DEFINE([HAVE_SYSTEMD_LOGIN], [1], [Have systemd-login])]) + AM_CONDITIONAL(HAVE_SYSTEMD_LOGIN, test "x$have_systemd_login" = "xyes") + +-PKG_CHECK_MODULES(SYSTEMD_LOGIN_209, [libsystemd-login >= 209], ++PKG_CHECK_MODULES(SYSTEMD_LOGIN_209, [libsystemd >= 209], + [have_systemd_login_209=yes], [have_systemd_login_209=no]) + AS_IF([test "x$have_systemd_login_209" = "xyes"], + [AC_DEFINE([HAVE_SYSTEMD_LOGIN_209], [1], [Have systemd-login >= 209])]) +-- +2.1.4 + diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..844880f --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +0001-Add-suport-for-new-libsystemd.patch