diff --git a/CMakeLists.txt b/CMakeLists.txt index b1f73ad6a..be3151dbb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -534,7 +534,7 @@ if(WITH_SYSTEMD AND (${CMAKE_SYSTEM_NAME} MATCHES "Linux")) set (SYSTEMD_AFTER_TARGET "mysql.target network-online.target") set (SYSTEMD_DESCRIPTION "Gerbera Media Server with MySQL") else() - set (SYSTEMD_AFTER_TARGET "network.target") + set (SYSTEMD_AFTER_TARGET "network.target network-online.target") set (SYSTEMD_DESCRIPTION "Gerbera Media Server") endif() diff --git a/README.md b/README.md index 92ac45542..85d68abf7 100644 --- a/README.md +++ b/README.md @@ -55,7 +55,7 @@ sudo make install | zlib | | | | Required | Data compression | | | [fmtlib] | 7.1.3 | 7.1.3 | 8.1.1 | Required | Fast string formatting | | | [spdlog] | 1.8.1 | 1.8.5 | 1.9.2 | Required | Runtime logging | | -| [duktape] | 2.1.0 | 2.5.0 | 2.6.0 | Optional | Scripting Support | Enabled | +| [duktape] | 2.1.0 | 2.6.0 | 2.7.0 | Optional | Scripting Support | Enabled | | mysql | | | | Optional | Alternate database storage | Disabled | | curl | | | | Optional | Enables web services | Enabled | | [taglib] | 1.12 | 1.12 | 1.12 | Optional | Audio tag support | Enabled | diff --git a/doc/conf.py b/doc/conf.py index a779ccefa..a39300b4a 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -46,7 +46,7 @@ # General information about the project. project = u'Gerbera' -copyright = u'2018-21, Gerbera Contributors' +copyright = u'2018-22, Gerbera Contributors' author = u'Gerbera Contributors' # The version info for the project you're documenting, acts as replacement for diff --git a/scripts/debian/build-deb.sh b/scripts/debian/build-deb.sh index 766c7b444..c53bc07d5 100755 --- a/scripts/debian/build-deb.sh +++ b/scripts/debian/build-deb.sh @@ -141,8 +141,10 @@ else libduktape="libduktape202" elif [ "$lsb_codename" == "buster" ]; then libduktape="libduktape203" - elif [ "$lsb_codename" == "sid" -o "${my_sys}" == "debian:testing" -o "${my_sys}" == "debian:unstable" ]; then + elif [ "$lsb_codename" == "bookworm" -o "${my_sys}" == "debian:testing" ]; then libduktape="libduktape206" + elif [ "$lsb_codename" == "sid" -o "${my_sys}" == "debian:unstable" ]; then + libduktape="libduktape207" fi libduktape="duktape-dev ${libduktape}" echo "Selecting $libduktape for $lsb_distro $lsb_codename" diff --git a/scripts/versions.sh b/scripts/versions.sh index 719d29230..ba26d6cc1 100755 --- a/scripts/versions.sh +++ b/scripts/versions.sh @@ -15,7 +15,7 @@ if [[ "${GERBERA_ENV-head}" == "minimum" ]]; then elif [[ "${GERBERA_ENV-head}" == "default" ]]; then - DUKTAPE="2.5.0" + DUKTAPE="2.6.0" EBML="1.3.9" EXIV2="v0.26" FFMPEGTHUMBNAILER="2.2.0" @@ -30,7 +30,7 @@ elif [[ "${GERBERA_ENV-head}" == "default" ]]; then else - DUKTAPE="2.6.0" + DUKTAPE="2.7.0" EBML="1.4.2" EXIV2="v0.27.5" FFMPEGTHUMBNAILER="2.2.2"