[Pkg-owncloud-commits] [SCM] qtkeychain.git branch, master, updated. debian/0.1.0-0r1-13-g9ec2824

[Sandro Knauß]

The following commit has been merged in the master branch:
commit 9ec282408c83ae02841a8049a55bb480b788551f
Author: Sandro Knauß <bugs at sandroknauss.de>
Date:   Mon May 13 00:48:05 2013 +0200

    Updated copyright file

diff --git a/debian/copyright b/debian/copyright
index 993cae2..8cc3af7 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -2,9 +2,15 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: qtkeychain
 Source: https://github.com/frankosterfeld/qtkeychain
 
+Files: debian/*
+Copyright: 2013 Sandro Knauß <bugs at sandroknauss.de>
+License: BSD-2-clause
+
 Files: *
-Copyright: 2011 Frank Osterfeld <frank.osterfeld at gmail.com> 
-License: BSD-3-clause
+Copyright: 2011 Frank Osterfeld <frank.osterfeld at gmail.com>
+License: BSD-2-clause
+
+License: BSD-2-clause
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions
  are met:
@@ -29,27 +35,30 @@ License: BSD-3-clause
 Files: cmake/Modules/GNUInstallDirs.cmake
 Copyright: 2011 Nikita Krupen'ko <krnekit at gmail.com>
    2011 Kitware, Inc.
-License: BSD
- 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: debian/*
-Copyright: 2013 Sandro Knauß <bugs at sandroknauss.de>
-License: GPL-2+
- This package 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.
+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:
  .
- This package 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.
+  * Redistributions of source code must retain the above copyright notice,
+    this list of conditions and the following disclaimer.
  .
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>
+  * 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.
  .
- On Debian systems, the complete text of the GNU General
- Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
-
+  * The names of Kitware, Inc., the Insight Consortium, or the names of
+    any consortium members, or of any contributors, may not be used to
+    endorse or promote products derived from this software without
+    specific prior written permission.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER AND CONTRIBUTORS ``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 AUTHORS OR CONTRIBUTORS 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.

-- 
qtkeychain.git