debian/changelog | 6 ++++++
debian/control | 2 ++
debian/patches/add_support_new_libsystemd.patch | 11 +++++++++++
debian/patches/series | 1 +
debian/rules | 16 ++++++++++------
5 files changed, 30 insertions(+), 6 deletions(-)
New commits:
commit 336d09cee7d7e8b1a1e4ea136911fb2ee416e35f
Author: Laurent Bigonville <bi...@bigon.be>
Date: Sat Dec 5 20:27:27 2015 +0100
Enable systemd socket activation support (Closes: #803254)
diff --git a/debian/changelog b/debian/changelog
index 09f1c95..decde27 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xorg-server (2:1.18.0-2) UNRELEASED; urgency=medium
+
+ * Enable systemd socket activation support (Closes: #803254)
+
+ -- Laurent Bigonville <bi...@debian.org> Sat, 05 Dec 2015 20:26:53 +0100
+
xorg-server (2:1.18.0-1) experimental; urgency=medium
* New upstream release.
diff --git a/debian/control b/debian/control
index 16c1496..f58a7b3 100644
--- a/debian/control
+++ b/debian/control
@@ -98,6 +98,8 @@ Build-Depends:
libwayland-dev [linux-any],
#logind
libdbus-1-dev (>= 1.0) [linux-any],
+# systemd-daemon
+ libsystemd-dev [linux-any],
Standards-Version: 3.9.6
Vcs-Git: https://anonscm.debian.org/git/pkg-xorg/xserver/xorg-server.git
Vcs-Browser: https://anonscm.debian.org/cgit/pkg-xorg/xserver/xorg-server.git
diff --git a/debian/patches/add_support_new_libsystemd.patch
b/debian/patches/add_support_new_libsystemd.patch
new file mode 100644
index 0000000..d642b60
--- /dev/null
+++ b/debian/patches/add_support_new_libsystemd.patch
@@ -0,0 +1,11 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -849,7 +849,7 @@ if test "x$WITH_SYSTEMD_DAEMON" = xyes;
+ AC_MSG_ERROR([systemd support requested but no library has been
found])
+ fi
+ AC_DEFINE(HAVE_SYSTEMD_DAEMON, 1, [Define to 1 if libsystemd-daemon is
available])
+- REQUIRED_LIBS="$REQUIRED_LIBS libsystemd-daemon"
++ REQUIRED_LIBS="$REQUIRED_LIBS libsystemd"
+ fi
+ AM_CONDITIONAL([HAVE_SYSTEMD_DAEMON], [test "x$HAVE_SYSTEMD_DAEMON" = "xyes"])
+
diff --git a/debian/patches/series b/debian/patches/series
index 2c8af94..d0ff25a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@
03_static-nettle.diff
05_Revert-Unload-submodules.diff
#08_xfree86_fix_ia64_inx_outx.diff
+add_support_new_libsystemd.patch
diff --git a/debian/rules b/debian/rules
index fe1469a..9013e08 100755
--- a/debian/rules
+++ b/debian/rules
@@ -44,13 +44,15 @@ endif
ifeq ($(DEB_HOST_ARCH_OS), linux)
- selinux = --enable-xselinux
- wayland = --enable-xwayland
- logind = --enable-systemd-logind
+ selinux = --enable-xselinux
+ wayland = --enable-xwayland
+ logind = --enable-systemd-logind
+ systemd-daemon = --with-systemd-daemon
else
- selinux = --disable-xselinux
- wayland = --disable-xwayland
- logind = --disable-systemd-logind
+ selinux = --disable-xselinux
+ wayland = --disable-xwayland
+ logind = --disable-systemd-logind
+ systemd-daemon = --without-systemd-daemon
endif
ifeq ($(DEB_HOST_ARCH_OS), hurd)
@@ -165,6 +167,7 @@ confflags_main = \
--enable-xfree86-utils \
$(wayland) \
$(logind) \
+ $(systemd-daemon) \
--enable-suid-wrapper \
--enable-dmx \
--enable-xvfb \
@@ -198,6 +201,7 @@ confflags_udeb = \
--disable-xfree86-utils \
--disable-xwayland \
--disable-systemd-logind \
+ --without-systemd-daemon \
--disable-suid-wrapper \
--disable-dmx \
--disable-xvfb \
