patches from fli, thank you

fixed double installs and some missing dirs in debian
packaging

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@7405 d0543943-73ff-0310-b7d9-9358b9ac24b2

diff --git a/debian/dirs b/debian/dirs
index e6aa3148b1011fb410023a434b744f39d50cfeab..2c64156f1ea823b23963087808b8c2f2fb37a8c2 100644 (file)
--- a/debian/dirs
+++ b/debian/dirs
@@ -1,7 +1,13 @@
-opt/freeswitch
+opt/freeswitch/conf/dialplan/extensions
+opt/freeswitch/conf/sip_profiles/nat
+opt/freeswitch/conf/sip_profiles/default
+opt/freeswitch/conf/sip_profiles/outbound
+opt/freeswitch/conf/directory/default
+opt/freeswitch/conf/autoload_configs
+opt/freeswitch/conf/jingle_profiles
+opt/freeswitch/conf/mrcp_profiles
 opt/freeswitch/log
 opt/freeswitch/db
-opt/freeswitch/bin
 opt/freeswitch/bin/scripts
 etc/opt
 etc/monit

diff --git a/debian/freeswitch.conffiles b/debian/freeswitch.conffiles
index 2330dbe1dbaf0685f21639ed36ffb75863156d63..71b2fce188b5861ecef884f9115b767421e6c5e7 100644 (file)
--- a/debian/freeswitch.conffiles
+++ b/debian/freeswitch.conffiles
@@ -1,24 +1,15 @@
-/opt/freeswitch/conf
-/opt/freeswitch/conf/dialplan
-/opt/freeswitch/conf/dialplan/extensions
 /opt/freeswitch/conf/dialplan/public.xml
 /opt/freeswitch/conf/dialplan/default.xml
 /opt/freeswitch/conf/vars.xml
 /opt/freeswitch/conf/mime.types
 /opt/freeswitch/conf/web-vm.tpl
 /opt/freeswitch/conf/tetris.ttml
-/opt/freeswitch/conf/sip_profiles
 /opt/freeswitch/conf/sip_profiles/outbound.xml
 /opt/freeswitch/conf/sip_profiles/nat.xml
-/opt/freeswitch/conf/sip_profiles/nat
 /opt/freeswitch/conf/sip_profiles/nat/example.xml
-/opt/freeswitch/conf/sip_profiles/default
 /opt/freeswitch/conf/sip_profiles/default/example.xml
 /opt/freeswitch/conf/sip_profiles/default.xml
-/opt/freeswitch/conf/sip_profiles/outbound
 /opt/freeswitch/conf/sip_profiles/outbound/example.xml
-/opt/freeswitch/conf/directory
-/opt/freeswitch/conf/directory/default
 /opt/freeswitch/conf/directory/default/1007.xml
 /opt/freeswitch/conf/directory/default/1001.xml
 /opt/freeswitch/conf/directory/default/1008.xml
@@ -46,7 +37,6 @@
 /opt/freeswitch/conf/voicemail.tpl
 /opt/freeswitch/conf/freeswitch.xml
 /opt/freeswitch/conf/extensions.conf
-/opt/freeswitch/conf/autoload_configs
 /opt/freeswitch/conf/autoload_configs/ivr.conf.xml
 /opt/freeswitch/conf/autoload_configs/voicemail.conf.xml
 /opt/freeswitch/conf/autoload_configs/switch.conf.xml
@@ -77,9 +67,7 @@
 /opt/freeswitch/conf/autoload_configs/cdr_csv.conf.xml
 /opt/freeswitch/conf/autoload_configs/dialplan_directory.conf.xml
 /opt/freeswitch/conf/autoload_configs/console.conf.xml
-/opt/freeswitch/conf/jingle_profiles
 /opt/freeswitch/conf/jingle_profiles/server.xml
 /opt/freeswitch/conf/jingle_profiles/client.xml
-/opt/freeswitch/conf/mrcp_profiles
 /opt/freeswitch/conf/mrcp_profiles/openmrcp-v2.xml
 /opt/freeswitch/conf/mrcp_profiles/openmrcp-v1.xml

diff --git a/debian/freeswitch.install b/debian/freeswitch.install
index 371be3190dcb627b03747550e82a7ed79ab7b867..dd8eb060ef22da6458fb219beae685fe24cc54db 100644 (file)
--- a/debian/freeswitch.install
+++ b/debian/freeswitch.install
@@ -37,8 +37,6 @@ opt/freeswitch/mod/mod_native_file.so*
 opt/freeswitch/mod/mod_sndfile.so*
 opt/freeswitch/mod/mod_local_stream.so*
 opt/freeswitch/mod/mod_xml_*.so*
-opt/freeswitch/conf
-opt/freeswitch/conf/dialplan
 opt/freeswitch/conf/dialplan/public.xml
 opt/freeswitch/conf/dialplan/default.xml
 opt/freeswitch/conf/dialplan/extensions
@@ -46,18 +44,12 @@ opt/freeswitch/conf/vars.xml
 opt/freeswitch/conf/mime.types
 opt/freeswitch/conf/web-vm.tpl
 opt/freeswitch/conf/tetris.ttml
-opt/freeswitch/conf/sip_profiles
 opt/freeswitch/conf/sip_profiles/outbound.xml
 opt/freeswitch/conf/sip_profiles/nat.xml
-opt/freeswitch/conf/sip_profiles/nat
 opt/freeswitch/conf/sip_profiles/nat/example.xml
-opt/freeswitch/conf/sip_profiles/default
 opt/freeswitch/conf/sip_profiles/default/example.xml
 opt/freeswitch/conf/sip_profiles/default.xml
-opt/freeswitch/conf/sip_profiles/outbound
 opt/freeswitch/conf/sip_profiles/outbound/example.xml
-opt/freeswitch/conf/directory
-opt/freeswitch/conf/directory/default
 opt/freeswitch/conf/directory/default/1007.xml
 opt/freeswitch/conf/directory/default/1001.xml
 opt/freeswitch/conf/directory/default/1008.xml
@@ -85,7 +77,6 @@ opt/freeswitch/conf/fur_elise.ttml
 opt/freeswitch/conf/voicemail.tpl
 opt/freeswitch/conf/freeswitch.xml
 opt/freeswitch/conf/extensions.conf
-opt/freeswitch/conf/autoload_configs
 opt/freeswitch/conf/autoload_configs/ivr.conf.xml
 opt/freeswitch/conf/autoload_configs/voicemail.conf.xml
 opt/freeswitch/conf/autoload_configs/switch.conf.xml
@@ -116,9 +107,7 @@ opt/freeswitch/conf/autoload_configs/xml_cdr.conf.xml
 opt/freeswitch/conf/autoload_configs/cdr_csv.conf.xml
 opt/freeswitch/conf/autoload_configs/dialplan_directory.conf.xml
 opt/freeswitch/conf/autoload_configs/console.conf.xml
-opt/freeswitch/conf/jingle_profiles
 opt/freeswitch/conf/jingle_profiles/server.xml
 opt/freeswitch/conf/jingle_profiles/client.xml
-opt/freeswitch/conf/mrcp_profiles
 opt/freeswitch/conf/mrcp_profiles/openmrcp-v2.xml
 opt/freeswitch/conf/mrcp_profiles/openmrcp-v1.xml