FS-9081 [Ubuntu Packaging] WIP Patches to build system and configure to allow FS...

diff --git a/configure.ac b/configure.ac
index ccc17e53bc957cf2c773602b5d8ca8641c221972..efe5473ab09362da5719b4f5add7a0715cf48b5b 100644 (file)
--- a/configure.ac
+++ b/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])])
 

diff --git a/debian/util.sh b/debian/util.sh
index 3c481a3aa334f436d816dc0dba48cc9f8c49bcac..aa828e365c10d42c509b096956abc75c77eca8c9 100755 (executable)
--- a/debian/util.sh
+++ b/debian/util.sh
@@ -292,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"