[Pkg-owncloud-commits] [SCM] owncloud.git branch, master, updated. debian/4.0.8debian-1.6-68-g5e4d108

Tue Apr 2 00:35:04 UTC 2013

The following commit has been merged in the master branch:
commit 81625ae56d0c73370dc01736d4f40fa2714f3bcc
Author: David Prévot <taffit at debian.org>
Date:   Mon Apr 1 19:10:39 2013 -0400

    Update changelog, copyright and rules

diff --git a/debian/changelog b/debian/changelog
index b93d272..8d55890 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,6 @@
-owncloud (5.0.0+dfsg-1) UNRELEASED; urgency=low
+owncloud (5.0.1+dfsg-1) UNRELEASED; urgency=low
 
-  * New upstream release (closes: #691839)
+  * New upstream release (closes: #691839, #692627)
 
   [ David Prévot ]
   * debian/watch: Update to current upstream URL and Debian version
diff --git a/debian/copyright b/debian/copyright
index 563c100..9b105d9 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -855,31 +855,40 @@ Copyright: 2006, 2008, The Android Open Source Project
 License: Apache-2.0
 
 Files: apps/files_texteditor/js/aceeditor/*
-Copyright: 2010, Initial Developer, Ajax.org B.V.
-License: MPL-1.1 or GPL-2+ or LGPL-3
-
-Files: apps/files_texteditor/js/aceeditor/worker-javascript.js
-Copyright: 2009-2011, Kris Kowal
-           2009-2010, Tom Robinson
-           2010, Daniel Friesen
-           2010, Florian Schäfer
-           2010, Irakli Gozalishvili
-           2009, 280 North Inc. http://280north.com/
-           2011, Kit Cambridge
-           Sasha Koss
-           Bryan Forbes
-           2011, Quildreen Motta
-           2011, Michael Ficarra
-           2011, Gerard Paapu
-           2011, Brendan Molloy
-           iwyg
-           2011, Domenic Denicola
-           Montillet Xavier
-           2010, Sami Samhuri
-           2011, Rick Waldron
-           Alexey Zakharov
-           2004-2010, the Initial Developer
-License: Expat and XXX and BSD-3-clause and PD and (MPL-1.1 or GPL-2 or LGPL-2.1) and Evil
+Copyright: 2010, 2012 Ajax.org B.V.
+License: BSD-3-clause-Ajax
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
+ .
+ * Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+ .
+ * Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+ .
+ * Neither the name of Ajax.org B.V. nor the
+   names of its contributors may be used to endorse or promote products
+   derived from this software without specific prior written permission.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ DISCLAIMED. IN NO EVENT SHALL AJAX.ORG B.V. BE LIABLE FOR ANY
+ DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (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: apps/files_texteditor/js/aceeditor/mode-r.js
+       apps/files_texteditor/js/aceeditor/mode-rdoc.js
+       apps/files_texteditor/js/aceeditor/mode-rhtml.js
+       apps/files_texteditor/js/aceeditor/mode-tex.js
+Copyright: 2009-2011, RStudio, Inc.
+           2010, Initial Developer, Ajax.org B.V.
+License: AGPL-3+
 
 Files: apps/files_videoviewer/js/*
        apps/files_videoviewer/mediaelement/*
@@ -896,11 +905,11 @@ Files: apps/impress/js/impress.js
 Copyright: 2012, Bartek Szopka
 License: Expat
 
-Files: apps/media/js/jQuery.jPlayer.2.1.0.source/*
+Files: apps/media/js/jQuery.jPlayer.2.2.0.source/*
        apps/media/js/jquery.jplayer.min.js
        apps/media/js/JPlayer.swf
-Copyright: 2009-2011, Happyworm Ltd.
-License: Expat or GPL-2
+Copyright: 2009-2012, Happyworm Ltd.
+License: Expat or GPL-3
 Comment: Expat license referred to as MIT license.
 
 Files: apps/search_lucene/3rdparty/Zend/*
diff --git a/debian/rules b/debian/rules
index 700443d..6b888ea 100755
--- a/debian/rules
+++ b/debian/rules
@@ -94,13 +94,8 @@ override_dh_install:
 	# Move the MDB2 Sqlite driver to owncloud-sqlite.
 	mv debian/owncloud/usr/share/owncloud/lib/MDB2 debian/owncloud-sqlite/usr/share/php # php-mdb2-driver-sqlite (not yet)
 
-	# Minify ace in app_texteditor
-	find debian/owncloud/usr/share/owncloud/apps/files_texteditor/js/aceeditor -type f | grep -v 'ace-uncompressed' | xargs -exec rm
-	yui-compressor --type js debian/owncloud/usr/share/owncloud/apps/files_texteditor/js/aceeditor/ace-uncompressed.js -o debian/owncloud/usr/share/owncloud/apps/files_texteditor/js/aceeditor/ace.js
-	rm debian/owncloud/usr/share/owncloud/apps/files_texteditor/js/aceeditor/ace-uncompressed.js
-
 	# Clean up the media app so that jquery-jplayer and zenframework be linked.
-	rm -r debian/owncloud/usr/share/owncloud/apps/media/js/jQuery.jPlayer.2.1.0.source
+	rm -r debian/owncloud/usr/share/owncloud/apps/media/js/jQuery.jPlayer.2.2.0.source
 	rm debian/owncloud/usr/share/owncloud/apps/media/js/Jplayer.swf
 	rm debian/owncloud/usr/share/owncloud/apps/media/js/jquery.jplayer.min.js
 	rm -r debian/owncloud/usr/share/owncloud/apps/search_lucene/3rdparty/Zend

-- 
owncloud.git

