From b54ba38255792a4a9c39aa130852b0949e680735 Mon Sep 17 00:00:00 2001 From: Travis Cross Date: Wed, 26 Mar 2014 18:15:33 +0000 Subject: [PATCH] Follow mod_spidermonkey deprecation in debian/ It wasn't supported, and we weren't building it by default as it was. --- debian/bootstrap.sh | 3 --- debian/control-modules | 5 ----- debian/copyright | 2 +- debian/freeswitch-mod-spidermonkey.install.tmpl | 5 ----- 4 files changed, 1 insertion(+), 14 deletions(-) delete mode 100644 debian/freeswitch-mod-spidermonkey.install.tmpl diff --git a/debian/bootstrap.sh b/debian/bootstrap.sh index 3d5b7932f5..10e65fae63 100755 --- 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 6178f056f2..e052b9ab71 100644 --- 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 1ae957e3e2..4116090ad6 100644 --- 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 License: MPL-1.1 diff --git a/debian/freeswitch-mod-spidermonkey.install.tmpl b/debian/freeswitch-mod-spidermonkey.install.tmpl deleted file mode 100644 index cb98d43c5d..0000000000 --- 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