[Pkg-owncloud-commits] [SCM] owncloud.git branch, master, updated. debian/4.0.8debian-1.5-25-g87e5541
David Prévot
taffit at debian.org
Sat Mar 23 20:23:42 UTC 2013
The following commit has been merged in the master branch:
commit 87e5541139c74cf9495a05e712c0aae3cccafadd
Author: David Prévot <taffit at debian.org>
Date: Sat Mar 23 15:47:43 2013 -0400
Document copyright for new upstream version
diff --git a/debian/copyright b/debian/copyright
index 31fd1cd..447d7bf 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -5,11 +5,11 @@ Source: http://owncloud.org
Files: *
Copyright: 2010-2012, Frank Karlitschek <frank at owncloud.org>
- 2010-2012, Robin Appelman <icewind1991 at gmail.com>
+ 2010-2013, Robin Appelman <icewind1991 at gmail.com>
2010-2012, Jakob Sack <kde at jakobsack.de>
2010-2012, Jan-Christoph Borchardt <JanCBorchardt at fsfe.org>
2010-2013, Michael Gapczynski <mtgap at owncloud.com>
- 2010-2013, Arthur Schiwon <blizzz at arthur-schiwon.de>
+ 2010-2013, Arthur Schiwon <blizzz at owncloud.org>
2010-2012, Bart Visscher <bartv at thisnet.nl>
2010-2012, Georg Ehrke <ownclouddev at georgswebsite.de>
2010-2012, Brice Maron <brice at bmaron.net>
@@ -18,14 +18,16 @@ Copyright: 2010-2012, Frank Karlitschek <frank at owncloud.org>
2010-2012, Florian Pritz
2010-2012, Bartek Przybylski <bart.p.pl at gmail.com>
2011-2012, Thomas Tanghus <thomas at tanghus.net>
+ 2011, Christopher Blum
2012-2013, Victor Dubiniuk <victor.dubiniuk at gmail.com>
2012, Erik Sargent <esthepiking at gmail.com>
2012, Manuel Deglado <manuel.delgado at ucr.ac.cr>
2012, Jörn Dreyer <jfd at butonic.de>
- 2013, Bjoern Schiessle <schiessle at owncloud.com>
- 2013, Thomas Müller
+ 2012, Stefan Herbrechtsmeier <stefan at herbrechtsmeier.net>
+ 2012-2013, Bjoern Schiessle <schiessle at owncloud.com>
+ 2012-2013, Thomas Müller <thomas.mueller at tmit.eu>
2013, Klaas Freitag
- 2013, Sam Tuke <samtuke at owncloud.com>
+ 2012, Sam Tuke <samtuke at owncloud.com>
2013, Simon Birnbach
2013, Lukas Reschke <lukas at statuscode.ch>
2013, Christian Reiner
@@ -429,7 +431,7 @@ Files: apps/files_odfviewer/css/webodf.css
apps/files_odfviewer/js/webodf*.js
apps/files_odfviewer/src/webodf/*
Copyright: 2011, KO GmbH
-License: AGPL-3+ with HTML-reference exception
+License: AGPL-3+-with-HTML-reference-exception
The JavaScript code in this page is free software: you can redistribute
it and/or modify it under the terms of the GNU Affero General Public
License (GNU AGPL) as published by the Free Software Foundation, either
@@ -903,7 +905,19 @@ Files: apps/search_lucene/3rdparty/pdf2text.php
Copyright: 2009, Philip Norton
License: Expat
-Files: core/js/jquery-*.js
+Files: core/doc/admin/_static/*
+ core/doc/user/_static/*
+Copyright: 2007-2011, the Sphinx team
+License: BSD-2-clause
+
+Files: core/doc/admin/_static/bootstrap*
+ core/doc/user/_static/bootstrap*
+Copyright: 2012 Twitter, Inc
+License: Apache-2.0
+
+Files: core/doc/admin/_static/jquery.js
+ core/doc/user/_static/jquery.js
+ 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.
@@ -921,35 +935,11 @@ Comment: Expat license referred to as MIT license.
Files: core/css/jquery-ui-*.css
core/js/jquery-ui-*.js
-Copyright: 2011, Paul Bakaus (ui.jquery.com)
- Brandon Aaron
- David Bolter
- Rich Caloggero
- Chi Cheng (cloudream at gmail.com)
- Colin Clark (http://colin.atrc.utoronto.ca/)
- Michelle D'Souza
- Aaron Eisenberger (aaronchi at gmail.com)
- Ariel Flesler
- Bohdan Ganicky
- Scott González
- Marc Grabanski (m at marcgrabanski.com)
- Klaus Hartl (stilbuero.de)
- Scott Jehl
- Cody Lindley
- Eduardo Lundgren (eduardolundgren at gmail.com)
- Todd Parker
- John Resig
- Patty Toland
- Ca-Phun Ung (yelotofu.com)
- Keith Wood (kbwood at virginbroadband.com.au)
- Maggie Costello Wachs
- Richard D. Worth (rdworth.org)
- Jörn Zaefferer (bassistance.de)
-License: Expat or GPL-2
-Comment: Expat license referred to as MIT license.
+Copyright: 2013, jQuery Foundation and other contributors
+License: Expat
Files: core/js/jquery.infieldlabel*.js
-Copyright: 2009, Doug Neiner
+Copyright: 2009-2010, Doug Neiner
License: Expat or GPL-2
Comment: Expat license referred to as MIT license.
@@ -963,6 +953,10 @@ Files: debian/*
Copyright: 2011, Thomas Mueller <thomas.mueller at tmit.eu>
License: GPL-2+
+Files: lib/connector/sabre/quotaplugin.php
+Copyright: 2012, entreCables S.L.
+License: BSD-3-clause-SabreDAV
+
Files: settings/img/log*
Copyright: 2010, The Noun Project
License: CC-BY-3
diff --git a/debian/rules b/debian/rules
index 442bef5..3070c6b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -27,6 +27,8 @@ override_dh_install:
rm debian/owncloud/usr/share/owncloud/apps/files_texteditor/css/DroidSansMono/Google\ Android\ License.txt
rm debian/owncloud/usr/share/owncloud/apps/files_texteditor/js/aceeditor/LICENSE
rm debian/owncloud/usr/share/owncloud/apps/updater/COPYING-AGPL
+ rm debian/owncloud/usr/share/owncloud/core/js/LICENSE.jquery.inview
+ rm debian/owncloud/usr/share/owncloud/core/js/jquery.inview.txt
rm debian/owncloud/usr/share/owncloud/settings/img/log\ Icon\ License
# Remove other stuff
@@ -47,9 +49,12 @@ override_dh_install:
rm debian/owncloud/usr/share/owncloud/3rdparty/timepicker/releases.txt
rm debian/owncloud/usr/share/owncloud/apps/files_antivirus/README.md
rm debian/owncloud/usr/share/owncloud/apps/updater/README
+ # TODO: build owncloud/core/doc, or drop it
+ rm debian/owncloud/usr/share/owncloud/core/doc/*/_sources
rm debian/owncloud/usr/share/owncloud/core/img/filetypes/readme*.txt
rm debian/owncloud/usr/share/owncloud/core/js/oc-vcategories.txt
rm -r debian/owncloud/usr/share/owncloud/apps/user_ldap/tests
+ # TODO: check if owncloud/l10n is of any use at run time
rm -r debian/owncloud/usr/share/owncloud/l10n/templates # translation templates are not needed to run the app
# Remove unused scripts and sources.
--
owncloud.git
More information about the Pkg-owncloud-commits
mailing list