[Pkg-mozext-commits] [sieve-extension] 11/12: Use embedded CodeMirror instead of the outdated and incomaptible packaged one.

[Michael Fladischer]

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

fladi-guest pushed a commit to branch master
in repository sieve-extension.

commit bdb52b744dd38d146389fda3113710ecefb366b4
Author: Michael Fladischer <FladischerMichael at fladi.at>
Date:   Wed Feb 12 08:44:18 2014 +0100

    Use embedded CodeMirror instead of the outdated and incomaptible packaged one.
---
 debian/control |  2 +-
 debian/links   |  2 --
 debian/rules   | 10 +++-------
 3 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/debian/control b/debian/control
index f26bd24..c0f29d7 100644
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,7 @@ Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-mozext/sieve-extension.git
 
 Package: xul-ext-sieve
 Architecture: all
-Depends: libjs-codemirror, libjs-jquery, ${misc:Depends}, ${xpi:Depends}
+Depends: libjs-jquery, ${misc:Depends}, ${xpi:Depends}
 Recommends: ${xpi:Recommends}
 Enhances: ${xpi:Enhances}
 Provides: ${xpi:Provides}
diff --git a/debian/links b/debian/links
index 8bd29b0..133667d 100644
--- a/debian/links
+++ b/debian/links
@@ -1,3 +1 @@
 usr/share/javascript/jquery/jquery.min.js usr/share/xul-ext/sieve/chrome/chromeFiles/content/libs/jQuery/jquery.min.js
-usr/share/javascript/codemirror usr/share/xul-ext/sieve/chrome/chromeFiles/content/libs/CodeMirror/lib
-usr/share/javascript/codemirror/theme usr/share/xul-ext/sieve/chrome/chromeFiles/content/libs/CodeMirror/theme
diff --git a/debian/rules b/debian/rules
index 7194274..5e40e28 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,14 +5,10 @@
 
 .PHONY: override_dh_auto_install
 override_dh_auto_install:
-	install-xpi -x agpl-3.0.txt -x jquery.js xul-ext-sieve.xpi
+	install-xpi -x agpl-3.0.txt xul-ext-sieve.xpi
 	find debian/xul-ext-sieve/usr/share/xul-ext/sieve/chrome/chromeFiles/content/ -type d -empty -delete
-	# Symlink to packaged libjs-codemirror
-	rm -r debian/xul-ext-sieve/usr/share/xul-ext/sieve/chrome/chromeFiles/content/libs/CodeMirror/lib
-	rm -r debian/xul-ext-sieve/usr/share/xul-ext/sieve/chrome/chromeFiles/content/libs/CodeMirror/theme
-	rm debian/xul-ext-sieve/usr/share/xul-ext/sieve/chrome/chromeFiles/content/libs/CodeMirror/README.md
-	rm debian/xul-ext-sieve/usr/share/xul-ext/sieve/chrome/chromeFiles/content/libs/CodeMirror/package.json
-	rm debian/xul-ext-sieve/usr/share/xul-ext/sieve/chrome/chromeFiles/content/libs/CodeMirror/LICENSE
+	rm debian/xul-ext-sieve/usr/share/xul-ext/sieve/chrome/chromeFiles/content/libs/jQuery/jquery-1.8.3.min.js
+	rm debian/xul-ext-sieve/usr/share/xul-ext/sieve/chrome/chromeFiles/content/libs/libSieveDOM/jquery.js
 
 .PHONY: override_dh_installchangelogs
 override_dh_installchangelogs:

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