[SCM] kjs packaging branch, master, updated. debian/5.37.0-2-88-g3d86386

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/kjs.git;a=commitdiff;h=a8c9d90

The following commit has been merged in the master branch:
commit a8c9d9095f36d755fa2f7cc9671c3db2dccbc28a
Author: Harald Sitter <sitter at kde.org>
Date:   Wed Aug 5 12:18:12 2015 +0200

    try to make lintian happy about copyright
    
    Foo or Bar apparently means that Foo and Bar need to specified on their own
    i.e. Foo or Bar is not a license in of itself.
    the case where this appears here however is in fact an alternation on
    the two, where the files are Foo but partially originally Bar.
    to solve this name the license Foo-partially-Bar to form a new license id
    that actually represents what the license header says, which is that the
    file is one license but parts of it may also be used under another license.
    notable word being *parts* ;)
---
 debian/copyright | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/copyright b/debian/copyright
index d0684ba..24b37c9 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -105,7 +105,7 @@ Files: src/kjs/JSVariableObject.cpp
        src/kjs/JSVariableObject.h
 Copyright: 2007-2008, Apple Inc
            2008, Maksim Orlovich <maksim at kde.org>
-License: BSD-3-clause or LGPL-2+
+License: LGPL-2+-partially-BSD-3-clause
   This library is free software; you can redistribute it and/or
   modify it under the terms of the GNU Library General Public
   License as published by the Free Software Foundation; either

-- 
kjs packaging