Control: tags -1 + patch On Tue, 14 Jul 2015 15:18:00 +0200 Michael Biebl <bi...@debian.org> wrote: > Source: sddm > Version: 0.11.0-2 > Severity: important > User: pkg-systemd-maintain...@lists.alioth.debian.org > Usertags: libsystemd > > Hi! > > In systemd v209, released over a year ago, the various libsystemd-* libraries > (libsystemd-journal.so, libsystemd-login.so, libsystem-daemon.so, > libsystemd-id128.so) were merged into a single libsystemd.so library to reduce > code duplication and avoid cyclic dependencies [1]. > > Your package declares a build-dependency on either libsystemd-daemon-dev, > libsystemd-login-dev or libsystemd-journal-dev. > > Please update your package so it can be built against libsystemd.
Attached is a patch, which changes the Build-Depends from libsystemd-login-dev to libsystemd-dev and updates CMakeList.txt to look for libsystemd instead of libsystemd-journal for journal support. Btw, this looks like it is a bug on it's own: the build-dep on libsystemd-login-dev while you probably wanted libsystemd-journal-dev. So journal support is currently not enabled in the debian package afaics and this patch fixes that. We plan to drop the old compat libraries in about two months. At this point this bug will be raised to serious. Please consider uploading a fixed package before that. Regards, Michael -- Why is it that all of the instruments seeking intelligent life in the universe are pointed away from Earth?
diff --git a/debian/control b/debian/control
index c8a0bac..6d8bbaf 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Build-Depends: cmake (>= 2.8.8),
debhelper (>= 9),
dh-systemd [linux-any],
libpam0g-dev,
- libsystemd-login-dev [linux-any],
+ libsystemd-dev [linux-any],
libupower-glib-dev,
libxcb-xkb-dev,
libxcb1-dev,
diff --git a/debian/patches/libsystemd.diff b/debian/patches/libsystemd.diff
new file mode 100644
index 0000000..94628fa
--- /dev/null
+++ b/debian/patches/libsystemd.diff
@@ -0,0 +1,21 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index cf3fb70..5d4bc62 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -98,14 +98,14 @@ if(SYSTEMD_FOUND)
+ add_definitions(-DHAVE_SYSTEMD)
+ set(CMAKE_AUTOMOC_MOC_OPTIONS -DHAVE_SYSTEMD)
+
+- pkg_check_modules(JOURNALD "libsystemd-journal")
++ pkg_check_modules(JOURNALD "libsystemd")
+
+ if(ENABLE_JOURNALD)
+ if(JOURNALD_FOUND)
+ add_definitions(-DHAVE_JOURNALD)
+ set(CMAKE_AUTOMOC_MOC_OPTIONS -DHAVE_JOURNALD)
+ else()
+- message(WARNING "Disable journald support for lack of libsystemd-journal")
++ message(WARNING "Disable journald support for lack of libsystemd")
+ endif()
+ endif()
+
diff --git a/debian/patches/series b/debian/patches/series
index 5153474..83873e0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@ kubuntu_use_breeze.diff
kubuntu_dbus-config-rename.diff
kubuntu_minimum_vt.diff
upstream_add-graphical.target.diff
+libsystemd.diff
signature.asc
Description: OpenPGP digital signature
