[SCM] kiten packaging branch, master, updated. debian/4.7.4-2-6-gb0a006f

[Pino Toscano]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/kiten.git;a=commitdiff;h=b0a006f

The following commit has been merged in the master branch:
commit b0a006f6a6e5a5f855113d4775b1463633525a06
Author: Pino Toscano <pino at debian.org>
Date:   Sat Jun 16 12:33:12 2012 +0200

    copyright: convert to copyright-format v1.0, update
---
 debian/changelog |    1 +
 debian/copyright |   34 +++++++++++++++++++++++++++++++++-
 2 files changed, 34 insertions(+), 1 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 990bf60..e0e5037 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ kiten (4:4.8.4-0r1) UNRELEASED; urgency=low
   * Bump kdelibs5-dev build dependency to 4.8.
   * Bump Standards-Version to 3.9.3, no changes required.
   * Add watch file.
+  * Convert copyright to copyright-format v1.0 and update.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 16 Jun 2012 12:20:40 +0200
 
diff --git a/debian/copyright b/debian/copyright
index 243ced2..75d8f95 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,4 +1,4 @@
-Format: http://dep.debian.net/deps/dep5
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: kiten
 Source: http://projects.kde.org/projects/kde/kdeedu/kiten
 
@@ -7,13 +7,16 @@ Copyright: 2001, Jason Katz-Brown <jason at katzbrown.com>
            2005, Paul Temple <paul.temple at gmx.net>
            2006, Joseph Kerian <jkerian at gmail.com>
            2006, Eric Kjeldergaard <kjelderg at gmail.com>
+           2011, Daniel E. Moctezuma <democtezuma at gmail.com>
 License: GPL-2+
 
 Files: lib/*
        radselect/*
+       kanjibrowser/*
 Copyright: 2001, Jason Katz-Brown <jason at katzbrown.com>
            2006, 2008, Joseph Kerian <jkerian at gmail.com>
            2006, Eric Kjeldergaard <kjelderg at gmail.com>
+           2011, Daniel E. Moctezuma <democtezuma at gmail.com>
 License: LGPL-2+
 
 Files: radselect/radselectprefdialog.ui
@@ -241,8 +244,13 @@ License:
  [4] Jim.Breen at infotech.monash.edu.au
  [5] http://www.kanji.org/kanji/dictionaries/skip_permission.htm
 
+Files: data/fonts/KanjiStrokeOrders.ttf
+Copyright: 2004-2008 Ulrich Apel, the AAAA project and the Wadoku project
+License: BSD-3-clause
+
 Files: doc/index.docbook
 Copyright: 2002, Jason Katz-Brown <jason at katzbrown.com>
+           2012, Daniel E. Moctezuma <democtezuma at gmail.com>
 License: GFDL-NIV-1.2+
 
 Files: debian/*
@@ -305,3 +313,27 @@ License: GPL-2+
  version 2 and 3 can be found in `/usr/share/common-licenses/GPL-2' and
  `/usr/share/common-licenses/GPL-3'.
 
+License: BSD-3-clause
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+ .
+ 1. Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in the
+    documentation and/or other materials provided with the distribution.
+ 3. Neither the name of the author may be used to endorse or promote products
+    derived from this software without specific prior written permission.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+

-- 
kiten packaging