[SCM] sddm packaging branch, kubuntu_xenial_archive, updated. debian/0.13.0-1-13-gba3f080

Philip Muškovac yofel-guest at moszumanska.debian.org
Tue Jan 5 15:53:38 UTC 2016


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

The following commit has been merged in the kubuntu_xenial_archive branch:
commit 4bbe901ea6f00aa20c1dbb991fb60cb00aa02abd
Author: Philip Muškovac <yofel at gmx.net>
Date:   Tue Jan 5 16:48:41 2016 +0100

    Drop use-systemd.patch, properly fixed upstream
---
 debian/changelog                 |  1 -
 debian/patches/series            |  1 -
 debian/patches/use-systemd.patch | 14 --------------
 3 files changed, 16 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 832122c..8f635b3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,7 +4,6 @@ sddm (0.13.0-1ubuntu1) UNRELEASED; urgency=medium
     - keep the default-display-manager file logic in sddm.postinst
     - keep kubuntu specific patches:
       + kubuntu_nvidia-prime.diff
-      + use-systemd.patch
       + kubuntu_minimum_vt.diff instead of 03_vt7-minimum-vt.diff
 
  -- Philip Muškovac <yofel at kubuntu.org>  Tue, 05 Jan 2016 16:15:05 +0100
diff --git a/debian/patches/series b/debian/patches/series
index 36a3602..91b5a3c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,4 +4,3 @@
 
 kubuntu_minimum_vt.diff
 kubuntu_nvidia-prime.diff
-use-systemd.patch
diff --git a/debian/patches/use-systemd.patch b/debian/patches/use-systemd.patch
deleted file mode 100644
index 0c6cd2a..0000000
--- a/debian/patches/use-systemd.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Description: Replace systemd-journal with systemd.
-Author: Dimitri John Ledkov <xnox at ubuntu.com>
-
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -98,7 +98,7 @@
-     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)

-- 
sddm packaging



More information about the pkg-kde-commits mailing list