[Pkg-owncloud-commits] [SCM] owncloud-client.git branch, master, updated. upstream/1.1.3-11-gb75c871

[Sandro Knauß]

The following commit has been merged in the master branch:
commit b75c871d1008396159d8328e1dcbb4f3729d5948
Author: Sandro Knauß <bugs at sandroknauss.de>
Date:   Sat Dec 15 16:34:39 2012 +0100

    update copyright information

diff --git a/debian/copyright b/debian/copyright
index 45bbb73..515e772 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -68,3 +68,46 @@ License: LGPL 2.1, Nokia Qt 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: doc/*
+License: LGPLv3
+ The HTML Help Project has licensed its software under LGPLv3 terms.
+
+Files: cmake/modules/GNUInstallDirs.cmake
+Copyright: 2011 Nikita Krupen'ko <krnekit at gmail.com> 
+2011 Kitware, Inc.
+License: BSD
+ Distributed under the OSI-approved BSD License (the "License");
+ see accompanying file Copyright.txt for details.
+ .
+ This software is distributed WITHOUT ANY WARRANTY; without even the
+ implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ See the License for more information.
+
+Files: admin/win/nsi/nsis_uac/RunAs.cpp, admin/win/nsi/nsis_uac/uac.cpp, admin/win/nsi/nsis_uac/uac.h
+Copyright: 2007 Anders Kjersem
+License: zlib/libpng license
+ This software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any damages
+ arising from the use of this software.
+ .
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it freely,
+ subject to the following restrictions:
+ .
+ 1. The origin of this software must not be misrepresented; you must not claim
+ that you wrote the original software. If you use this software in a product,
+ an acknowledgment in the product documentation would be appreciated but is not required.
+ .
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+ .
+ 3. This notice may not be removed or altered from any source distribution.
+
+Files: admin/nsi/nsis_processes/*
+Copyright: 2004-2005 Hardwired
+License: 
+ This software binaries and source-code are free for any kind of use, including
+ commercial use. There is no restriction and no guaranty for using this software
+ and/or its source-code. 
If you use the plug-in and/or its source-code, I would
+ appreciate if my name is mentioned.

-- 
owncloud-client.git