[SCM] kcodecs packaging branch, master, updated. debian/5.37.0-2-93-gd165600

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 3c4539d7cc59a3a4eb4686d063e366e4baa69106
Author: Jonathan Riddell <jr at jriddell.org>
Date:   Thu Jul 30 17:44:10 2015 +0200

    Fix debian/copyright
---
 debian/changelog |  8 ++++++--
 debian/copyright | 20 ++++++++------------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index dcbd18e..014447f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,12 @@
-kcodecs (5.12.0-0ubuntu1) UNRELEASED; urgency=medium
+kcodecs (5.12.0-0ubuntu2) UNRELEASED; urgency=medium
 
+  [ Scarlett Clark ]
   * New upstream release
 
- -- Scarlett Clark <sgclark at kubuntu.org>  Fri, 10 Jul 2015 07:58:34 -0700
+  [ Aaron Honeycutt ]
+  * Fix debian/copyright
+
+ -- Aaron Honeycutt <aaronhoneycutt at kubuntu.org>  Thu, 30 Jul 2015 17:35:26 +0200
 
 kcodecs (5.11.0-0ubuntu1) UNRELEASED; urgency=medium
 
diff --git a/debian/copyright b/debian/copyright
index b8c8a56..8fc8811 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -26,11 +26,17 @@ Copyright: 1999, Lars Knoll <knoll at kde.org>
            2001, translate.org.za
 License: LGPL-2+
 
-Files: autotests/*
-Copyright: 2011, Romain Perier <bambi at kubuntu.org>
+Files: COPYING
+       autotests/kcharsetstest.cpp
+       autotests/kcharsetstest.h
+       autotests/kencodingprobertest.cpp
+       autotests/kencodingprobertest.h
+Copyright: 1989-1991, Free Software Foundation, Inc
            2012, Ni Hui <shuizhuyuanluo at 126.com>
+           2011, Romain Perier <bambi at kubuntu.org>
 License: GPL-2+
 
+
 Files: src/probers/*
 Copyright: 1998-2008, <developer at mozilla.org>
            2008, <wkai at gmail.com>
@@ -59,16 +65,6 @@ Copyright: 2014, Daniel Vrátil <dvratil at redhat.com>
            1996-1999, Ronald Tschalär
 License: LGPL-2
 
-Files: COPYING
-       autotests/kcharsetstest.cpp
-       autotests/kcharsetstest.h
-       autotests/kencodingprobertest.cpp
-       autotests/kencodingprobertest.h
-Copyright: 1989-1991, Free Software Foundation, Inc
-           2012, Ni Hui <shuizhuyuanluo at 126.com>
-           2011, Romain Perier <bambi at kubuntu.org>
-License: GPL-2+
-
 Files: po/ca/kcodecs5_qt.po
        po/ca at valencia/kcodecs5_qt.po
        po/uk/kcodecs5_qt.po

-- 
kcodecs packaging