[SCM] nepomuk-core packaging branch, master, updated. debian/4.10.2-2-7-gef94c73

Maximiliano Curia maxy at alioth.debian.org
Tue May 28 23:24:16 UTC 2013


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

The following commit has been merged in the master branch:
commit 4ae6eb7ac51686af533fe973c1023a4a1f79f647
Author: Maximiliano Curia <maxy at debian.org>
Date:   Fri May 10 16:42:51 2013 +0200

    Update copyright file.
---
 debian/changelog |    1 +
 debian/copyright |   11 +++++++----
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2d48b9d..c801bb8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ nepomuk-core (4:4.10.3-1) UNRELEASED; urgency=low
 
   [ Maximiliano Curia ]
   * Bump Standards-Version to 3.9.4, no further changes needed.
+  * Update copyright file.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 10 May 2013 15:23:17 +0200
 
diff --git a/debian/copyright b/debian/copyright
index 1a39da5..ae9de3d 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -9,6 +9,10 @@ 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
+
+Files: ontologies/*
+Copyright: 2009-2012, Sebastian Trueg <trueg at kde.org>
+           2010, Vishesh Handa <handa.vish at gmail.com>
 License: CC-BY or BSD
 
 Files: libnepomukcore/datamanagement/resourcewatcher.cpp
@@ -357,8 +361,7 @@ License: GPL-2 or GPL-3
  version 3 can be found in the file
  `/usr/share/common-licenses/GPL-3'.
 
-License CC-BY or BSD
-
+License: CC-BY or BSD
  You are free:
   * to Share - to copy, distribute and transmit the work
   * to Remix - to adapt the work
@@ -366,7 +369,7 @@ License CC-BY or BSD
   * 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
@@ -377,7 +380,7 @@ License CC-BY or BSD
   * 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.

-- 
nepomuk-core packaging



More information about the pkg-kde-commits mailing list