[Pkg-mozext-commits] [sieve-extension] 05/06: Replace codemirror copy with symlink to libjs-codemirror (Closes: #738748).

[Michael Fladischer]

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

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

commit 6d8b2f62c3bd2759dc26a5cd269cb406ec5deef0
Author: Michael Fladischer <FladischerMichael at fladi.at>
Date:   Tue Feb 14 15:02:39 2017 +0100

    Replace codemirror copy with symlink to libjs-codemirror (Closes: #738748).
---
 debian/changelog             |  1 +
 debian/control               |  3 ++-
 debian/links                 |  1 +
 debian/rules                 |  2 +-
 debian/xul-ext-sieve.preinst | 14 +++++---------
 5 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3b740e2..9fc0bee 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ sieve-extension (0.2.3h+dfsg-2) UNRELEASED; urgency=medium
   * Use https:// for copyright-format 1.0 URL.
   * Fix URL in Vcs-Git field.
   * Rebuild to also depend on thunderbird (Closes: #852637).
+  * Replace codemirror copy with symlink to libjs-codemirror (Closes: #738748).
 
  -- Michael Fladischer <fladi at debian.org>  Tue, 14 Feb 2017 14:34:06 +0100
 
diff --git a/debian/control b/debian/control
index 7617325..91f7586 100644
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,8 @@ Homepage: http://sieve.mozdev.org/index.html
 
 Package: xul-ext-sieve
 Architecture: all
-Depends: libjs-jquery,
+Depends: libjs-codemirror,
+         libjs-jquery,
          ${misc:Depends},
          ${xpi:Depends}
 Recommends: ${xpi:Recommends}
diff --git a/debian/links b/debian/links
index 133667d..51e315e 100644
--- a/debian/links
+++ b/debian/links
@@ -1 +1,2 @@
 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
diff --git a/debian/rules b/debian/rules
index 17e9800..7933094 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,7 +7,7 @@
 override_dh_auto_install:
 	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
-	rm debian/xul-ext-sieve/usr/share/xul-ext/sieve/chrome/chromeFiles/content/libs/CodeMirror/LICENSE
+	rm -rf debian/xul-ext-sieve/usr/share/xul-ext/sieve/chrome/chromeFiles/content/libs/CodeMirror
 
 .PHONY: override_dh_installchangelogs
 override_dh_installchangelogs:
diff --git a/debian/xul-ext-sieve.preinst b/debian/xul-ext-sieve.preinst
index c9e59e0..d6a1473 100644
--- a/debian/xul-ext-sieve.preinst
+++ b/debian/xul-ext-sieve.preinst
@@ -16,17 +16,13 @@ set -e
 
 case "$1" in
     upgrade)
-    # versions prior to 0.2.3d-1 shipped two symbolic links to integrate
-    # with the package codemirror library; this must be removed before
-    # installing newer versions that # ship it as a directory instead.
-    if [ -h /usr/share/xul-ext/sieve/chrome/chromeFiles/content/libs/CodeMirror/lib ] ; then
-       rm -f /usr/share/xul-ext/sieve/chrome/chromeFiles/content/libs/CodeMirror/lib
-    fi
-    if [ -h /usr/share/xul-ext/sieve/chrome/chromeFiles/content/libs/CodeMirror/theme ] ; then
-       rm -f /usr/share/xul-ext/sieve/chrome/chromeFiles/content/libs/CodeMirror/theme
+    # versions prior to 0.2.3h+dfsg-2 either shipped a copy of codemirror or
+    # symlinks inside the CodeMirror directory. Make sure the directory is
+    # removed so it can be replaces with the symlink.
+    if [ -d /usr/share/xul-ext/sieve/chrome/chromeFiles/content/libs/CodeMirror ] ; then
+      rm -rf /usr/share/xul-ext/sieve/chrome/chromeFiles/content/libs/CodeMirror
     fi
     ;;
-
     install|abort-upgrade)
     ;;
 

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