From bb8960a667c8a487fbdc75372ba5f25e4769bacf Mon Sep 17 00:00:00 2001 From: Ken Rice Date: Tue, 19 Apr 2016 12:52:46 -0500 Subject: [PATCH 1/3] Revert "FS-9081 Correction to e8f83d0" This reverts commit 1b9fda720a462a25254d53da366fe06a91a1e24e. --- debian/util.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/util.sh b/debian/util.sh index b961ad0968..b5a10e3f94 100755 --- a/debian/util.sh +++ b/debian/util.sh @@ -260,7 +260,7 @@ 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 + if [ "$distro" == "trusty" -a "$components" == "main" ] ; then components="main universe"; echo "Forcing components to include universe"; fi printf "$type $path $full $components\n" done < "$2" } From 9b1d5c35f6ba3c5029920c4ce710abe8555940c1 Mon Sep 17 00:00:00 2001 From: Ken Rice Date: Tue, 19 Apr 2016 12:52:52 -0500 Subject: [PATCH 2/3] Revert "FS-9081 to build all modules for trusty needs the universe components" This reverts commit e8f83d0558ad8efe9744cc885e8fce938ff00a31. --- debian/util.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/debian/util.sh b/debian/util.sh index b5a10e3f94..3c481a3aa3 100755 --- a/debian/util.sh +++ b/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"; echo "Forcing components to include universe"; fi printf "$type $path $full $components\n" done < "$2" } From 7375ad9e89679bf546fcaaeb2706a9adc405abd9 Mon Sep 17 00:00:00 2001 From: Ken Rice Date: Tue, 19 Apr 2016 12:55:26 -0500 Subject: [PATCH 3/3] FS-9081 [Ubuntu Packaging] WIP Patches to build system and configure to allow FS to build on 14.04 --- configure.ac | 6 +++--- debian/util.sh | 4 +++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index ccc17e53bc..efe5473ab0 100644 --- 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 3c481a3aa3..aa828e365c 100755 --- 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"