Control: tags -1 + pending patch Hi,
I've uploaded 3.5.6-2.1 to DELAYED/7. Complete debdiff is attached. If you have any concerns with the NMU, please let me know and I'll cancel it. Regards, Michael -- Why is it that all of the instruments seeking intelligent life in the universe are pointed away from Earth?
diff -Nru syslog-ng-3.5.6/debian/changelog syslog-ng-3.5.6/debian/changelog --- syslog-ng-3.5.6/debian/changelog 2014-08-13 14:02:22.000000000 +0200 +++ syslog-ng-3.5.6/debian/changelog 2015-09-08 16:03:02.000000000 +0200 @@ -1,3 +1,10 @@ +syslog-ng (3.5.6-2.1) unstable; urgency=medium + + * Non-maintainer upload. + * Build against libsystemd-dev. (Closes: #779765) + + -- Michael Biebl <[email protected]> Tue, 08 Sep 2015 16:01:58 +0200 + syslog-ng (3.5.6-2) unstable; urgency=high [ Gergely Nagy <[email protected]> ] diff -Nru syslog-ng-3.5.6/debian/control syslog-ng-3.5.6/debian/control --- syslog-ng-3.5.6/debian/control 2014-08-13 14:03:01.000000000 +0200 +++ syslog-ng-3.5.6/debian/control 2015-09-08 15:59:25.000000000 +0200 @@ -22,7 +22,7 @@ libwrap0-dev, libpcre3-dev, libcap-dev [linux-any], - libsystemd-daemon-dev [linux-any], dh-systemd (>= 1.3), + libsystemd-dev [linux-any], dh-systemd (>= 1.3), libgeoip-dev, libhiredis-dev, python diff -Nru syslog-ng-3.5.6/debian/patches/libsystemd.patch syslog-ng-3.5.6/debian/patches/libsystemd.patch --- syslog-ng-3.5.6/debian/patches/libsystemd.patch 1970-01-01 01:00:00.000000000 +0100 +++ syslog-ng-3.5.6/debian/patches/libsystemd.patch 2015-09-08 16:01:54.000000000 +0200 @@ -0,0 +1,61 @@ +Index: syslog-ng-3.5.6/configure.ac +=================================================================== +--- syslog-ng-3.5.6.orig/configure.ac 2014-08-04 13:55:33.000000000 +0200 ++++ syslog-ng-3.5.6/configure.ac 2015-09-08 16:01:51.863791323 +0200 +@@ -1055,7 +1055,7 @@ + fi + + if test "x$enable_systemd" = "xyes"; then +- PKG_CHECK_MODULES(libsystemd_daemon, libsystemd-daemon >= 31,enable_systemd="yes",enable_systemd="no") ++ PKG_CHECK_MODULES(libsystemd, libsystemd >= 209,enable_systemd="yes",enable_systemd="no") + if test "x$with_systemdsystemunitdir" = "xyes"; then + # no arguments, just --with-systemdsystemunitdir + systemdsystemunitdir=`$PKG_CONFIG --variable=systemdsystemunitdir systemd` +Index: syslog-ng-3.5.6/lib/Makefile.am +=================================================================== +--- syslog-ng-3.5.6.orig/lib/Makefile.am 2014-08-04 13:55:33.000000000 +0200 ++++ syslog-ng-3.5.6/lib/Makefile.am 2015-09-08 16:01:03.759425142 +0200 +@@ -7,7 +7,7 @@ + include lib/template/Makefile.am + + lib_LTLIBRARIES += lib/libsyslog-ng.la +-lib_libsyslog_ng_la_LIBADD = @CORE_DEPS_LIBS@ $(libsystemd_daemon_LIBS) ++lib_libsyslog_ng_la_LIBADD = @CORE_DEPS_LIBS@ $(libsystemd_LIBS) + lib_libsyslog_ng_la_LDFLAGS = -no-undefined -release @VERSION@ + + lib_test_subdirs = lib_filter lib_logproto lib_parser lib_rewrite lib_template +Index: syslog-ng-3.5.6/modules/afsocket/Makefile.am +=================================================================== +--- syslog-ng-3.5.6.orig/modules/afsocket/Makefile.am 2014-08-04 13:55:33.000000000 +0200 ++++ syslog-ng-3.5.6/modules/afsocket/Makefile.am 2015-09-08 16:01:27.327604544 +0200 +@@ -33,12 +33,12 @@ + modules/afsocket/afsocket-plugin.c + + modules_afsocket_libafsocket_notls_la_CPPFLAGS = \ +- $(AM_CPPFLAGS) $(libsystemd_daemon_CFLAGS) \ ++ $(AM_CPPFLAGS) $(libsystemd_CFLAGS) \ + -I${top_srcdir}/modules/afsocket \ + -I${top_builddir}/modules/afsocket + modules_afsocket_libafsocket_notls_la_LIBADD = \ + $(MODULE_DEPS_LIBS) $(LIBNET_LIBS) \ +- $(LIBWRAP_LIBS) $(libsystemd_daemon_LIBS) ++ $(LIBWRAP_LIBS) $(libsystemd_LIBS) + modules_afsocket_libafsocket_notls_la_LDFLAGS = \ + $(MODULE_LDFLAGS) + modules_afsocket_libafsocket_notls_la_DEPENDENCIES= \ +Index: syslog-ng-3.5.6/modules/system-source/Makefile.am +=================================================================== +--- syslog-ng-3.5.6.orig/modules/system-source/Makefile.am 2014-08-04 13:55:33.000000000 +0200 ++++ syslog-ng-3.5.6/modules/system-source/Makefile.am 2015-09-08 16:01:15.407513809 +0200 +@@ -3,9 +3,9 @@ + modules_system_source_libsystem_source_la_SOURCES = \ + modules/system-source/system-source.c + modules_system_source_libsystem_source_la_CPPFLAGS = \ +- $(AM_CPPFLAGS) $(libsystemd_daemon_CFLAGS) ++ $(AM_CPPFLAGS) $(libsystemd_CFLAGS) + modules_system_source_libsystem_source_la_LIBADD = \ +- $(MODULE_DEPS_LIBS) $(libsystemd_daemon_LIBS) ++ $(MODULE_DEPS_LIBS) $(libsystemd_LIBS) + modules_system_source_libsystem_source_la_LDFLAGS = \ + $(MODULE_LDFLAGS) + modules_system_source_libsystem_source_la_DEPENDENCIES = \ diff -Nru syslog-ng-3.5.6/debian/patches/series syslog-ng-3.5.6/debian/patches/series --- syslog-ng-3.5.6/debian/patches/series 1970-01-01 01:00:00.000000000 +0100 +++ syslog-ng-3.5.6/debian/patches/series 2015-09-08 15:59:45.000000000 +0200 @@ -0,0 +1 @@ +libsystemd.patch diff -Nru syslog-ng-3.5.6/debian/README.source syslog-ng-3.5.6/debian/README.source --- syslog-ng-3.5.6/debian/README.source 2014-08-13 14:02:22.000000000 +0200 +++ syslog-ng-3.5.6/debian/README.source 2015-09-08 15:59:13.000000000 +0200 @@ -75,7 +75,7 @@ disable features in a source package. As of this writing, the only optional feature is "systemd". - If enabled (which is the default), libsystemd-daemon-dev and + If enabled (which is the default), libsystemd-dev and dh-systemd will be added to Build-Depends. To disable the feature, pass an empty string as an argument to the bootstrap script. diff -Nru syslog-ng-3.5.6/debian/rules syslog-ng-3.5.6/debian/rules --- syslog-ng-3.5.6/debian/rules 2014-08-13 14:02:22.000000000 +0200 +++ syslog-ng-3.5.6/debian/rules 2015-09-08 15:58:42.000000000 +0200 @@ -55,7 +55,7 @@ # If debian/control does not have a build-dependency on # libsystemd-daemon, disable systemd support, otherwise enable it. -ifeq ($(shell grep -q libsystemd-daemon-dev debian/control || echo disabled),disabled) +ifeq ($(shell grep -q libsystemd-dev debian/control || echo disabled),disabled) SYSTEMD_SUPPORT ?= --disable-systemd else SYSTEMD_SUPPORT ?= --enable-systemd
signature.asc
Description: OpenPGP digital signature
