Skip to content

Commit

Permalink
Merge pull request #9813 from ffaf1/fix-licence-text
Browse files Browse the repository at this point in the history
Conform BSD-2-Clause and BSD-3-Clause text to SPDX
  • Loading branch information
mergify[bot] authored Mar 17, 2024
2 parents b3840d2 + 1e86730 commit 99c21ba
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 5 deletions.
8 changes: 3 additions & 5 deletions cabal-install/src/Distribution/Client/Init/Licenses.hs
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ bsd2 :: String -> String -> License
bsd2 authors year =
unlines
[ "Copyright (c) " ++ year ++ ", " ++ authors
, "All rights reserved."
, ""
, "Redistribution and use in source and binary forms, with or without"
, "modification, are permitted provided that the following conditions are"
Expand All @@ -48,7 +47,7 @@ bsd2 authors year =
, "\"AS IS\" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT"
, "LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR"
, "A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT"
, "OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,"
, "HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,"
, "SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT"
, "LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,"
, "DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY"
Expand All @@ -62,7 +61,6 @@ bsd3 authors year =
unlines
[ "Copyright (c) " ++ year ++ ", " ++ authors
, ""
, "All rights reserved."
, ""
, "Redistribution and use in source and binary forms, with or without"
, "modification, are permitted provided that the following conditions are met:"
Expand All @@ -75,15 +73,15 @@ bsd3 authors year =
, " disclaimer in the documentation and/or other materials provided"
, " with the distribution."
, ""
, " * Neither the name of " ++ authors ++ " nor the names of other"
, " * Neither the name of the copyright holder nor the names of its"
, " contributors may be used to endorse or promote products derived"
, " from this software without specific prior written permission."
, ""
, "THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS"
, "\"AS IS\" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT"
, "LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR"
, "A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT"
, "OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,"
, "HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,"
, "SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT"
, "LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,"
, "DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY"
Expand Down
12 changes: 12 additions & 0 deletions changelog.d/pr-9813
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
synopsis: Adjust BSD-2-Clause and BSD-3-Clause licence text
packages: cabal-install
prs: #9813
issues: #9812

description: {

This change matters to BSD-2-Clause and BSD-3-Clause licences. For these two
licences, `cabal init` created a licence file that slightly differed from
wording published at SPDX. This has been rectified.

}

0 comments on commit 99c21ba

Please sign in to comment.