[SCM] korundum packaging branch, master, updated. debian/4.11.3-1-7-ge986ba7

[Cédric Boutillier]

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

The following commit has been merged in the master branch:
commit d04d0c47ed2001b2b1679ac5bd990cd8456972dc
Author: Cédric Boutillier <boutil at debian.org>
Date:   Tue Dec 10 16:14:38 2013 +0100

    modules/soprano/examples/soprano_util/soprano_util.rb is BSD-2-clause
---
 debian/changelog |  6 ++++--
 debian/copyright | 43 +++++++++++++++++++++++--------------------
 2 files changed, 27 insertions(+), 22 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 126bb37..1cedeb4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-korundum (4:4.11.3-2) UNRELEASED; urgency=low
+korundum (4:4.11.3-2) unstable; urgency=low
 
   * Build against default Ruby version (Closes: #723634).
   * Add myself to uploaders.
@@ -7,8 +7,10 @@ korundum (4:4.11.3-2) UNRELEASED; urgency=low
   * Use Ruby vendor directories to install as per Ruby policy.
   * Increase minimal version of libqtruby4shared-dev in Build-Depends to
     ensure ruby1.9 support.
+  * License for modules/soprano/examples/soprano_util/soprano_util.rb precised
+    to BSD-2-clause (confirmation from Olivier Berger).
 
- -- Cédric Boutillier <boutil at debian.org>  Tue, 03 Dec 2013 07:50:02 +0100
+ -- Cédric Boutillier <boutil at debian.org>  Tue, 10 Dec 2013 16:14:50 +0100
 
 korundum (4:4.11.3-1) unstable; urgency=low
 
diff --git a/debian/copyright b/debian/copyright
index 7f137b8..5f14b1c 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -49,25 +49,6 @@ Files: modules/plasma/tools/plasmoidviewer/fullview.rb
 Copyright: 2007, Frerich Raabe <raabe at kde.org>
            2007, Aaron Seigo <aseigo at kde.org
 License: BSD-2-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.
- .
- 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
 
 Files: modules/soprano/activerdf-soprano/*
 Copyright: Richard Dale <richard.j.dale at gmail.com>
@@ -79,7 +60,7 @@ License: LGPL-2.1+
 Files: modules/soprano/examples/soprano_util/soprano_util.rb
 Copyright: 2009, Olivier Berger + Institut Télécom
            2009, Richard Dale
-License: BSD
+License: BSD-2-clause
 
 Files: templates/*
 Copyright: 2003, Jim Bublitz
@@ -171,3 +152,25 @@ License: GPL-2+
  On Debian systems, the complete texts of the GNU General Public Licenses
  version 2 and 3 can be found in `/usr/share/common-licenses/GPL-2' and
  `/usr/share/common-licenses/GPL-3'.
+
+License: BSD-2-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.
+ .
+ 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
+

-- 
korundum packaging