[SCM] ksystemlog packaging branch, master, updated. debian/16.08.3-1-43-g203fe58

Maximiliano Curia maxy at moszumanska.debian.org
Tue Oct 31 18:10:41 UTC 2017


Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ksystemlog.git;a=commitdiff;h=aa8a823

The following commit has been merged in the master branch:
commit aa8a82380ff841196cde2f897b4f50274663fce8
Author: Jonathan Riddell <jr at jriddell.org>
Date:   Wed Jul 6 15:55:26 2016 +0100

    add neon_systemd_pkgconfig.diff to build with our version of systemd
---
 debian/control                             |  1 +
 debian/patches/neon_systemd_pkgconfig.diff | 13 +++++++++++++
 debian/patches/series                      |  1 +
 3 files changed, 15 insertions(+)

diff --git a/debian/control b/debian/control
index 962285f..068612f 100644
--- a/debian/control
+++ b/debian/control
@@ -23,6 +23,7 @@ Build-Depends: cmake (>= 2.8.12~),
                libkf5textwidgets-dev (>= 5.0.0~),
                libkf5widgetsaddons-dev (>= 5.0.0~),
                libkf5xmlgui-dev (>= 5.0.0~),
+               pkg-config,
                pkg-kde-tools (>= 0.12),
                qtbase5-dev (>= 5.2.0~)
 Standards-Version: 3.9.6
diff --git a/debian/patches/neon_systemd_pkgconfig.diff b/debian/patches/neon_systemd_pkgconfig.diff
new file mode 100644
index 0000000..c91ce00
--- /dev/null
+++ b/debian/patches/neon_systemd_pkgconfig.diff
@@ -0,0 +1,13 @@
+diff --git a/cmake/FindJournald.cmake b/cmake/FindJournald.cmake
+index 874d8ba..39bf54c 100644
+--- a/cmake/FindJournald.cmake
++++ b/cmake/FindJournald.cmake
+@@ -15,7 +15,7 @@
+ # use pkg-config to get the directories and then use these values
+ # in the FIND_PATH() and FIND_LIBRARY() calls
+ find_package(PkgConfig)
+-pkg_check_modules(PC_JOURNALD QUIET libsystemd-journal)
++pkg_check_modules(PC_JOURNALD QUIET systemd)
+ 
+ set(JOURNALD_FOUND ${PC_JOURNALD_FOUND})
+ set(JOURNALD_DEFINITIONS ${PC_JOURNALD_CFLAGS_OTHER})
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..9a436e6
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+neon_systemd_pkgconfig.diff

-- 
ksystemlog packaging



More information about the pkg-kde-commits mailing list