Merge pull request #828 in FS/freeswitch from kr-ubuntu-patches to master

Merge in Ubuntu Packaging changes

* commit '7375ad9e':
  FS-9081 [Ubuntu Packaging] WIP Patches to build system and configure to allow FS to build on 14.04
  Revert "FS-9081 to build all modules for trusty needs the universe components"
  Revert "FS-9081 Correction to e8f83d05"

configure.ac

@@ -819,7 +819,7 @@ if test "x$have_libz" = "xyes"  ; then
 APR_ADDTO([PLATFORM_CORE_LIBS], [-lz])
 fi
 
-PKG_CHECK_MODULES([MPG123], [libmpg123 >= 1.20.1],[
+PKG_CHECK_MODULES([MPG123], [libmpg123 >= 1.16.0],[
   AM_CONDITIONAL([HAVE_MPG123],[true])],[
   AC_MSG_RESULT([no]); AM_CONDITIONAL([HAVE_MPG123],[false])])
 
@@ -1300,7 +1300,7 @@ PKG_CHECK_MODULES([SNDFILE], [sndfile >= 1.0.20],[
   AM_CONDITIONAL([HAVE_SNDFILE],[true])],[
   AC_MSG_RESULT([no]); AM_CONDITIONAL([HAVE_SNDFILE],[false])])
 
-PKG_CHECK_MODULES([MPG123], [libmpg123 >= 1.20.1],[
+PKG_CHECK_MODULES([MPG123], [libmpg123 >= 1.16.0],[
   AM_CONDITIONAL([HAVE_MPG123],[true])],[
   AC_MSG_RESULT([no]); AM_CONDITIONAL([HAVE_MPG123],[false])])
 
@@ -1379,7 +1379,7 @@ PKG_CHECK_MODULES([OPUS], [opus >= 1.1],[
   AM_CONDITIONAL([HAVE_OPUS],[true])],[
   AC_MSG_RESULT([no]); AM_CONDITIONAL([HAVE_OPUS],[false])])
 
-PKG_CHECK_MODULES([SOUNDTOUCH], [soundtouch >= 1.7.1],[
+PKG_CHECK_MODULES([SOUNDTOUCH], [soundtouch >= 1.7.0],[
   AM_CONDITIONAL([HAVE_SOUNDTOUCH],[true])],[
   AC_MSG_RESULT([no]); AM_CONDITIONAL([HAVE_SOUNDTOUCH],[false])])
 

debian/util.sh

@@ -260,7 +260,6 @@ get_sources () {
     prefix=`echo $distro | awk -F/ '{print $1}'`
     suffix="`echo $distro | awk -F/ '{print $2}'`"
     if test -n "$suffix" ; then full="$tgt_distro/$suffix" ; else full="$tgt_distro" ; fi
-    if [ "$distro" == "trusty" -a "$components" == "main" ] ; then components="main universe"; fi
     printf "$type $path $full $components\n"
   done < "$2"
 }
@@ -293,7 +292,9 @@ build_debs () {
     if [ "$custom_sources_file" == "/etc/apt/sources.list" ]; then
         # If you are using the system sources, then it is reasonable that you expect to use all of the supplementary repos too
         cat /etc/apt/sources.list > /tmp/fs.sources.list
-        for X in /etc/apt/sources.list.d/*; do cat $X >> /tmp/fs.sources.list; done
+	if [ "$(ls -A /etc/apt/sources.list.d)" ]; then
+		for X in /etc/apt/sources.list.d/*; do cat $X >> /tmp/fs.sources.list; done
+	fi
         custom_sources_file="/tmp/fs.sources.list"
         apt-key exportall > "/tmp/fs.asc"
         custom_keyring="/tmp/fs.asc"