Removing "files" which is generated by the build system.

Adding mod_timezone (and it's config file)
Adding mod_fax (and it's config file and it's dependencies)

Adding freeswitch-dbg package, containing debugging symbols (thanks to nosaj_)

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

diff --git a/debian/control b/debian/control
index 5fb833b83f3b67aa526443ed23fc6d5568825c70..618d313a1d287987ee7ededf58ba4ab967b80fdc 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,12 +2,12 @@ Source: freeswitch
 Maintainer: Michal Bielicki <michal.bielicki@voiceworks.pl>
 Section: net
 Priority: extra
-Build-Depends: debhelper (>= 5), fakeroot, automake1.9, autoconf, libtool, unixodbc-dev, libasound2-dev, libcurl3-openssl-dev|libcurl4-openssl-dev, libssl-dev, ncurses-dev, libogg-dev, libvorbis-dev, libperl-dev, libgdbm-dev, libdb-dev, libgnutls-dev
+Build-Depends: debhelper (>= 5), fakeroot, automake1.9, autoconf, libtool, unixodbc-dev, libasound2-dev, libcurl3-openssl-dev|libcurl4-openssl-dev, libssl-dev, ncurses-dev, libogg-dev, libvorbis-dev, libperl-dev, libgdbm-dev, libdb-dev, libgnutls-dev, libtiff4-dev
 Standards-Version: 3.7.3
 
 Package: freeswitch
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, unixodbc, libasound2, libcurl3, openssl, libncurses5
+Depends: ${shlibs:Depends}, ${misc:Depends}, unixodbc, libasound2, libcurl3, openssl, libncurses5, libvorbis0a
 Recommends: freeswitch-lang-en
 Suggests: freeswitch-spidermonkey, freeswitch-lua, freeswitch-perl, freeswitch-sounds-music-8000, monit 
 Description: The FreeSWITCH open source telephony platform
@@ -17,6 +17,18 @@ Description: The FreeSWITCH open source telephony platform
  or a media server to host IVR applications using simple scripts or XML to
  control the callflow.
 
+Package: freeswitch-dbg
+Section: devel
+Architecture: any
+Depends: freeswitch (= ${Source-Version})
+Description: The FreeSWITCH open source telephony platform with Debug symbols
+ FreeSWITCH is an open source telephony platform designed to facilitate the
+ creation of voice and chat driven products scaling from a soft-phone up to
+ a soft-switch.  It can be used as a simple switching engine, a media gateway
+ or a media server to host IVR applications using simple scripts or XML to
+ control the callflow.
+
+
 Package: freeswitch-dev
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, freeswitch

diff --git a/debian/files b/debian/files
deleted file mode 100644 (file)
index c9043e7..0000000
--- a/debian/files
+++ /dev/null
@@ -1,18 +0,0 @@
-freeswitch_1.0.1-1_amd64.deb net extra
-freeswitch-dev_1.0.1-1_amd64.deb net extra
-freeswitch-spidermonkey_1.0.1-1_amd64.deb net extra
-freeswitch-perl_1.0.1-1_amd64.deb net extra
-freeswitch-lua_1.0.1-1_amd64.deb net extra
-freeswitch-codec-passthru-g7231_1.0.1-1_amd64.deb net extra
-freeswitch-codec-passthru-amr_1.0.1-1_amd64.deb net extra
-freeswitch-codec-passthru-g729_1.0.1-1_amd64.deb net extra
-freeswitch-lang-en_1.0.1-1_amd64.deb net extra
-freeswitch-sounds-en-us-callie-8000_1.0.1-1_amd64.deb net extra
-freeswitch-sounds-en-us-callie-16000_1.0.1-1_amd64.deb net extra
-freeswitch-sounds-en-us-callie-32000_1.0.1-1_amd64.deb net extra
-freeswitch-sounds-music-8000_1.0.1-1_amd64.deb net extra
-freeswitch-lang-de_1.0.1-1_amd64.deb net extra
-freeswitch-lang-fr_1.0.1-1_amd64.deb net extra
-freeswitch-lang-it_1.0.1-1_amd64.deb net extra
-freeswitch-lang-es_1.0.1-1_amd64.deb net extra
-freeswitch-lang-nl_1.0.1-1_amd64.deb net extra

diff --git a/debian/freeswitch.conffiles b/debian/freeswitch.conffiles
index fbd9629d63ec4fa63a3f4a1bc55b5cb6e3c7ebb2..2ae03c30b70e6ab3a8787cba2c195f751309a299 100644 (file)
--- a/debian/freeswitch.conffiles
+++ b/debian/freeswitch.conffiles
@@ -69,6 +69,8 @@
 /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/autoload_configs/timezones.conf.xml
+/opt/freeswitch/conf/autoload_configs/fax.conf.xml
 /opt/freeswitch/conf/jingle_profiles/server.xml
 /opt/freeswitch/conf/jingle_profiles/client.xml
 /opt/freeswitch/conf/mrcp_profiles/openmrcp-v2.xml

diff --git a/debian/freeswitch.install b/debian/freeswitch.install
index d7cd764f2f16eba120c53164769b87de649ab6e1..78ad518cb375eba46c9c69daeb259fa4783cde47 100644 (file)
--- a/debian/freeswitch.install
+++ b/debian/freeswitch.install
@@ -37,6 +37,8 @@ opt/freeswitch/mod/mod_local_stream.so*
 opt/freeswitch/mod/mod_xml_*.so*
 opt/freeswitch/mod/mod_fsv.so*
 opt/freeswitch/mod/mod_tone_stream.so*
+opt/freeswitch/mod/mod_fax.so*
+opt/freeswitch/mod/mod_timezone.so*
 opt/freeswitch/conf/vars.xml
 opt/freeswitch/conf/mime.types
 opt/freeswitch/conf/web-vm.tpl
@@ -108,6 +110,8 @@ 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/autoload_configs/timezones.conf.xml
+opt/freeswitch/conf/autoload_configs/fax.conf.xml
 opt/freeswitch/conf/jingle_profiles/server.xml
 opt/freeswitch/conf/jingle_profiles/client.xml
 opt/freeswitch/conf/mrcp_profiles/openmrcp-v2.xml

diff --git a/debian/rules b/debian/rules
index 6c8ed6986b4f545bc78023576bdf84eec232a564..d11adea482e65aa52af5f645ffc607b8c11adfc3 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -8,21 +8,28 @@ export DH_OPTIONS
 export DH_COMPAT=4
 export DEB_DH_INSTALL_SOURCEDIR=debian/tmp
 export PASSTHRU_CODEC_MODULES=codecs/mod_g729 codecs/mod_g723_1 codecs/mod_amr
-export SPIDERMONKEY_MODULES=languages/mod_spidermonkey languages/mod_spidermonkey_core_db languages/mod_spidermonkey_odbc languages/mod_spidermonkey_socket languages/mod_spidermonkey_teletone
-export APPLICATIONS_MODULES=applications/mod_commands applications/mod_conference applications/mod_dptools applications/mod_enum applications/mod_esf applications/mod_expr applications/mod_fifo applications/mod_limit applications/mod_rss applications/mod_voicemail applications/mod_fsv 
+export SPIDERMONKEY_MODULES=languages/mod_spidermonkey languages/mod_spidermonkey_core_db languages/mod_spidermonkey_odbc \
+                           languages/mod_spidermonkey_socket languages/mod_spidermonkey_teletone
+export APPLICATIONS_MODULES=applications/mod_commands applications/mod_conference applications/mod_dptools applications/mod_enum \
+                           applications/mod_esf applications/mod_expr applications/mod_fifo applications/mod_limit \
+                           applications/mod_rss applications/mod_voicemail applications/mod_fsv \
+                           applications/mod_timezone applications/mod_fax
 export ASR_TTS_MODULES=asr_tts/mod_openmrcp
 export CODECS_MODULES=codecs/mod_ilbc codecs/mod_h26x codecs/mod_speex codecs/mod_voipcodecs
 export DIALPLANS_MODULES=dialplans/mod_dialplan_asterisk dialplans/mod_dialplan_directory dialplans/mod_dialplan_xml
 export DIRECTORIES_MODULES=
 export DOTNET_MODULES=
-export ENDPOINTS_MODULES=endpoints/mod_dingaling endpoints/mod_iax endpoints/mod_portaudio endpoints/mod_sofia endpoints/mod_woomera ../../libs/openzap/mod_openzap
+export ENDPOINTS_MODULES=endpoints/mod_dingaling endpoints/mod_iax endpoints/mod_portaudio endpoints/mod_sofia \
+                        endpoints/mod_woomera ../../libs/openzap/mod_openzap
 export EVENT_HANDLERS_MODULES=event_handlers/mod_event_multicast event_handlers/mod_event_socket event_handlers/mod_cdr_csv
 export FORMATS_MODULES=formats/mod_local_stream formats/mod_native_file formats/mod_sndfile formats/mod_tone_stream formats/mod_shout
 export LANGUAGES_MODULES=languages/mod_perl languages/mod_lua
 export LOGGERS_MODULES=loggers/mod_console loggers/mod_logfile loggers/mod_syslog
 export SAY_MODULES=say/mod_say_en say/mod_say_it say/mod_say_de say/mod_say_fr say/mod_say_es say/mod_say_nl
 export TIMERS_MODULES=
-export DISABLED_MODULES=applications/mod_soundtouch directories/mod_ldap languages/mod_java languages/mod_python languages/mod_spidermonkey_skel ast_tts/mod_cepstral asr_tts/mod_lumenvox endpoints/mod_wanpipe event_handlers/mod_event_test event_handlers/mod_radius_cdr event_handlers/mod_zeroconf
+export DISABLED_MODULES=applications/mod_soundtouch directories/mod_ldap languages/mod_java languages/mod_python \
+                       languages/mod_spidermonkey_skel ast_tts/mod_cepstral asr_tts/mod_lumenvox endpoints/mod_wanpipe \
+                       event_handlers/mod_event_test event_handlers/mod_radius_cdr event_handlers/mod_zeroconf
 export XML_INT_MODULES=xml_int/mod_xml_rpc  xml_int/mod_xml_curl xml_int/mod_xml_cdr
 export MYMODULES=$(PASSTHRU_CODEC_MODULES) $(SPIDERMONKEY_MODULES) $(APPLICATIONS_MODULES) $(ASR_TTS_MODULES) $(CODECS_MODULES) $(DIALPLANS_MODULES) $(DIRECTORIES_MODULES) $(DOTNET_MODULES) $(ENDPOINTS_MODULES) $(EVENT_HANDLERS_MODULES) $(FORMATS_MODULES) $(LANGUAGES_MODULES) $(LOGGERS_MODULES) $(SAY_MODULES) $(TIMERS_MODULES) $(XML_INT_MODULES)
 export MODULES=$(MYMODULES)
@@ -40,6 +47,7 @@ endif
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
+CFLAGS = -ggdb
 
 FEATURES = --enable-core-libedit-support --enable-core-odbc-support --with-libcurl --with-openssl
 
@@ -125,7 +133,8 @@ binary-arch: build install
 #      dh_installman
        cp debian/monit/freeswitch.monitrc debian/freeswitch/etc/monit/freeswitch.monitrc
        dh_install --sourcedir=debian/tmp
-       dh_strip
+       dh_link
+       dh_strip --dbg-package=freeswitch
        dh_compress
        dh_fixperms --exclude /opt/freeswitch/conf
 #      dh_perl