[mate-system-monitor] 05/07: debian/patches: Drop 1001_search-for-libsystemd-dev.patch. Applied upstream.

[Martin Wimpress]

This is an automated email from the git hooks/post-receive script.

flexiondotorg-guest pushed a commit to branch master
in repository mate-system-monitor.

commit 0eaff6d7c43e8551653237081db4dd3b048944ee
Author: Martin Wimpress <code at flexion.org>
Date:   Mon Nov 9 20:48:14 2015 +0000

    debian/patches: Drop 1001_search-for-libsystemd-dev.patch. Applied upstream.
---
 .../patches/1001_search-for-libsystemd-dev.patch   | 27 ----------------------
 debian/patches/series                              |  1 -
 2 files changed, 28 deletions(-)

diff --git a/debian/patches/1001_search-for-libsystemd-dev.patch b/debian/patches/1001_search-for-libsystemd-dev.patch
deleted file mode 100644
index 0654710..0000000
--- a/debian/patches/1001_search-for-libsystemd-dev.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Description: Search for libsystemd rather than libsystemd-login
-Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
-Abstract:
- In Debian stretch and beyond all systemd headers are provided
- via the libsystemd-dev. Thus, src:packages have to B-D on
- libsystemd-dev (and not libsystemd-login-dev) and also
- configure scripts need to be satisfied if libsystemd is
- installed.
- .
- This patch is not 100% suitable for upstream, because the generic
- approach would be to test for libsystemd first, if not present,
- test for libsystemd-login and only if both are non-present on the
- build system, a failture should be triggered.
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -70,8 +70,8 @@
- have_systemd=no
- AC_ARG_ENABLE(systemd, AS_HELP_STRING([--disable-systemd], [disable systemd support]),,enable_systemd=no)
- 	if test "x$enable_systemd" != "xno"; then
--		PKG_CHECK_MODULES(SYSTEMD, [ libsystemd-login >= $SYSTEMD_REQUIRED ],
--					   [ PKG_CHECK_MODULES(SYSTEMD_EX, [ libsystemd-login = $SYSTEMD_EXCLUDED ],
-+		PKG_CHECK_MODULES(SYSTEMD, [ libsystemd >= $SYSTEMD_REQUIRED ],
-+					   [ PKG_CHECK_MODULES(SYSTEMD_EX, [ libsystemd = $SYSTEMD_EXCLUDED ],
- 									   AC_MSG_ERROR([*** systemd v43 found but it has a bug in its header files (uses C++ keyword)]), # Can't use systemd v43
- 									   [AC_DEFINE(HAVE_SYSTEMD, 1, [Define if systemd is available]) have_systemd=yes])],
- 					   have_systemd=no)
diff --git a/debian/patches/series b/debian/patches/series
index 081dca6..88c5e2e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-1001_search-for-libsystemd-dev.patch
 1002_stdc++11.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mate/mate-system-monitor.git