[Pkg-owncloud-commits] [owncloud] 04/09: Update packaging to latest ace path

[David Prévot]

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

taffit pushed a commit to branch master
in repository owncloud.

commit 6f665c048309541e28788221710ce0d6347dfb88
Author: David Prévot <taffit at debian.org>
Date:   Fri Sep 6 17:05:46 2013 -0400

    Update packaging to latest ace path
    
    Git-Dch: Ignore
---
 debian/copyright |   14 +++++++-------
 debian/rules     |    1 -
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index 55725d5..d67d785 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -896,7 +896,7 @@ Files: apps/files_texteditor/css/DroidSansMono/*
 Copyright: 2006, 2008, The Android Open Source Project
 License: Apache-2.0
 
-Files: apps/files_texteditor/js/aceeditor/*
+Files: apps/files_texteditor/js/vendor/ace/src-noconflict/*
 Copyright: 2010, 2012, 2013 Ajax.org B.V.
            2013, Matthew Christopher Kastor-Inare III, Atropa Inc. Intl
 License: BSD-3-clause-Ajax
@@ -925,16 +925,16 @@ License: BSD-3-clause-Ajax
  (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
+Files: apps/files_texteditor/js/vendor/ace/src-noconflict/mode-r.js
+       apps/files_texteditor/js/vendor/ace/src-noconflict/mode-rdoc.js
+       apps/files_texteditor/js/vendor/ace/src-noconflict/mode-rhtml.js
+       apps/files_texteditor/js/vendor/ace/src-noconflict/mode-tex.js
 Copyright: 2009-2011, RStudio, Inc.
            2010, Initial Developer, Ajax.org B.V.
 License: AGPL-3+
 
-Files: apps/files_texteditor/js/aceeditor/theme-ambiance.js
-       apps/files_texteditor/js/aceeditor/theme-chaos.js
+Files: apps/files_texteditor/js/vendor/ace/src-noconflict/theme-ambiance.js
+       apps/files_texteditor/js/vendor/ace/src-noconflict/theme-chaos.js
 Copyright: 2011 Irakli Gozalishvili
 License: Expat
 Comment: Expat license referred to as BSD license.
diff --git a/debian/rules b/debian/rules
index 3cfbf92..dbfb5a8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -23,7 +23,6 @@ override_dh_install:
 	rm debian/owncloud/usr/share/owncloud/apps/files_external/3rdparty/irodsphp/prods/src/LICENSE.txt
 	rm debian/owncloud/usr/share/owncloud/apps/files_pdfviewer/3rdparty/pdfjs/LICENSE
 	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

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