diff -Nru tvheadend-4.3.0~pre+202404252057/.pc/.quilt_patches tvheadend-4.3.0~pre+202404261757/.pc/.quilt_patches --- tvheadend-4.3.0~pre+202404252057/.pc/.quilt_patches 2024-04-26 03:01:43.000000000 +0000 +++ tvheadend-4.3.0~pre+202404261757/.pc/.quilt_patches 2024-04-26 18:02:14.000000000 +0000 @@ -1 +1 @@ -/home/buildd/build-RECIPEBRANCHBUILD-3717862/chroot-autobuild/home/buildd/work/tree/recipe/debian/patches +/home/buildd/build-RECIPEBRANCHBUILD-3718073/chroot-autobuild/home/buildd/work/tree/recipe/debian/patches diff -Nru tvheadend-4.3.0~pre+202404252057/.pc/.quilt_series tvheadend-4.3.0~pre+202404261757/.pc/.quilt_series --- tvheadend-4.3.0~pre+202404252057/.pc/.quilt_series 2024-04-26 03:01:43.000000000 +0000 +++ tvheadend-4.3.0~pre+202404261757/.pc/.quilt_series 2024-04-26 18:02:14.000000000 +0000 @@ -1 +1 @@ -/home/buildd/build-RECIPEBRANCHBUILD-3717862/chroot-autobuild/home/buildd/work/tree/recipe/debian/patches/series +/home/buildd/build-RECIPEBRANCHBUILD-3718073/chroot-autobuild/home/buildd/work/tree/recipe/debian/patches/series diff -Nru tvheadend-4.3.0~pre+202404252057/debian/changelog tvheadend-4.3.0~pre+202404261757/debian/changelog --- tvheadend-4.3.0~pre+202404252057/debian/changelog 2024-04-26 03:01:43.000000000 +0000 +++ tvheadend-4.3.0~pre+202404261757/debian/changelog 2024-04-26 18:02:14.000000000 +0000 @@ -1,6 +1,6 @@ -tvheadend (4.3.0~pre+202404252057-0~built202404260301~gitaba5e6079~ubuntu23.10.1) mantic; urgency=low +tvheadend (4.3.0~pre+202404261757-0~built202404261802~git73a6bd00d~ubuntu23.10.1) mantic; urgency=low * Auto build. - -- Michael Marley Fri, 26 Apr 2024 03:01:43 +0000 + -- Michael Marley Fri, 26 Apr 2024 18:02:14 +0000 diff -Nru tvheadend-4.3.0~pre+202404252057/debian/git-build-recipe.manifest tvheadend-4.3.0~pre+202404261757/debian/git-build-recipe.manifest --- tvheadend-4.3.0~pre+202404252057/debian/git-build-recipe.manifest 2024-04-26 03:01:43.000000000 +0000 +++ tvheadend-4.3.0~pre+202404261757/debian/git-build-recipe.manifest 2024-04-26 18:02:14.000000000 +0000 @@ -1,3 +1,3 @@ -# git-build-recipe format 0.4 deb-version 4.3.0~pre+202404252057-0~built202404260301~gitaba5e6079 -lp:~mamarley/tvheadend/+git/trunk git-commit:aba5e60792177d6a2a867445559f4806973b3258 +# git-build-recipe format 0.4 deb-version 4.3.0~pre+202404261757-0~built202404261802~git73a6bd00d +lp:~mamarley/tvheadend/+git/trunk git-commit:73a6bd00d29421da04be5e1c41b2097fdc9c148b merge master-debian-lp lp:~mamarley/+git/tvheadend git-commit:fb9dbd04a8f73ddcc4fe6c0f382c25dc045b04b1 diff -Nru tvheadend-4.3.0~pre+202404252057/debian/tvheadend.postinst tvheadend-4.3.0~pre+202404261757/debian/tvheadend.postinst --- tvheadend-4.3.0~pre+202404252057/debian/tvheadend.postinst 2024-04-26 03:01:38.000000000 +0000 +++ tvheadend-4.3.0~pre+202404261757/debian/tvheadend.postinst 2024-04-26 18:02:11.000000000 +0000 @@ -57,17 +57,17 @@ echo >>"$HTS_SUPERUSERCONF" "{" if db_get tvheadend/admin_username; then - JSONUSER=`escape_json_string $RET` - echo "\"username\": $JSONUSER," + JSONUSER="$(escape_json_string "$RET")" + echo >>"$HTS_SUPERUSERCONF" "\"username\": $JSONUSER," JSONUSER="" fi if db_get tvheadend/admin_password; then - JSONPASS=`escape_json_string $RET` - echo "\"password\": $JSONPASS" + JSONPASS="$(escape_json_string "$RET")" + echo >>"$HTS_SUPERUSERCONF" "\"password\": $JSONPASS" JSONPASS="" fi - + echo >>"$HTS_SUPERUSERCONF" "}" ;; esac diff -Nru tvheadend-4.3.0~pre+202404252057/src/webui/webui.c tvheadend-4.3.0~pre+202404261757/src/webui/webui.c --- tvheadend-4.3.0~pre+202404252057/src/webui/webui.c 2024-04-26 03:01:39.000000000 +0000 +++ tvheadend-4.3.0~pre+202404261757/src/webui/webui.c 2024-04-26 18:02:11.000000000 +0000 @@ -518,7 +518,7 @@ if (!strempty(logo)) { int id = imagecache_get_id(logo); if (id) { - htsbuf_qprintf(hq, " logo=\"%s/imagecache/%d", hostpath, id); + htsbuf_qprintf(hq, " tvg-logo=\"%s/imagecache/%d", hostpath, id); switch (urlauth) { case URLAUTH_NONE: break; @@ -532,7 +532,7 @@ } htsbuf_append_str(hq, "\""); } else { - htsbuf_qprintf(hq, " logo=\"%s\"", logo); + htsbuf_qprintf(hq, " tvg-logo=\"%s\"", logo); } } if (epgid)