Follow mod_spidermonkey deprecation in debian/

It wasn't supported, and we weren't building it by default as it was.

diff --git a/debian/bootstrap.sh b/debian/bootstrap.sh
index 3d5b7932f5329448b1af738b00e9ce5db104ddde..10e65fae63266541031e49c799eacd8655d7b42a 100755 (executable)
--- a/debian/bootstrap.sh
+++ b/debian/bootstrap.sh
@@ -29,7 +29,6 @@ avoid_mods=(
   endpoints/mod_unicall
   languages/mod_managed
   languages/mod_perl
-  languages/mod_spidermonkey
   languages/mod_v8
   sdk/autotools
   xml_int/mod_xml_ldap
@@ -451,8 +450,6 @@ Recommends:
  freeswitch-music,
  freeswitch-sounds,
  freeswitch-conf-vanilla (= \${binary:Version}),
-Suggests:
- freeswitch-mod-spidermonkey (= \${binary:Version}),
 Description: Cross-Platform Scalable Multi-Protocol Soft Switch
  $(debian_wrap "${fs_description}")
  .

diff --git a/debian/control-modules b/debian/control-modules
index 6178f056f2208532abb294947f4b8150eab88dae..e052b9ab717e2b228b0ecc62c18ff86b7d14e19c 100644 (file)
--- a/debian/control-modules
+++ b/debian/control-modules
@@ -563,11 +563,6 @@ Description: mod_python
  Adds mod_python.
 Build-Depends: python-dev
 
-Module: languages/mod_spidermonkey
-Description: mod_spidermonkey
- Adds mod_spidermonkey.
-Build-Depends: unixodbc-dev
-
 Module: languages/mod_v8
 Description: mod_v8
  Adds mod_v8.

diff --git a/debian/copyright b/debian/copyright
index 1ae957e3e28ddf1ff4485264cbcbc090e4a9baa9..4116090ad66d95848e0aeb21f39264037060e904 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -1593,7 +1593,7 @@ Files: src/mod/endpoints/mod_khomp/commons/base/atomic.hpp
 Copyright: 1998 Doug Rabson
 License: BSD-2-clause
 
-Files: src/mod/languages/mod_spidermonkey/mod_spidermonkey_socket.c
+Files: src/mod/legacy/languages/mod_spidermonkey/mod_spidermonkey_socket.c
 Copyright: 2007, Jonas Gauffin <jonas.gauffin@gmail.com>
 License: MPL-1.1
 

diff --git a/debian/freeswitch-mod-spidermonkey.install.tmpl b/debian/freeswitch-mod-spidermonkey.install.tmpl
deleted file mode 100644 (file)
index cb98d43..0000000
--- a/debian/freeswitch-mod-spidermonkey.install.tmpl
+++ /dev/null
@@ -1,5 +0,0 @@
-/usr/lib/freeswitch/mod/mod_spidermonkey_core_db.so
-/usr/lib/freeswitch/mod/mod_spidermonkey_curl.so
-/usr/lib/freeswitch/mod/mod_spidermonkey_odbc.so
-/usr/lib/freeswitch/mod/mod_spidermonkey_socket.so
-/usr/lib/freeswitch/mod/mod_spidermonkey_teletone.so