Pier Angelo Vendrame pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: fc1adf49 by Pier Angelo Vendrame at 2025-09-22T18:53:24+02:00 Bug 41569: Include the channel name on .desktop files. But only for alpha/nightly. - - - - - 2f802636 by Pier Angelo Vendrame at 2025-09-22T18:53:24+02:00 Bug 41558: Share descriptions between Linux packages and archives. - - - - - 5 changed files: - projects/browser/RelativeLink/start-browser - projects/browser/RelativeLink/start-browser.desktop - projects/linux-packages/browser.desktop.in - projects/linux-packages/config - rbm.conf Changes: ===================================== projects/browser/RelativeLink/start-browser ===================================== @@ -241,7 +241,7 @@ if test -z "$system_install"; then # Fix up .desktop Icon and Exec Paths, and update the .desktop file from the # canonical version if it was changed by the updater. cp start-[% c('var/project-name') %].desktop ../ - sed -i -e "s,^Name=.*,Name=[% c('var/Project_Name') %],g" ../start-[% c('var/project-name') %].desktop + sed -i -e "s,^Name=.*,Name=[% c('var/display_name') %],g" ../start-[% c('var/project-name') %].desktop sed -i -e "s,^Icon=.*,Icon=$PWD/browser/chrome/icons/default/default128.png,g" ../start-[% c('var/project-name') %].desktop sed -i -e "s,^Icon=.*,Icon=$PWD/browser/chrome/icons/default/default128.png,g" start-[% c('var/project-name') %].desktop sed -i -e "s,^Exec=.*,Exec=sh -c '\"$PWD/start-[% c('var/project-name') %]\" || ([ ! -x \"$PWD/start-[% c('var/project-name') %]\" ] \&\& \"\$(dirname \"\$*\")\"/Browser/start-[% c('var/project-name') %])' dummy %k,g" ../start-[% c('var/project-name') %].desktop ===================================== projects/browser/RelativeLink/start-browser.desktop ===================================== @@ -24,9 +24,9 @@ [Desktop Entry] Type=Application -Name=[% c("var/Project_Name") %] Setup +Name=[% c("var/display_name") %] Setup GenericName=Web Browser -Comment=[% c("var/Project_Name") %] is +1 for privacy and −1 for mass surveillance +Comment=[% c("var/project_description") %] Categories=Network;WebBrowser;Security; Exec=sh -c '"$(dirname "$*")"/Browser/start-[% c("var/project-name") %] || ([ ! -x "$(dirname "$*")"/Browser/start-[% c("var/project-name") %] ] && "$(dirname "$*")"/start-[% c("var/project-name") %])' dummy %k X-[% c("var/ProjectName") %]-ExecShell=./Browser/start-[% c("var/project-name") %] --detach ===================================== projects/linux-packages/browser.desktop.in ===================================== @@ -1,7 +1,7 @@ [Desktop Entry] Version=1.0 Type=Application -Name=[% c("var/Project_Name") %] +Name=[% c("var/display_name") %] GenericName=Web Browser Comment=[% c("var/system_pkg/pkg_description") %] Categories=Network;WebBrowser; ===================================== projects/linux-packages/config ===================================== @@ -11,7 +11,7 @@ var: pkg_name: '[% c("var/project-name") %]-[% c("var/channel") %]' pkg_version: '[% c("var/torbrowser_version") %]' pkg_revision: '1' - pkg_description: '[% c("var/display_name") %]' + pkg_description: '[% c("var/project_description") %]' deb_release_date: '[% USE date; date.format(c("timestamp"), format = "%a, %d %b %Y 01:02:03 +0000", locale = "en_US") %]' # https://spdx.github.io/spdx-spec/v2.3/SPDX-license-expressions/ spdx_license: 'MPL-2.0 AND GPL-3.0-or-later AND OFL-1.1 AND Apache-2.0[% IF c("var/tor-browser") %] AND BSD-3-Clause AND CC0-1.0 AND MIT[% END %]' @@ -122,7 +122,6 @@ targets: var: browser_type: torbrowser system_pkg: - pkg_description: 'Tor Browser is a privacy-focused web browser designed to minimize tracking and fingerprinting, using the Tor network to protect your privacy and anonymity.' pkg_url: 'https://torproject.org/' basebrowser: var: @@ -131,7 +130,6 @@ targets: var: browser_type: mullvadbrowser system_pkg: - pkg_description: 'Mullvad Browser is a privacy-focused web browser designed to minimize tracking and fingerprinting.' pkg_url: 'https://mullvad.net/browser' release: ===================================== rbm.conf ===================================== @@ -348,6 +348,7 @@ targets: Project_Name: 'Tor Browser' ProjectName: TorBrowser project_initials: tb + project_description: 'Tor Browser is a privacy-focused web browser designed to minimize tracking and fingerprinting, using the Tor network to protect your privacy and anonymity.' basebrowser: var: @@ -366,6 +367,7 @@ targets: Project_Name: 'Mullvad Browser' ProjectName: MullvadBrowser project_initials: mb + project_description: 'Mullvad Browser is a privacy-focused web browser designed to minimize tracking and fingerprinting.' exe_name: mullvadbrowser mar_channel_id: '[% c("var/projectname") %]-mullvad-[% c("var/channel") %]' locales: View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/compare/8... -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/compare/8... You're receiving this email because of your account on gitlab.torproject.org.