[SCM] sddm packaging branch, master, updated. debian/0.11.0-2-4-gc53c772

Maximiliano Curia maxy at moszumanska.debian.org
Sat Jul 18 19:34:15 UTC 2015


Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-std/sddm.git;a=commitdiff;h=4c79ea7

The following commit has been merged in the master branch:
commit 4c79ea7301845ae8601d45cb37f047d77d096535
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Sat Jul 18 20:48:03 2015 +0200

    Transition to libsystemd-dev. (Closes: #792400)
---
 debian/changelog               |  4 +++-
 debian/control                 |  2 +-
 debian/patches/libsystemd.diff | 21 +++++++++++++++++++++
 debian/patches/series          |  1 +
 4 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5f86ab8..188b13b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 sddm (0.11.0-3~) UNRELEASED; urgency=medium
 
-  * 
+  * Transition to libsystemd-dev. (Closes: #792400) Thanks to Michael
+    Biebl
+  * New patch: libsystemd.diff
 
  -- Maximiliano Curia <maxy at debian.org>  Sat, 18 Jul 2015 20:39:32 +0200
 
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

-- 
sddm packaging



More information about the pkg-kde-commits mailing list