[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

[tor-commits] [Git][tpo/applications/tor-browser-build][main] MB 301: Add License field to deb copyright file

Title: GitLab

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:

Changes:

  • projects/linux-packages/config
    ... ... @@ -13,6 +13,8 @@ var:
    13 13 
         pkg_revision: '1'
    14 14 
         pkg_description: '[% c("var/display_name") %]'
    15 15 
         deb_release_date: '[% USE date; date.format(c("timestamp"), format = "%a, %d %b %Y 01:02:03 +0000", locale = "en_US") %]'
    16 
    +    # https://spdx.github.io/spdx-spec/v2.3/SPDX-license-expressions/
    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 %]'
    16 18 
         # Use var_p/system_pkg/deb_archs for the processed list
    17 19 
         deb_archs_list:
    18 20 
           - '[% IF c("var/browser-linux-x86_64") %]amd64[% END %]'

  • projects/linux-packages/debian/copyright.in
    1 1 
     Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
    2 2 
     Source:: https://gitlab.torproject.org/tpo/applications/tor-browser-build/
    3 3 
     Upstream-Name: [% c("var/Project_Name") %]
    4 
    +License: [% c("var/system_pkg/spdx_license") %]
    4 5 
     Comment:
    5 6 
      License for the build recipes and tools used for building [% c("var/Project_Name") %]
    6 7 
      can be found at this URL:

  • projects/linux-packages/rpm-package.spec
    ... ... @@ -27,7 +27,7 @@ Name: [% c("var/system_pkg/pkg_name") %]
    27 27 
     Version: [% c("var/system_pkg/pkg_version") %]
    28 28 
     Release: [% c("var/system_pkg/pkg_revision") %]
    29 29 
     URL:     [% c("var/system_pkg/pkg_url") %]
    30 
    -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 %]
    30 
    +License: [% c("var/system_pkg/spdx_license") %]
    31 31 
     Source0: Makefile
    32 32 
     Source1: [% c("var/system_pkg/pkg_name") %].desktop
    33 33 
     [% IF c("var/browser-linux-x86_64") -%]

    • —
    View it on GitLab.
    You're receiving this email because of your account on gitlab.torproject.org. Manage all notifications · Help 

    _______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits