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:
Changes:
projects/browser/RelativeLink/start-browser
| ... |
... |
@@ -241,7 +241,7 @@ if test -z "$system_install"; then |
|
241
|
241
|
# Fix up .desktop Icon and Exec Paths, and update the .desktop file from the
|
|
242
|
242
|
# canonical version if it was changed by the updater.
|
|
243
|
243
|
cp start-[% c('var/project-name') %].desktop ../
|
|
244
|
|
- sed -i -e "s,^Name=.*,Name=[% c('var/Project_Name') %],g" ../start-[% c('var/project-name') %].desktop
|
|
|
244
|
+ sed -i -e "s,^Name=.*,Name=[% c('var/display_name') %],g" ../start-[% c('var/project-name') %].desktop
|
|
245
|
245
|
sed -i -e "s,^Icon=.*,Icon=$PWD/browser/chrome/icons/default/default128.png,g" ../start-[% c('var/project-name') %].desktop
|
|
246
|
246
|
sed -i -e "s,^Icon=.*,Icon=$PWD/browser/chrome/icons/default/default128.png,g" start-[% c('var/project-name') %].desktop
|
|
247
|
247
|
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 @@ |
|
24
|
24
|
|
|
25
|
25
|
[Desktop Entry]
|
|
26
|
26
|
Type=Application
|
|
27
|
|
-Name=[% c("var/Project_Name") %] Setup
|
|
|
27
|
+Name=[% c("var/display_name") %] Setup
|
|
28
|
28
|
GenericName=Web Browser
|
|
29
|
|
-Comment=[% c("var/Project_Name") %] is +1 for privacy and −1 for mass surveillance
|
|
|
29
|
+Comment=[% c("var/project_description") %]
|
|
30
|
30
|
Categories=Network;WebBrowser;Security;
|
|
31
|
31
|
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
|
|
32
|
32
|
X-[% c("var/ProjectName") %]-ExecShell=./Browser/start-[% c("var/project-name") %] --detach
|
projects/linux-packages/browser.desktop.in
|
1
|
1
|
[Desktop Entry]
|
|
2
|
2
|
Version=1.0
|
|
3
|
3
|
Type=Application
|
|
4
|
|
-Name=[% c("var/Project_Name") %]
|
|
|
4
|
+Name=[% c("var/display_name") %]
|
|
5
|
5
|
GenericName=Web Browser
|
|
6
|
6
|
Comment=[% c("var/system_pkg/pkg_description") %]
|
|
7
|
7
|
Categories=Network;WebBrowser;
|
projects/linux-packages/config
| ... |
... |
@@ -11,7 +11,7 @@ var: |
|
11
|
11
|
pkg_name: '[% c("var/project-name") %]-[% c("var/channel") %]'
|
|
12
|
12
|
pkg_version: '[% c("var/torbrowser_version") %]'
|
|
13
|
13
|
pkg_revision: '1'
|
|
14
|
|
- pkg_description: '[% c("var/display_name") %]'
|
|
|
14
|
+ pkg_description: '[% c("var/project_description") %]'
|
|
15
|
15
|
deb_release_date: '[% USE date; date.format(c("timestamp"), format = "%a, %d %b %Y 01:02:03 +0000", locale = "en_US") %]'
|
|
16
|
16
|
# https://spdx.github.io/spdx-spec/v2.3/SPDX-license-expressions/
|
|
17
|
17
|
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: |
|
122
|
122
|
var:
|
|
123
|
123
|
browser_type: torbrowser
|
|
124
|
124
|
system_pkg:
|
|
125
|
|
- 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.'
|
|
126
|
125
|
pkg_url: 'https://torproject.org/'
|
|
127
|
126
|
basebrowser:
|
|
128
|
127
|
var:
|
| ... |
... |
@@ -131,7 +130,6 @@ targets: |
|
131
|
130
|
var:
|
|
132
|
131
|
browser_type: mullvadbrowser
|
|
133
|
132
|
system_pkg:
|
|
134
|
|
- pkg_description: 'Mullvad Browser is a privacy-focused web browser designed to minimize tracking and fingerprinting.'
|
|
135
|
133
|
pkg_url: 'https://mullvad.net/browser'
|
|
136
|
134
|
|
|
137
|
135
|
release:
|
rbm.conf
| ... |
... |
@@ -348,6 +348,7 @@ targets: |
|
348
|
348
|
Project_Name: 'Tor Browser'
|
|
349
|
349
|
ProjectName: TorBrowser
|
|
350
|
350
|
project_initials: tb
|
|
|
351
|
+ 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.'
|
|
351
|
352
|
|
|
352
|
353
|
basebrowser:
|
|
353
|
354
|
var:
|
| ... |
... |
@@ -366,6 +367,7 @@ targets: |
|
366
|
367
|
Project_Name: 'Mullvad Browser'
|
|
367
|
368
|
ProjectName: MullvadBrowser
|
|
368
|
369
|
project_initials: mb
|
|
|
370
|
+ project_description: 'Mullvad Browser is a privacy-focused web browser designed to minimize tracking and fingerprinting.'
|
|
369
|
371
|
exe_name: mullvadbrowser
|
|
370
|
372
|
mar_channel_id: '[% c("var/projectname") %]-mullvad-[% c("var/channel") %]'
|
|
371
|
373
|
locales:
|
|