boklm pushed to branch main at The Tor Project / Applications /
tor-browser-build
Commits:
bb7c884f by Nicolas Vigier at 2024-06-05T12:23:45+02:00
MB 301: Add License field to deb copyright file
- - - - -
3 changed files:
- projects/linux-packages/config
- projects/linux-packages/debian/copyright.in
- projects/linux-packages/rpm-package.spec
Changes:
=====================================
projects/linux-packages/config
=====================================
@@ -13,6 +13,8 @@ var:
pkg_revision: '1'
pkg_description: '[% c("var/display_name") %]'
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 %]'
# Use var_p/system_pkg/deb_archs for the processed list
deb_archs_list:
- '[% IF c("var/browser-linux-x86_64") %]amd64[% END %]'
=====================================
projects/linux-packages/debian/copyright.in
=====================================
@@ -1,6 +1,7 @@
Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Source:: https://gitlab.torproject.org/tpo/applications/tor-browser-build/
Upstream-Name: [% c("var/Project_Name") %]
+License: [% c("var/system_pkg/spdx_license") %]
Comment:
License for the build recipes and tools used for building [%
c("var/Project_Name") %]
can be found at this URL:
=====================================
projects/linux-packages/rpm-package.spec
=====================================
@@ -27,7 +27,7 @@ Name: [% c("var/system_pkg/pkg_name") %]
Version: [% c("var/system_pkg/pkg_version") %]
Release: [% c("var/system_pkg/pkg_revision") %]
URL: [% c("var/system_pkg/pkg_url") %]
-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 %]
+License: [% c("var/system_pkg/spdx_license") %]
Source0: Makefile
Source1: [% c("var/system_pkg/pkg_name") %].desktop
[% IF c("var/browser-linux-x86_64") -%]
View it on GitLab:
https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/bb7c884ff7b6f5edd5307e280785bba8d3374729
--
This project does not include diff previews in email notifications.
View it on GitLab:
https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/bb7c884ff7b6f5edd5307e280785bba8d3374729
You're receiving this email because of your account on gitlab.torproject.org.
_______________________________________________
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
