[SCM] kajongg packaging branch, master, updated. debian/4.13.1-1-64-gc3f069c

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 7d434642500940ea26b7927769e2747e71217cbe
Author: Jonathan Riddell <jriddell at ubuntu.com>
Date:   Sat Dec 22 18:52:13 2012 +0000

    Add kubuntu_01_licence_file.diff from upstream
---
 debian/changelog |  1 +
 debian/copyright | 28 ++++++++++++++++++++++++++++
 2 files changed, 29 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index e9ac5d4..c4b0484 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ kajongg (4:4.9.95-0ubuntu1) raring; urgency=low
   * Install to /usr/games
   * Version dependency on kdegames-data
   * New upstream RC release
+  * Add kubuntu_01_licence_file.diff from upstream
 
  -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 18 Dec 2012 23:15:58 +0000
 
diff --git a/debian/copyright b/debian/copyright
index 2e9c6a0..893e35f 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -18,6 +18,34 @@ Files: debian/*
 Copyright: 2012 Jonathan Riddell <jriddell at ubuntu.com>
 License: GPL-2+
 
+Files: cmake-modules/*
+Copyright: 2010 Wolfgang Rohdewald <wolfgang at rohdewald.de>
+License: BSD-3-clause
+
+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 copyright
+    notice, this list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the copyright
+    notice, this list of conditions and the following disclaimer in the
+    documentation and/or other materials provided with the distribution.
+ 3. The name of the author may not 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.
+
 License: GPL-2+
  This package is free software; you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by

-- 
kajongg packaging