[Pkg-owncloud-commits] [SCM] owncloud-client.git branch, master, updated. upstream/1.2.5+debian-96-gd96f7cb

Tue May 14 03:07:16 UTC 2013

The following commit has been merged in the master branch:
commit d96f7cbc61da52278167bb0c03679e3fedccbea1
Author: Sandro Knauß <bugs at sandroknauss.de>
Date:   Tue May 14 05:05:11 2013 +0200

    Updated copyright file

diff --git a/debian/copyright b/debian/copyright
index 7b8cf89..ed2e4b6 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -12,6 +12,16 @@ Files: debian/*
 Copyright: 2012 Sandro Knauß <bugs at sandroknauss.de>
 License: GPL-2+
 
+Files: src/3rdparty/qtlockedfile/*
+       src/3rdparty/qtsingleapplication/*
+Copyright: 2012 Nokia Corporation and/or its subsidiary(-ies).
+License: LGPL and Nokia-LGPL-Exception
+
+Files: src/mirall/fileutils.cpp
+Copyright: 2009 John Schember <john at nachtimwald.com>
+           Duncan Mac-Vicar P. <duncan at kde.org>
+License: GPL-2+ and BSD
+
 License: GPL-2+
  This program is free software; you can redistribute it and/or
  modify it under the terms of the GNU General Public License
@@ -30,38 +40,7 @@ License: GPL-2+
  On Debian systems a full copy of the GPL 2 can be found at
  /usr/share/common-licenses/GPL-2
 
-Files: cmake/modules/AddAppIconMacro.cmake
-Copyright:  2006-2009 Alexander Neundorf, <neundorf at kde.org>
-            2006, 2007, Laurent Montel, <montel at kde.org>
-            2007 Matthias Kretz <kretz at kde.org>
-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.
-
-Files: src/3rdparty/qtlockedfile/*
-       src/3rdparty/qtsingleapplication/*
-Copyright: 2012 Nokia Corporation and/or its subsidiary(-ies).
-License: LGPL, Nokia Qt LGPL Exception
+License: LGPL
  GNU Lesser General Public License Usage
  .
  This file may be used under the terms of the GNU Lesser General Public
@@ -74,27 +53,13 @@ License: LGPL, Nokia Qt LGPL Exception
  On Debian systems a full copy of the LGPL 2.1 can be found at
  /usr/share/common-licenses/LGPL-2.1
  .
+
+License: Nokia-LGPL-Exception
  In addition, as a special exception, Nokia gives you certain additional
  rights. These rights are described in the Nokia Qt LGPL Exception
  version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 
-Files: src/mirall/fileutils.cpp
-Copyright: 2009 John Schember <john at nachtimwald.com>
-           Duncan Mac-Vicar P. <duncan at kde.org>
-License: GPL-2+ and BSD
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
- .
- This program is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- for more details.
- .
- On Debian systems a full copy of the GPL 2 can be found at
- /usr/share/common-licenses/GPL-2
- .
+License: BSD
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
@@ -148,6 +113,34 @@ License: LGPL
  On Debian systems a full copy of the LGPL 3 can be found at
  /usr/share/common-licenses/LGPL-3
 
+Files: cmake/modules/AddAppIconMacro.cmake
+Copyright:  2006-2009 Alexander Neundorf, <neundorf at kde.org>
+            2006, 2007, Laurent Montel, <montel at kde.org>
+            2007 Matthias Kretz <kretz at kde.org>
+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.
+
 Files: cmake/modules/GNUInstallDirs.cmake
 Copyright: 2011 Nikita Krupen'ko <krnekit at gmail.com> 
            2011 Kitware, Inc.

-- 
owncloud-client.git

