[Pkg-owncloud-commits] [owncloud-client] 03/05: Updated debian/copyright

Sandro Knauß hefee-guest at moszumanska.debian.org
Sat Feb 8 15:10:04 UTC 2014


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

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

commit 102770c2d21e4dd3f81da124074a12a8f65a324e
Author: Sandro Knauß <bugs at sandroknauss.de>
Date:   Sat Feb 8 15:05:01 2014 +0100

    Updated debian/copyright
---
 debian/copyright | 130 +++++++++++++++++++++++++++----------------------------
 1 file changed, 65 insertions(+), 65 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index 3494058..1b76a8a 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,15 +4,11 @@ Upstream-Contact: Klaas Freitag <freitag at owncloud.com>
 Source: http://owncloud.org/sync-clients/
 
 Files: *
-Copyright: 2011 Duncan Mac-Vicar P. <duncan at kde.org>
+Copyright: Daniel Molkentin <danimo at owncloud.com>
            2011-2013 Klaas Freitag <freitag at owncloud.com>
-           Daniel Molkentin <danimo at owncloud.com>
-           Markus Goetz <markus at woboq.com>
-           Cédric Bellegarde <gnumdk at gmail.com>
            Krzesimir Nowak <krzesimir at endocode.com>
-           Olivier Goffart <ogoffart at owncloud.com>
-           Dominik Schmidt <dev at dominik-schmidt.de>
-License: GPL-2+
+           Markus Goetz <markus at woboq.com>
+License: GPL-2
 
 Files: debian/*
 Copyright: 2012 Sandro Knauß <bugs at sandroknauss.de>
@@ -20,51 +16,48 @@ License: GPL-2+
 
 Files: src/creds/credentialscommon.*
        src/creds/httpcredentials.*
-       src/mirall/inotify.*
+       src/main.cpp
+       src/mirall/application.*
+       src/mirall/csyncthread.*
+       src/mirall/folder.*
+       src/mirall/folderman.*
+       src/mirall/folderstatusmodel.*
+       src/mirall/folderwizard.*
+       src/mirall/logbrowser.*
+       src/mirall/logger.*
+       src/mirall/mirallconfigfile.*
+       src/mirall/networkjobs.*
+       src/mirall/owncloudpropagator.*
+       src/mirall/owncloudpropagator_p.h
+       src/mirall/owncloudsetupwizard.*
+       src/mirall/owncloudtheme.*
+       src/mirall/socketapi.*
+       src/mirall/sslerrordialog.*
+       src/mirall/syncresult.*
+       src/mirall/systray.*
+       src/mirall/theme.*
+       src/owncloudcmd/owncloudcmd.cpp
+       src/updater/ocupdater.*
+       src/wizard/owncloudadvancedsetuppage.*
+       src/wizard/owncloudhttpcredspage.*
+       src/wizard/owncloudsetuppage.*
+       src/wizard/owncloudwizardcommon.*
+       src/wizard/owncloudwizard.*
+       src/wizard/owncloudwizardresultpage.*
        cmake/scripts/generate_findpackage_file
        cmake/scripts/generate_lib_file
-Copyright: Klaas Freitag <freitag at owncloud.com>
+Copyright: Cric 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>
+           Klaas Freitag <freitag at owncloud.com>
            Krzesimir Nowak <krzesimir at endocode.com>
+           Olivier Goffart <ogoffart at owncloud.com>
            Ashish Shukla
            2006 Alexander Neundorf <neundorf at kde.org>
            2006 Andreas Schneider <asn at cryptomilk.org>
 License: GPL-2+
 
-Files: src/creds/abstractcredentials.h
-       src/creds/credentialsfactory.*
-       src/creds/dummycredentials.*
-       src/creds/shibbolethcredentials.*
-       src/creds/shibboleth/*
-       src/creds/http/*
-       src/mirall/account.*
-       src/mirall/accountsettings.*
-       src/mirall/connectionvalidator.*
-       src/mirall/generalsettings.*
-       src/mirall/ignorelisteditor.*
-       src/mirall/mirallaccessmanager.*
-       src/mirall/networksettings.*
-       src/mirall/owncloudgui.*
-       src/mirall/progressdispatcher.*
-       src/mirall/protocolwidget.*
-       src/mirall/quotainfo.*
-       src/mirall/settingsdialog.*
-       src/mirall/syncfileitem.h
-       src/mirall/syncjournaldb.*
-       src/mirall/syncjournalfilerecord.*
-       src/mirall/utility*
-       src/wizard/abstractcredswizardpage.h
-       src/wizard/owncloudshibbolethcredspage.*
-Copyright: Klaas Freitag <freitag at owncloud.com>
-           Daniel Molkentin <danimo at owncloud.com>
-           Krzesimir Nowak <krzesimir at endocode.com>
-License: GPL-2
-
-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 Expat
-
 Files: src/3rdparty/qtlockedfile/*
        src/3rdparty/qtsingleapplication/*
 Copyright: 2012 Nokia Corporation and/or its subsidiary(-ies)
@@ -78,7 +71,7 @@ Files: src/3rdparty/QProgressIndicator/*
 Copyright: 2009-2010 Morgan Leborgne
 License: LGPL-3+
 
-Files: src/3rdparty/csync/c_jhash.h
+Files: csync/src/std/c_jhash.h
 Copyright: 1997 Bob Jenkins <bob_jenkins at burtleburtle.net>
 License: public-domain
 
@@ -86,6 +79,13 @@ Files: src/3rdparty/qjson/*
 Copyright: 2011 Eeli Reilin <eeli at emicode.fi>
 License: BSD-2-clause
 
+Files: csync/*
+Coyright:  Andreas Schneider <asn at cryptomilk.org>
+           Klaas Freitag <freitag at owncloud.com>
+           Olivier Goffart <ogoffart at woboq.com>
+           1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
+License: LGPL-2.1+
+
 Files: doc/*
 Copyright: 2013 The ownCloud developers
 License: CC-BY-3.0
@@ -112,10 +112,10 @@ Copyright: 2005-2009 Kitware, Inc.
            2010-2012 Andreas Schneider <asn at cryptomilk.org>
            2009-2011 Mathieu Malaterre <mathieu.malaterre at gmail.com>
            2006 Alexander Neundorf <neundorf at kde.org>
-	   2009 Vittorio Giovara <vittorio.giovara at gmail.com>
+           2009 Vittorio Giovara <vittorio.giovara at gmail.com>
 License: 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.
@@ -185,6 +185,25 @@ 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-2.1+
+ 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, or (at your option) any later version.
+ .
+ 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: 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
@@ -226,25 +245,6 @@ License: Diaga-LGPL-Exception
  Furthermore, you are not required to apply this additional permission to a
  modified version of the Library.
 
-License: Expat
- 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
- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- copies of the Software, and to permit persons to whom the Software is
- furnished to do so, subject to the following conditions:
- .
- The above copyright notice and this permission notice shall be included in
- all copies or substantial portions of the Software.
- .
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- THE SOFTWARE
-
 License: public-domain
  This software is in the public domain, furnished "as is", without technical
  support, and with no warranty, express or implied, as to its usefulness for

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



More information about the Pkg-owncloud-commits mailing list