[SCM] sddm packaging branch, master, updated. debian/0.12.0-1-3-g00edd01

[Matthias Klumpp]

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

The following commit has been merged in the master branch:
commit 00edd01a81553b2797dfbf1dbf17a3f27d6c3931
Author: Matthias Klumpp <matthias at tenstral.net>
Date:   Fri Sep 11 16:29:36 2015 +0200

    Drop some unnecessary patches
    
    Those patches actually didn't do anything with SDDM 0.12 anymore (or in
    case of the .service file patch, never did anything since we don't use
    that file in Debian)
---
 debian/patches/03_add-graphical.target.diff        | 17 -----------------
 ..._vt7-minimum-vt.diff => 03_vt7-minimum-vt.diff} |  0
 debian/patches/04_default_path.diff                | 22 ----------------------
 debian/patches/series                              |  4 +---
 4 files changed, 1 insertion(+), 42 deletions(-)

diff --git a/debian/patches/03_add-graphical.target.diff b/debian/patches/03_add-graphical.target.diff
deleted file mode 100644
index 9f923ab..0000000
--- a/debian/patches/03_add-graphical.target.diff
+++ /dev/null
@@ -1,17 +0,0 @@
-Description: Install 'sddm.service' in 'graphical.target'.
-Author: Elias Probst
-Origin: https://github.com/eliasp/sddm/commit/39d1f816873995dbf46d80c20709827e8ea9806a https://github.com/sddm/sddm/pull/340
-Reviewed-by: Jonathan Riddell
-Last-Update: 2015-03-18
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-Index: sddm-0.11.0/services/sddm.service.in
-===================================================================
---- sddm-0.11.0.orig/services/sddm.service.in
-+++ sddm-0.11.0/services/sddm.service.in
-@@ -11,4 +11,4 @@ Restart=always
- 
- [Install]
- Alias=display-manager.service
--
-+WantedBy=graphical.target
diff --git a/debian/patches/05_vt7-minimum-vt.diff b/debian/patches/03_vt7-minimum-vt.diff
similarity index 100%
rename from debian/patches/05_vt7-minimum-vt.diff
rename to debian/patches/03_vt7-minimum-vt.diff
diff --git a/debian/patches/04_default_path.diff b/debian/patches/04_default_path.diff
deleted file mode 100644
index 6a544ac..0000000
--- a/debian/patches/04_default_path.diff
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/src/common/Configuration.h
-+++ b/src/common/Configuration.h
-@@ -73,7 +73,7 @@
-                                                                                                           "A script to execute when starting the desktop session"));
-         );
-         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,         UID_MIN,                                    _S("Minimum user id for displayed users"));
-             Entry(MaximumUid,          int,         UID_MAX,                                    _S("Maximum user id for displayed users"));
-             Entry(HideUsers,           QStringList, QStringList(),                              _S("Hidden users"));
---- a/data/man/sddm.conf.rst.in
-+++ b/data/man/sddm.conf.rst.in
-@@ -114,7 +114,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 363788e..ffead09 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,3 @@
 01_sddm_systemctl.diff
 02_kubuntu_use_breeze.diff
-03_add-graphical.target.diff
-04_default_path.diff
-#05_vt7-minimum-vt.diff
+03_vt7-minimum-vt.diff

-- 
sddm packaging