[SCM] sddm packaging branch, master, updated. debian/0.11.0-4-6-g8426fb4

[Matthias Klumpp]

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

The following commit has been merged in the master branch:
commit 6812d38973eda18d8f82271d0b2da0722fb652c9
Author: Matthias Klumpp <matthias at tenstral.net>
Date:   Sat Sep 5 23:04:47 2015 +0200

    Drop patches which are applied upstream
---
 debian/patches/kubuntu_dbus-config-rename.diff | 13 -------------
 debian/patches/libsystemd.diff                 | 21 ---------------------
 2 files changed, 34 deletions(-)

diff --git a/debian/patches/kubuntu_dbus-config-rename.diff b/debian/patches/kubuntu_dbus-config-rename.diff
deleted file mode 100644
index 1efc5de..0000000
--- a/debian/patches/kubuntu_dbus-config-rename.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: sddm-0.1.0+git20140718/data/CMakeLists.txt
-===================================================================
---- sddm-0.1.0+git20140718.orig/data/CMakeLists.txt	2014-07-18 11:36:58.974892509 +0200
-+++ sddm-0.1.0+git20140718/data/CMakeLists.txt	2014-07-18 11:36:58.970892509 +0200
-@@ -1,7 +1,7 @@
- install(DIRECTORY   "faces"                             DESTINATION "${DATA_INSTALL_DIR}")
- install(DIRECTORY   "flags"                             DESTINATION "${DATA_INSTALL_DIR}")
- 
--install(FILES "org.freedesktop.DisplayManager.conf"       DESTINATION "${DBUS_CONFIG_DIR}")
-+install(FILES "org.freedesktop.DisplayManager.conf"       DESTINATION "${DBUS_CONFIG_DIR}" RENAME sddm_org.freedesktop.DisplayManager.conf)
- 
- install(FILES "scripts/Xsession" "scripts/Xsetup" DESTINATION "${DATA_INSTALL_DIR}/scripts"
-         PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE
diff --git a/debian/patches/libsystemd.diff b/debian/patches/libsystemd.diff
deleted file mode 100644
index 94628fa..0000000
--- a/debian/patches/libsystemd.diff
+++ /dev/null
@@ -1,21 +0,0 @@
-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()
- 

-- 
sddm packaging