[SCM] sddm packaging branch, kubuntu_vivid_archive, updated. 3e123b4aa76041aef09a9468f55b9da0705b5ab1

[Jonathan Riddell]

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

The following commit has been merged in the kubuntu_vivid_archive branch:
commit 3e123b4aa76041aef09a9468f55b9da0705b5ab1
Author: Jonathan Riddell <jr at jriddell.org>
Date:   Wed Mar 18 18:32:41 2015 +0100

    Add upstream_add-graphical.target.diff from upstream
---
 debian/.gitattributes                             |  1 -
 debian/changelog                                  |  6 ++++++
 debian/patches/series                             |  1 +
 debian/patches/upstream_add-graphical.target.diff | 17 +++++++++++++++++
 4 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/debian/.gitattributes b/debian/.gitattributes
deleted file mode 100644
index 6a03163..0000000
--- a/debian/.gitattributes
+++ /dev/null
@@ -1 +0,0 @@
-changelog merge=dpkg-mergechangelogs
diff --git a/debian/changelog b/debian/changelog
index 4878bcd..b97c328 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+sddm (0.11.0-0ubuntu5) vivid; urgency=medium
+
+  * Add upstream_add-graphical.target.diff from upstream
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Wed, 18 Mar 2015 18:31:32 +0100
+
 sddm (0.11.0-0ubuntu4) vivid; urgency=medium
 
   * Add kubuntu_minimum_vt.diff to set minimum vt to 7
diff --git a/debian/patches/series b/debian/patches/series
index 9ba3b6e..5153474 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 kubuntu_use_breeze.diff
 kubuntu_dbus-config-rename.diff
 kubuntu_minimum_vt.diff
+upstream_add-graphical.target.diff
diff --git a/debian/patches/upstream_add-graphical.target.diff b/debian/patches/upstream_add-graphical.target.diff
new file mode 100644
index 0000000..5d6d0ec
--- /dev/null
+++ b/debian/patches/upstream_add-graphical.target.diff
@@ -0,0 +1,17 @@
+Description: Install 'sddm.service' in 'graphical.target'.
+Author: Elias Probst
+Origin: upstream, 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

-- 
sddm packaging