[SCM] kde-dev-scripts packaging branch, master, updated. 0e8c96499017a193dc8afb64803cd16557d69071

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/kde-dev-scripts.git;a=commitdiff;h=0e8c964

The following commit has been merged in the master branch:
commit 0e8c96499017a193dc8afb64803cd16557d69071
Author: Maximiliano Curia <maxy at debian.org>
Date:   Thu Sep 26 15:40:40 2013 +0200

    Update debian/copyright.
---
 debian/changelog |    1 +
 debian/copyright |   14 +++++++++++++-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index aa3d69d..2ec6f4a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
 kde-dev-scripts (4:4.11.1-0r0) UNRELEASED; urgency=low
 
   * First release of kdesdk after being split by upstream.
+  * Update debian/copyright.
 
  -- Maximiliano Curia <maxy at debian.org>  Sun, 22 Sep 2013 17:12:32 +0200
diff --git a/debian/copyright b/debian/copyright
index 873cf74..669e67d 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -150,12 +150,24 @@ License: BSD-2-clause
  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-Files: kde-dev-scripts/svnintegrate
+Files: svnintegrate
 Copyright: 2006, Thiago Macieira <thiago at kde.org>
 License: Artistic
  On Debian systems, the complete text of the "Artistic License" can be
  found in "/usr/share/common-licenses/Artistic"
 
+Files: kde-emacs/kde-emacs-tips.texi
+Copyright: 2002, Zack Rusin and KDE Development Team
+License: GFDL-1.3+
+ Permission is granted to copy, distribute and/or modify this document
+ under the terms of the GNU Free Documentation License, Version 1.3
+ or any later version published by the Free Software Foundation;
+ with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
+ A copy of the license is included in the section entitled.
+ .
+ On Debian systems, the complete text of the GNU Free Documentation License
+ version 1.3 can be found in "/usr/share/common-licenses/GFDL-1.3"
+
 Files: debian/*
 Copyright: 2007-2013, Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 License: GPL-2+

-- 
kde-dev-scripts packaging