[SCM] nepomuk-core packaging branch, master, updated. debian/4.10.2-1-3-ge2b0217

[Sune Vuorela]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/nepomuk-core.git;a=commitdiff;h=28c582d

The following commit has been merged in the master branch:
commit 28c582df14f48165aaf640e67868d5845c10e692
Author: Sune Vuorela <sune at vuorela.dk>
Date:   Wed Apr 3 20:49:08 2013 +0000

    Update copyright file based on comments from ftp-master
---
 debian/changelog |    2 +-
 debian/copyright |   33 +++++++++++++++++++++++++++++++++
 2 files changed, 34 insertions(+), 1 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 22d6983..e6f3c89 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,6 @@
 nepomuk-core (4:4.10.2-2) UNRELEASED; urgency=low
 
-  * 
+  * Update copyright file based on comments from ftp-master
 
  -- Sune Vuorela <sune at debian.org>  Wed, 03 Apr 2013 20:48:15 +0000
 
diff --git a/debian/copyright b/debian/copyright
index af72646..1a39da5 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -9,6 +9,7 @@ Copyright: 2010,2011 Vishesh Handa <handa.vish at gmail.com>
            2010      Dario Freddi <drf at kde.org>
            2011      Serebriyskiy Artem <v.for.vandal at gmail.com>
 License: LGPL-2.1 or LGPL-3
+License: CC-BY or BSD
 
 Files: libnepomukcore/datamanagement/resourcewatcher.cpp
        libnepomukcore/datamanagement/resourcewatcher.h
@@ -355,3 +356,35 @@ License: GPL-2 or GPL-3
  The full text of the GNU General Public License
  version 3 can be found in the file
  `/usr/share/common-licenses/GPL-3'.
+
+License CC-BY or BSD
+
+ You are free:
+  * to Share - to copy, distribute and transmit the work
+  * to Remix - to adapt the work
+ Under the following conditions:
+  * Attribution - You must attribute the work in the manner specified by the author
+    or licensor (but not in any way that suggests that they endorse you or your use
+    of the work).
+
+ Redistribution and use in source and binary forms, with or without modification,
+ are permitted provided that the following conditions are met:
+  * Redistributions of source code must retain the above copyright notice, this
+    list of conditions and the following disclaimer.
+  * 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.
+  * Neither the names of the authors nor the names of contributors may
+    be used to endorse or promote products derived from this ontology without
+    specific prior written permission.
+
+ THIS ONTOLOGY 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 ONTOLOGY, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

-- 
nepomuk-core packaging