[SCM] kidletime packaging branch, kubuntu_wily_archive, updated. debian/5.9.0-1-3-g89b7fb3

[Jonathan Riddell]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/kidletime.git;a=commitdiff;h=b54738c

The following commit has been merged in the kubuntu_wily_archive branch:
commit b54738c5646ce8f3fe46faadd46be25de7867750
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Fri Jan 23 13:47:41 2015 +0100

    Add merge changelog attributes
---
 debian/.gitattributes | 1 +
 debian/changelog      | 1 +
 debian/copyright      | 2 +-
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/debian/.gitattributes b/debian/.gitattributes
new file mode 100644
index 0000000..6a03163
--- /dev/null
+++ b/debian/.gitattributes
@@ -0,0 +1 @@
+changelog merge=dpkg-mergechangelogs
diff --git a/debian/changelog b/debian/changelog
index eb6967b..47dc787 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ kidletime (5.6.0-1~) UNRELEASED; urgency=medium
   * Bump Standards-Version to 3.9.6, no changes needed.
   * Update install files.
   * Update build dependencies to follow cmake.
+  * Update copyright information.
 
  -- Maximiliano Curia <maxy at debian.org>  Fri, 23 Jan 2015 13:05:36 +0100
 
diff --git a/debian/copyright b/debian/copyright
index cf91be0..cfea581 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -15,7 +15,7 @@ License: GPL-2+
 
 Files: debian/*
 Copyright: 2014 Rohan Garg <rohangarg at kubuntu.org>
-License: GPL-2+
+License: LGPL-2
 
 License: GPL-2+
  This package is free software; you can redistribute it and/or modify

-- 
kidletime packaging