[Pkg-owncloud-commits] [owncloud] 01/02: Ditch JSqueeze workaround

[David Prévot]

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

taffit pushed a commit to branch stable8
in repository owncloud.

commit 71fc59eda3a5bda7c3e718b00d1200f894008e50
Author: David Prévot <taffit at debian.org>
Date:   Mon Mar 16 17:34:19 2015 -0400

    Ditch JSqueeze workaround
    
    https://github.com/tchwork/jsqueeze/issues/15 has been fixed.
    
    Git-Dch: Ignore
---
 debian/patches/0008-Fix-JS.patch | 31 -------------------------------
 debian/patches/series            |  1 -
 2 files changed, 32 deletions(-)

diff --git a/debian/patches/0008-Fix-JS.patch b/debian/patches/0008-Fix-JS.patch
deleted file mode 100644
index 02533b3..0000000
--- a/debian/patches/0008-Fix-JS.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From: =?utf-8?q?David_Pr=C3=A9vot?= <taffit at debian.org>
-Date: Thu, 26 Feb 2015 16:50:23 -0400
-Subject: Fix JS
-
-The current minifier provides something broken for it.
----
- apps/files_texteditor/js/vendor/ace/src-noconflict/ace.js | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/apps/files_texteditor/js/vendor/ace/src-noconflict/ace.js b/apps/files_texteditor/js/vendor/ace/src-noconflict/ace.js
-index a1beaab..546f8f0 100644
---- a/apps/files_texteditor/js/vendor/ace/src-noconflict/ace.js
-+++ b/apps/files_texteditor/js/vendor/ace/src-noconflict/ace.js
-@@ -8666,14 +8666,15 @@ var Document = function(text) {
-     this.createAnchor = function(row, column) {
-         return new Anchor(this, row, column);
-     };
--    if ("aaa".split(/a/).length == 0)
-+    if ("aaa".split(/a/).length == 0) {
-         this.$split = function(text) {
-             return text.replace(/\r\n|\r/g, "\n").split("\n");
-         }
--    else
-+    } else {
-         this.$split = function(text) {
-             return text.split(/\r\n|\r|\n/);
-         };
-+    }
- 
- 
-     this.$detectNewLine = function(text) {
diff --git a/debian/patches/series b/debian/patches/series
index 6c9b06c..be16a1c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,4 +5,3 @@ path/0004-Adapt-aws-sdk-path.patch
 path/0005-Adapt-google-api-php-client-path.patch
 path/0006-Adapt-Dropbox-path.patch
 0007-use-JSqueeze-instead-of-JSMin-13052.patch
-0008-Fix-JS.patch

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