[Pkg-owncloud-commits] [owncloud-client] 02/03: Proofread copyright

Tue Feb 25 04:41:38 UTC 2014

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository owncloud-client.

commit a1e41c3f27f09bc39c9e7fdcd4f3d5f55eb371d8
Author: David Prévot <taffit at debian.org>
Date:   Mon Feb 24 19:14:25 2014 -0400

    Proofread copyright
    
    Git-Dch: Ignore
---
 debian/copyright | 75 +++++++++++++++++++++++++++++++++++++++-----------------
 1 file changed, 53 insertions(+), 22 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index f0672ad..61cc2b0 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -46,7 +46,7 @@ Files: src/creds/credentialscommon.*
        src/wizard/owncloudwizardresultpage.*
        cmake/scripts/generate_findpackage_file
        cmake/scripts/generate_lib_file
-Copyright: Cric Bellegarde <gnumdk at gmail.com>
+Copyright: Cédric Bellegarde <gnumdk at gmail.com>
            Daniel Molkentin <danimo at owncloud.com>
            Dominik Schmidt <dev at dominik-schmidt.de>
            Duncan Mac-Vicar P. <duncan at kde.org>
@@ -58,11 +58,11 @@ License: GPL-2+
 Files: src/3rdparty/qtlockedfile/*
        src/3rdparty/qtsingleapplication/*
 Copyright: 2012 Nokia Corporation and/or its subsidiary(-ies)
-License: LGPL-2.1 and Diaga-LGPL-Exception
+License: LGPL-2.1 with Diaga-LGPL-1.1 exception
 
 Files: src/3rdparty/fancylineedit/*
 Copyright: 2013 Digia Plc and/or its subsidiary(-ies)
-License: LGPL-2.1 and Diaga-LGPL-Exception
+License: LGPL-2.1 with Diaga-LGPL-1.1 exception
 
 Files: src/3rdparty/QProgressIndicator/*
 Copyright: 2009-2010 Morgan Leborgne
@@ -76,7 +76,9 @@ Files: csync/*
 Copyright: 2006-2013 Andreas Schneider <asn at cryptomilk.org>
            2012-2013 Klaas Freitag <freitag at owncloud.com>
            2012-2013 Olivier Goffart <ogoffart at woboq.com>
-           1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
+           1995-1997 Peter Mattis
+           1995-1997 Spencer Kimball
+           1995-1997 Josh MacDonald
            2003-2004 Andrew Suffield <asuffield at debian.org>
            2012-2014 Dominik Schmidt <dev at dominik-schmidt.de>
 License: LGPL-2.1+
@@ -89,17 +91,6 @@ License: public-domain
 Files: csync/tests/ownCloud/HTTP/DAV.pm
 Copyright: 1998 Swarthmore College
 License: GPL-1+ or Artistic
- a) the GNU General Public License as published by the Free Software
- Foundation; either version 1, or (at your option) any later version,
- or
- .
- b) the "Artistic License" which comes with perl.
- .
- You will find a copy of the GPL in /usr/share/common-licenses/GPL.
- .
- You will find a copy of the Artistic licence in
- /usr/share/common-licenses/Artistic.
-
 
 Files: doc/*
 Copyright: 2013 The ownCloud developers
@@ -113,6 +104,13 @@ Files: test/*.h
 Copyright: Klaas Freitag <freitag at owncloud.com>
 License: public-domain
 
+Files: doc/scripts/htmlhelp.sh
+       test/manual/favlink/main.cpp
+       test/scripts/torture_create_files.pl
+       test/scripts/torture_gen_layout.pl
+Copyright: Daniel Molkentin <danimo at owncloud.com>
+License: GPL-2
+
 Files: cmake/modules/*
 Copyright:  2006-2010 Alexander Neundorf <neundorf at kde.org>
             2006, 2007 Laurent Montel <montel at kde.org>
@@ -122,7 +120,7 @@ Copyright:  2006-2010 Alexander Neundorf <neundorf at kde.org>
             2006-2013 Andreas Schneider <asn at cryptomilk.org>
             2007 Daniel Gollub <dgollub at suse.de>
             2006 Oswald Buddenhagen <ossi at kde.org>
-            2006-2007  Wengo
+            2006-2007 Wengo
             2005-2009 Kitware, Inc.
             2009-2011 Mathieu Malaterre <mathieu.malaterre at gmail.com>
             2009 Vittorio Giovara <vittorio.giovara at gmail.com>
@@ -138,6 +136,27 @@ Copyright: 2011 Nikita Krupen'ko <krnekit at gmail.com>
            2011 Kitware, Inc.
 License: BSD-3-clause-Kitware
 
+License: Artistic
+ You will find a copy of the Artistic licence in
+ /usr/share/common-licenses/Artistic.
+
+License: GPL-1+
+ 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 1
+ 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.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software Foundation,
+ Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ .
+ On Debian systems a full copy of the GPL 1 can be found at
+ /usr/share/common-licenses/GPL-1
 
 License: GPL-2+
  This program is free software; you can redistribute it and/or
@@ -158,8 +177,6 @@ License: GPL-2+
  /usr/share/common-licenses/GPL-2
 
 License: LGPL-2.1
- GNU Lesser General Public License Usage
- .
  This file may be used under the terms of the GNU Lesser General Public
  License version 2.1 as published by the Free Software Foundation and
  appearing in the file LICENSE.LGPL included in the packaging of this file.
@@ -188,7 +205,6 @@ License: LGPL-2.1+
  On Debian systems a full copy of the LGPL 2.1 can be found at
  /usr/share/common-licenses/LGPL-2.1
 
-
 License: LGPL-3+
  This program is free software: you can redistribute it and/or modify
  it under the terms of the GNU Lesser General Public License as published by
@@ -203,11 +219,14 @@ License: LGPL-3+
  You should have received a copy of the GNU Lesser General Public License
  along with QRecentFilesMenu. If not, see <http://www.gnu.org/licenses/>.
  .
- On Debian systems a full copy of the LGPL 2.1 can be found at
+ On Debian systems a full copy of the LGPL 3 can be found at
  /usr/share/common-licenses/LGPL-3
 
-License: Diaga-LGPL-Exception
- Digia Qt LGPL Exception version 1.1
+License: LGPL-2.1 with Diaga-LGPL-1.1 exception
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License.
  .
  As an additional permission to the GNU Lesser General Public License version
  2.1, the object code form of a "work that uses the Library" may incorporate
@@ -229,6 +248,18 @@ License: Diaga-LGPL-Exception
  .
  Furthermore, you are not required to apply this additional permission to a
  modified version of the Library.
+ .
+ This library 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
+ Lesser General Public License for more details.
+ .
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ .
+ On Debian systems a full copy of the LGPL 2.1 can be found at
+ /usr/share/common-licenses/LGPL-2.1
 
 License: public-domain
  This software is in the public domain, furnished "as is", without technical

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git

