[Pkg-owncloud-commits] [SCM] owncloud-client.git branch, master, updated. upstream/1.1.4-31-g705f6c5

[Sandro Knauß]

The following commit has been merged in the master branch:
commit 705f6c5bffbbbc3ae46af265bae028663ce44574
Author: Sandro Knauß <bugs at sandroknauss.de>
Date:   Sun Feb 3 00:29:27 2013 +0100

    remove syntax erros in copyright file

diff --git a/debian/copyright b/debian/copyright
index 7792a40..acd373f 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,11 +1,11 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: csync
+Upstream-Name: mirall
 Upstream-Contact: Klaas Freitag <freitag at owncloud.com>
 Source: http://owncloud.org/dev/sync-clients/linux-build/
 
 Files: *
 Copyright: 2011 Duncan Mac-Vicar P. <duncan at kde.org>
- 2011-2012 Klaas Freitag <freitag at owncloud.com>
+           2011-2012 Klaas Freitag <freitag at owncloud.com>
 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
@@ -25,10 +25,9 @@ License: GPL-2+
  /usr/share/common-licenses/GPL-2
 
 Files: cmake/modules/AddAppIconMacro.cmake
-Copyright: 
- Copyright (c) 2006-2009 Alexander Neundorf, <neundorf at kde.org>
- Copyright (c) 2006, 2007, Laurent Montel, <montel at kde.org>
- Copyright (c) 2007 Matthias Kretz <kretz at kde.org>
+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
@@ -53,7 +52,8 @@ License: BSD-3-Clause
  (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/*
+Files: src/3rdparty/qtlockedfile/*
+       src/3rdparty/qtsingleapplication/*
 Copyright: 2012 Nokia Corporation and/or its subsidiary(-ies).
 License: LGPL 2.1, Nokia Qt LGPL Exception
  GNU Lesser General Public License Usage
@@ -70,12 +70,13 @@ License: LGPL 2.1, Nokia Qt LGPL Exception
  version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 
 Files: doc/*
+Copyright: 2012 The ownCloud developers
 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.
+           2011 Kitware, Inc.
 License: BSD
  Distributed under the OSI-approved BSD License (the "License");
  see accompanying file Copyright.txt for details.

-- 
owncloud-client.git