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

[Jonathan Riddell]

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

The following commit has been merged in the kubuntu_vivid_archive branch:
commit 3e7513bc2c66db5150f548e84fdcacab3468b5e0
Author: Jonathan Riddell <jr at jriddell.org>
Date:   Thu Nov 13 16:08:06 2014 +0100

    Replace file data/themes/maldives/maldives.jpg and data/themes/maldives/background.jpg background file with a free image, https://github.com/sddm/sddm/issues/315
---
 debian/changelog | 5 ++++-
 debian/copyright | 9 ++++++---
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5b83d48..4780f18 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,8 @@
-sddm (0.10.0-0ubuntu1) vivid; urgency=medium
+sddm (0.10.0+dfsg1-0ubuntu1) vivid; urgency=medium
 
   * Initial archive upload
+  * Replace file data/themes/maldives/maldives.jpg and
+    data/themes/maldives/background.jpg background file with a free
+    image, https://github.com/sddm/sddm/issues/315
 
  -- Jonathan Riddell <jriddell at ubuntu.com>  Fri, 17 Oct 2014 15:39:42 +0200
diff --git a/debian/copyright b/debian/copyright
index ab80b43..f3d8c1c 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -81,9 +81,12 @@ License: CC-BY-3.0
  Commons, PO Box 1866, Mountain View, CA 94042, USA.
 
 Files: data/themes/maldives/background.jpg
-Copyright: 2013, Dan Grady http://interfacelift.com/user/94340/dan_grady.html
-License: NONFREE
- http://interfacelift.com/website/copyright_policy.php
+Copyright: 2008, Nevit Dilmen, http://commons.wikimedia.org/wiki/User:Nevit
+License: CC-BY-3.0
+ This work is licensed under the Creative Commons Attribution 3.0 Unported
+ License. To view a copy of this license, visit
+ http://creativecommons.org/licenses/by/3.0/ or send a letter to Creative
+ Commons, PO Box 1866, Mountain View, CA 94042, USA.
 
 Files: data/themes/circles/angle-down.png
        data/themes/elarun/angle-down.png

-- 
sddm packaging