[SCM] sddm packaging branch, master, updated. debian/0.11.0-4-10-ge730788

[Matthias Klumpp]

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

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

    Reorganize patches
---
 ...{sddm_systemctl.diff => 01_sddm_systemctl.diff} |  0
 ..._use_breeze.diff => 02_kubuntu_use_breeze.diff} |  0
 ...al.target.diff => 03_add-graphical.target.diff} |  0
 .../{default_path.diff => 04_default_path.diff}    |  0
 debian/patches/05_vt7-minimum-vt.diff              | 16 +++++++++++++
 debian/patches/default_path                        | 26 ----------------------
 debian/patches/series                              |  9 ++++----
 7 files changed, 21 insertions(+), 30 deletions(-)

diff --git a/debian/patches/sddm_systemctl.diff b/debian/patches/01_sddm_systemctl.diff
similarity index 100%
rename from debian/patches/sddm_systemctl.diff
rename to debian/patches/01_sddm_systemctl.diff
diff --git a/debian/patches/kubuntu_use_breeze.diff b/debian/patches/02_kubuntu_use_breeze.diff
similarity index 100%
rename from debian/patches/kubuntu_use_breeze.diff
rename to debian/patches/02_kubuntu_use_breeze.diff
diff --git a/debian/patches/add-graphical.target.diff b/debian/patches/03_add-graphical.target.diff
similarity index 100%
rename from debian/patches/add-graphical.target.diff
rename to debian/patches/03_add-graphical.target.diff
diff --git a/debian/patches/default_path.diff b/debian/patches/04_default_path.diff
similarity index 100%
rename from debian/patches/default_path.diff
rename to debian/patches/04_default_path.diff
diff --git a/debian/patches/05_vt7-minimum-vt.diff b/debian/patches/05_vt7-minimum-vt.diff
new file mode 100644
index 0000000..7f4c954
--- /dev/null
+++ b/debian/patches/05_vt7-minimum-vt.diff
@@ -0,0 +1,16 @@
+Description: Always minimum vt to 7
+ maybe this will fix switching vt when installing packages and integration with ubiquity-dm?
+Author: Jonathan Riddell
+Last-Update: 2015-03-11
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -131,7 +131,7 @@
+         string(REGEX REPLACE "[ 	
]+" "" SYSTEMD_SYSTEM_UNIT_DIR ${SYSTEMD_SYSTEM_UNIT_DIR})
+     endif()
+ 
+-    set(MINIMUM_VT 1)
++    set(MINIMUM_VT 7)
+     set(HALT_COMMAND "/bin/systemctl poweroff")
+     set(REBOOT_COMMAND "/bin/systemctl reboot")
+ else()
diff --git a/debian/patches/default_path b/debian/patches/default_path
deleted file mode 100644
index 7442f8a..0000000
--- a/debian/patches/default_path
+++ /dev/null
@@ -1,26 +0,0 @@
-Index: sddm/src/common/Configuration.h
-===================================================================
---- sddm.orig/src/common/Configuration.h	2015-09-03 16:34:21.000000000 +0200
-+++ sddm/src/common/Configuration.h	2015-09-03 16:38:47.953126482 +0200
-@@ -64,7 +64,7 @@
-                                                                                                    "The lowest virtual terminal number that will be used."));
-         );
-         Section(Users,
--            Entry(DefaultPath,         QString,     _S("/bin:/usr/bin:/usr/local/bin"),         _S("Default $PATH"));
-+            Entry(DefaultPath,         QString,     _S("/bin:/usr/bin"),         _S("Default $PATH"));
-             Entry(MinimumUid,          int,         1000,                                       _S("Minimum user id for displayed users"));
-             Entry(MaximumUid,          int,         65000,                                      _S("Maximum user id for displayed users"));
-             Entry(HideUsers,           QStringList, QStringList(),                              _S("Hidden users"));
-Index: sddm/data/man/sddm.conf.rst.in
-===================================================================
---- sddm.orig/data/man/sddm.conf.rst.in	2015-03-27 18:31:11.227839938 +0100
-+++ sddm/data/man/sddm.conf.rst.in	2015-09-03 17:21:35.859661060 +0200
-@@ -91,7 +91,7 @@
- 
- `DefaultPath=`
- 	Default path to set after successfully logging in.
--	Default value is "/bin:/usr/bin:/usr/local/bin".
-+	Default value is "/bin:/usr/bin".
- 
- `MinimumUid=`
- 	Minimum user id of the users to be listed in the
diff --git a/debian/patches/series b/debian/patches/series
index 8ca663d..363788e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,5 @@
-kubuntu_use_breeze.diff
-add-graphical.target.diff
-sddm_systemctl.diff
-default_path.diff
+01_sddm_systemctl.diff
+02_kubuntu_use_breeze.diff
+03_add-graphical.target.diff
+04_default_path.diff
+#05_vt7-minimum-vt.diff

-- 
sddm packaging