Fix bootstrap from the removal of mod_html5 in previous commit and cleanup some other...

diff --git a/build/modules.conf.in b/build/modules.conf.in
index d60b1211eff32c8d7461dd3ab640e5535057df9c..3f77b125b52db08bd92b6de0311cf66e7b485143 100644 (file)
--- a/build/modules.conf.in
+++ b/build/modules.conf.in
@@ -82,7 +82,6 @@ dialplans/mod_dialplan_xml
 #endpoints/mod_dingaling
 #endpoints/mod_gsmopen
 #endpoints/mod_h323
-#endpoints/mod_html5
 #endpoints/mod_khomp
 endpoints/mod_loopback
 #endpoints/mod_opal
@@ -152,4 +151,4 @@ xml_int/mod_xml_scgi
 #../../libs/openzap/mod_openzap
 
 ## Experimental Modules (don't cry if they're broken)
-#../../contrib/mod/xml_int/mod_xml_odbc
\ No newline at end of file
+#../../contrib/mod/xml_int/mod_xml_odbc

diff --git a/configure.in b/configure.in
index da0a8bd5592f82fb2abf09cba35d6d1dea53cf26..ce78907d4a80cba686f0420a82c8e34396989c52 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1120,7 +1120,6 @@ AC_CONFIG_FILES([Makefile
                src/mod/applications/mod_stress/Makefile
                src/mod/applications/mod_hash/Makefile
                src/mod/codecs/mod_com_g729/Makefile
-               src/mod/endpoints/mod_html5/Makefile
                src/mod/endpoints/mod_portaudio/Makefile
                src/mod/endpoints/mod_skinny/Makefile
                src/mod/endpoints/mod_skypopen/Makefile

diff --git a/debian/control-modules b/debian/control-modules
index 919382ce9335104cc6d7c1735f9388b858e912cd..679082187c39440feec795c2c52aa17061258909 100644 (file)
--- a/debian/control-modules
+++ b/debian/control-modules
@@ -395,10 +395,6 @@ Description: mod_h323
  Adds mod_h323.
 Build-Depends: libopenh323-dev | libh323plus-dev, libpt-dev
 
-Module: endpoints/mod_html5
-Description: HTML5 endpoint module
- This module adds support for HTML5 technologies such as WebRTC.
-
 Module: endpoints/mod_khomp
 Description: mod_khomp
  Adds mod_khomp.

diff --git a/debian/copyright b/debian/copyright
index fcea146b7a37a63c01b07acd80758caa16e1e4c0..d7ea35053fa2a414271d24f665bde3c9d3c1f976 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -1765,7 +1765,6 @@ License: GPL-2+
 Files: src/mod/endpoints/mod_rtmp/rtmp.c
  src/mod/endpoints/mod_rtmp/mod_rtmp.[ch]
  src/mod/endpoints/mod_rtmp/rtmp_sig.c
- src/mod/endpoints/mod_html5/mod_html5.c
  src/mod/endpoints/mod_rtmp/rtmp_tcp.c
 Copyright: 2011-2012, Barracuda Networks Inc.
 License: MPL-1.1

diff --git a/src/mod/.gitignore b/src/mod/.gitignore
index bfcc02ab70f65d6090151625fc56a0653ab41c44..78158b6fd1d46408d22a47a44a9551edba7374af 100644 (file)
--- a/src/mod/.gitignore
+++ b/src/mod/.gitignore
@@ -36,7 +36,6 @@
 /codecs/mod_vp8/Makefile
 /dialplans/mod_dialplan_asterisk/Makefile
 /dialplans/mod_dialplan_xml/Makefile
-/endpoints/mod_html5/mod_html5.log
 /endpoints/mod_portaudio/Makefile
 /endpoints/mod_portaudio/Makefile.in
 /endpoints/mod_portaudio/mod_portaudio.log
@@ -49,8 +48,6 @@
 /endpoints/mod_sofia/Makefile
 /endpoints/mod_sofia/Makefile.in
 /endpoints/mod_sofia/mod_sofia.log
-/endpoints/mod_html5/Makefile
-/endpoints/mod_html5/Makefile.in
 /event_handlers/mod_erlang_event/Makefile
 /event_handlers/mod_event_socket/Makefile
 /formats/mod_native_file/Makefile