[SCM] sddm packaging branch, kubuntu_vivid_archive, updated. 0d4a70729ca86d1572441a400fa92c1e93e4fae6

[Harald Sitter]

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

The following commit has been merged in the kubuntu_vivid_archive branch:
commit 0d4a70729ca86d1572441a400fa92c1e93e4fae6
Author: Harald Sitter <sitter at kde.org>
Date:   Fri Mar 13 13:00:37 2015 +0100

    sync with archive
---
 debian/changelog                       |  6 ++++++
 debian/patches/kubuntu_minimum_vt.diff | 20 ++++++++++++++++++++
 debian/patches/series                  |  1 +
 3 files changed, 27 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index d673ecf..4878bcd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+sddm (0.11.0-0ubuntu4) vivid; urgency=medium
+
+  * Add kubuntu_minimum_vt.diff to set minimum vt to 7
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Wed, 11 Mar 2015 17:02:02 +0100
+
 sddm (0.11.0-0ubuntu3) vivid; urgency=medium
 
   * Re-enable systemd integration and install the sddm.service again
diff --git a/debian/patches/kubuntu_minimum_vt.diff b/debian/patches/kubuntu_minimum_vt.diff
new file mode 100644
index 0000000..9052c98
--- /dev/null
+++ b/debian/patches/kubuntu_minimum_vt.diff
@@ -0,0 +1,20 @@
+Description: set minimum vt to 7
+ maybe this will fix switching vt when installing packages and integration with ubiquity-dm?
+Author: Jonathan Riddell
+Origin: kubuntu
+Last-Update: 2015-03-11
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+Index: sddm-0.11.0/CMakeLists.txt
+===================================================================
+--- sddm-0.11.0.orig/CMakeLists.txt
++++ sddm-0.11.0/CMakeLists.txt
+@@ -111,7 +111,7 @@ if(SYSTEMD_FOUND)
+ 
+     execute_process(COMMAND ${PKG_CONFIG_EXECUTABLE} --variable=systemdsystemunitdir systemd OUTPUT_VARIABLE SYSTEMD_SYSTEM_UNIT_DIR)
+     string(REGEX REPLACE "[ 	
]+" "" SYSTEMD_SYSTEM_UNIT_DIR ${SYSTEMD_SYSTEM_UNIT_DIR})
+-    set(MINIMUM_VT 1)
++    set(MINIMUM_VT 7)
+     set(HALT_COMMAND "/usr/bin/systemctl poweroff")
+     set(REBOOT_COMMAND "/usr/bin/systemctl reboot")
+ else()
diff --git a/debian/patches/series b/debian/patches/series
index e23a8e7..9ba3b6e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 kubuntu_use_breeze.diff
 kubuntu_dbus-config-rename.diff
+kubuntu_minimum_vt.diff

-- 
sddm packaging