[Pkg-owncloud-commits] [SCM] owncloud.git branch, master, updated. upstream/4.0.0-79-g8ddc5b8

[Paul van Tilburg]

The following commit has been merged in the master branch:
commit 8ddc5b8430458d8007f61aef6126d3786f238933
Author: Paul van Tilburg <paulvt at debian.org>
Date:   Sat May 19 21:16:37 2012 +0200

    Tweaked debian/copyright a bit

diff --git a/debian/copyright b/debian/copyright
index 7938a79..fb6ba5d 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -115,23 +115,23 @@ Files: 3rdparty/js/chosen*
        3rdparty/css/chosen*
 Copyright: 2011, Harvest <info at getharvest.com>
 License: Expat
-Comment: Expat license referred to as MIT license
+Comment: Expat license referred to as MIT license.
 
 Files: 3rdparty/fullcalendar/*
 Copyright: 2009, Adam Shaw
            2011, Adam Shaw
 License: Expat or GPL-2
-Comment: Expat license referred to as MIT license
+Comment: Expat license referred to as MIT license.
 
 Files: 3rdparty/timepicker/*
 Copyright: 2010-2011, Francois Gelinas
 License: Expat or GPL-2
-Comment: Expat license referred to as MIT license
+Comment: Expat license referred to as MIT license.
 
 Files: 3rdparty/timepicker/css/include/*.js (FIXME: missing source)
 Copyright: 2011, John Resig
-License: Expat or GPL
-Comment: Expat license referred to as MIT license
+License: Expat or GPL-2
+Comment: Expat license referred to as MIT license.
 
 Files: 3rdparty/timepicker/css/include/jquery.ui*.js (FIXME: missing source, contains Sizzle.js)
 Copyright: 2011, Paul Bakaus (ui.jquery.com)
@@ -159,12 +159,12 @@ Copyright: 2011, Paul Bakaus (ui.jquery.com)
                  Richard D. Worth (rdworth.org)
                  Jörn Zaefferer (bassistance.de)
 License: Expat or GPL-2
-Comment: Expat license referred to as MIT license
+Comment: Expat license referred to as MIT license.
 
 Files: 3rdparty/when/*
 Copyright: 2010, Tomhas Planer <tplaner at gmail.com>
 License: Expat
-Comment: Expat license referred to as MIT license
+Comment: Expat license referred to as MIT license.
 
 Files: 3rdparty/class.phpmailer.php
        3rdparty/class.smtp.php
@@ -236,17 +236,17 @@ Comment: originally under CC-NC-SA-2 but conditions waived by author and
 Files: apps/files/js/jquery.*.js
 Copyright: 2010, Sebastian Tschan
 License: Expat
-Comment: Expat license referred to as MIT license
+Comment: Expat license referred to as MIT license.
 
 Files: apps/files_imageviewer/js/jquery.fancybox-1.3.4.pack.js
 Copyright: 2008-2010, Janis Skarnelis
 License: Expat or GPL-2
-Comment: Expat license referred to as MIT license
+Comment: Expat license referred to as MIT license.
 
 Files: apps/files_imageviewer/js/jquery.mousewheel-3.0.4.pack.js
 Copyright: 2010, Brandon Aaron
 License: Expat
-Comment: Expat license referred to as MIT license
+Comment: Expat license referred to as MIT license.
 
 Files: apps/files_odfviewer/js/webodf*.js
        apps/files_odfviewer/src/webodf/*
@@ -282,7 +282,7 @@ License: AGPL-3+ with HTML-reference exception
 Files: apps/files_pdfviewer/js/pdfjs/*
 Copyright: 2011, Mozilla Foundation
 License: Expat
-Comment: Expat license referred to as MIT license
+Comment: Expat license referred to as MIT license.
 
 Files: apps/files_texteditor/js/aceeditor/*
 Copyright: 2010, Initial Developer, Ajax.org B.V.
@@ -293,7 +293,7 @@ Files: apps/media/js/jQuery.jPlayer.2.1.0.source/*
        apps/media/js/JPlayer.swf
 Copyright: 2009-2011, Happyworm Ltd.
 License: Expat or GPL-2
-Comment: Expat license referred to as MIT license
+Comment: Expat license referred to as MIT license.
 
 Files: apps/remoteStorage/BearerAuth.php
 Copyright: 2007-2011, Rooftop Solutions
@@ -308,23 +308,24 @@ Comment: Taken from http://www.phpclasses.org/browse/file/22469.html and
 Files: apps/user_openid/phpmyid.php
 Copyright: 2006-2008, CJ Niemira <siege at siege.org>
 License: GPL-3
-Comment: License referred to as GNU Public License, but GPL version 3 is linked
+Comment: License referred to as GNU General Public License, but GPL
+  version 3 is linked.
 
 Files: core/js/jquery-*.js
 Copyright: 2005-2011, John Resig, Brandon Aaron & Jörn Zaefferer
 License: Expat or GPL-2
-Comment: Expat license referred to as MIT license
+Comment: Expat license referred to as MIT license.
 
 Files: core/js/jquery-showpassword.js
 Copyright: Jan Jarfalk
 License: Expat
-Comment: Expat license referred to as MIT license
+Comment: Expat license referred to as MIT license.
 
 Files: core/css/jquery-tipsy.css
        core/js/jquery-typsy.js
 Copyright: 2008-2010, Jason Frame <json at onehackoranother.com>
 License: Expat
-Comment: Expat license referred to as MIT license
+Comment: Expat license referred to as MIT license.
 
 Files: core/css/jquery-ui-*.css
        core/js/jquery-ui-*.js
@@ -353,18 +354,18 @@ Copyright: 2011, Paul Bakaus (ui.jquery.com)
                  Richard D. Worth (rdworth.org)
                  Jörn Zaefferer (bassistance.de)
 License: Expat or GPL-2
-Comment: Expat license referred to as MIT license
+Comment: Expat license referred to as MIT license.
 
 Files: core/js/jquery.infieldlabel*.js
 Copyright: 2009, Doug Neiner
 License: Expat or GPL-2
-Comment: Expat license referred to as MIT license
+Comment: Expat license referred to as MIT license.
 
 Files: core/css/jquery.multiselect.css
        core/js/jquery.multiselect.js
 Copyright: 2011, Eric Hynds
 License: Expat or GPL-2
-Comment: Expat license referred to as MIT license
+Comment: Expat license referred to as MIT license.
 
 Files: debian/*
 Copyright: 2011, Thomas Mueller <thomas.mueller at tmit.eu>

-- 
owncloud.git