Revision
16002
Author
mikej
Date
2009-12-18 17:00:41 -0600 (Fri, 18 Dec 2009)

Log Message

+    * upgrade: Add more verbosity when building to make it easier to find build errors.
+    * upgrade: Remove the requirement for EXACTLY automake1.9 and change it to need atleast automake 1.9
+    * upgrade: Add the modules (directory, cluechoo, and valet_parking) to the build files. These are in the standard build, so they should be here too.
+
+ -- William King <quentusrex@gmail.com>  Fri, 18 Dec 2009 14:27:42 -0800

Modified Paths

Diff

Modified: freeswitch/trunk/debian/changelog (16001 => 16002)


--- freeswitch/trunk/debian/changelog	2009-12-18 22:20:06 UTC (rev 16001)
+++ freeswitch/trunk/debian/changelog	2009-12-18 23:00:41 UTC (rev 16002)
@@ -1,3 +1,11 @@
+freeswitch (1.0.4-1ubuntu2) karmic; urgency=low
+
+    * upgrade: Add more verbosity when building to make it easier to find build errors.
+    * upgrade: Remove the requirement for EXACTLY automake1.9 and change it to need atleast automake 1.9
+    * upgrade: Add the modules (directory, cluechoo, and valet_parking) to the build files. These are in the standard build, so they should be here too.
+
+ -- William King <quentusrex@gmail.com>  Fri, 18 Dec 2009 14:27:42 -0800
+
 freeswitch (1.0.4-1ubuntu1) karmic; urgency=low
 
     * upgrade: Pulling out the sounds into separate source files for easier management.

Modified: freeswitch/trunk/debian/control (16001 => 16002)


--- freeswitch/trunk/debian/control	2009-12-18 22:20:06 UTC (rev 16001)
+++ freeswitch/trunk/debian/control	2009-12-18 23:00:41 UTC (rev 16002)
@@ -2,7 +2,7 @@
 Maintainer: Michal Bielicki <michal.bielicki@voiceworks.pl>
 Section: net
 Priority: extra
-Build-Depends: debhelper (>= 5), fakeroot, wget, 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, python, libmemcache-dev, memcached, libx11-dev
+Build-Depends: debhelper (>= 5), fakeroot, wget, automake (>=1.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, python, libmemcache-dev, memcached, libx11-dev
 Standards-Version: 3.7.3
 
 Package: freeswitch

Modified: freeswitch/trunk/debian/freeswitch.install (16001 => 16002)


--- freeswitch/trunk/debian/freeswitch.install	2009-12-18 22:20:06 UTC (rev 16001)
+++ freeswitch/trunk/debian/freeswitch.install	2009-12-18 23:00:41 UTC (rev 16002)
@@ -45,6 +45,9 @@
 opt/freeswitch/mod/mod_portaudio.so*
 opt/freeswitch/mod/mod_sofia.so*
 opt/freeswitch/mod/mod_openzap.so
+opt/freeswitch/mod/mod_directory.so*
+opt/freeswitch/mod/mod_valet_parking.so*
+opt/freeswitch/mod/mod_cluechoo.so*
 opt/freeswitch/mod/ozmod_analog_em.so*
 opt/freeswitch/mod/ozmod_analog.so*
 opt/freeswitch/mod/ozmod_isdn.so*

Modified: freeswitch/trunk/debian/rules (16001 => 16002)


--- freeswitch/trunk/debian/rules	2009-12-18 22:20:06 UTC (rev 16001)
+++ freeswitch/trunk/debian/rules	2009-12-18 23:00:41 UTC (rev 16002)
@@ -3,19 +3,20 @@
 # This file is public domain software, originally written by Joey Hess. 
 
 # Uncomment this to turn on verbose mode.
-# export DH_VERBOSE=1
+export DH_VERBOSE=1
 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 \
-			    applications/mod_fax applications/mod_cidlookup applications/mod_curl applications/mod_easyroute \
+# Modules listed by those built by default, then those that are added in this package
+export APPLICATIONS_MODULES=applications/mod_cluechoo applications/mod_commands applications/mod_conference applications/mod_dptools \
+                            applications/mod_enum applications/mod_esf applications/mod_expr applications/mod_fifo applications/mod_fsv \
+                            applications/mod_limit applications/mod_valet_parking applications/mod_voicemail applications/mod_rss \
+                            applications/mod_fax applications/mod_cidlookup applications/mod_curl applications/mod_easyroute \
 			    applications/mod_lcr applications/mod_memcache applications/mod_nibblebill applications/mod_snom \
-			    applications/mod_spy applications/mod_vmd 
+			    applications/mod_spy applications/mod_vmd applications/mod_directory
 export ASR_TTS_MODULES=asr_tts/mod_tts_commandline
 export CODECS_MODULES=codecs/mod_ilbc codecs/mod_h26x codecs/mod_speex codecs/mod_voipcodecs codecs/mod_siren codecs/mod_celt
 export DIALPLANS_MODULES=dialplans/mod_dialplan_asterisk dialplans/mod_dialplan_directory dialplans/mod_dialplan_xml
@@ -106,7 +107,7 @@
 	dh_clean -k 
 	dh_installdirs -A --sourcedir=debian/tmp
 
-	$(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
+	VERBOSE=1 $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
 
 
 # Build architecture-independent files here.