GPL-2.0: Mark postal-code commas as optional #514
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This was referenced Dec 14, 2017
|
@wking can you resolve the conflict here and rebase on recent merged version? |
wking
force-pushed
the
gpl-2.0-optional-postal-code-comma
branch
from
577f49c to
f2b71bd
Compare
Upstream is not consistent about this: $ curl -s https://www.gnu.org/licenses/old-licenses/gpl-2.0-standalone.html | grep USA 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. $ curl -s https://www.gnu.org/licenses/old-licenses/gpl-2.0.txt | grep USA 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. so support both forms. I've stuck with our old comma version as canonical. Reported by 1138-4EB [1]. [1]: licensee/licensee#247 (comment)
wking
added a commit
to wking/license-list-XML
that referenced
this pull request
Dec 28, 2017
…/plain These changes address the additional differences between the FSF's text/plain version [1] (unchanged since 2007-07-16 according to the Internet Archive [2]) and the FSF's HTML version [3]. There has been previous work in this direction in e9eb557 (Merge pull request spdx#496 from mlinksva/patch-9, 2017-12-15) and f2b71bd (GPL-2.0: Mark postal-code commas as optional, 2017-12-14, spdx#514). The final paragraph ("This General Public License does not permit...") is in both the text/plain and HTML FSF versions. I'm not clear on why it wasn't included in our template (our GPL-3.0 template does include a similar paragraph). I've put it in a new <optional> block to cover folks who were using the text we previously recommended (which lacked the paragraph). [1]: https://www.gnu.org/licenses/old-licenses/gpl-2.0.txt [2]: https://web.archive.org/web/20070716031727/https://www.gnu.org/licenses/old-licenses/gpl-2.0.txt [3]: https://www.gnu.org/licenses/old-licenses/gpl-2.0.en.html
wking
added a commit
to wking/license-list-XML
that referenced
this pull request
Feb 16, 2018
These changes address the additional differences between the FSF's text/plain version [1] (unchanged since 2007-07-16 according to the Internet Archive [2]) and the FSF's HTML version [3]. There has been previous work in this direction in e9eb557 (Merge pull request spdx#496 from mlinksva/patch-9, 2017-12-15) and f2b71bd (GPL-2.0: Mark postal-code commas as optional, 2017-12-14, spdx#514). The final paragraph ("This General Public License does not permit...") is in both the text/plain and HTML FSF versions. I'm not clear on why it wasn't included in our template (our GPL-3.0 template does include a similar paragraph). I've put it in a new <optional> block to cover folks who were using the text we previously recommended (which lacked the paragraph). [1]: https://www.gnu.org/licenses/old-licenses/gpl-2.0.txt [2]: https://web.archive.org/web/20070716031727/https://www.gnu.org/licenses/old-licenses/gpl-2.0.txt [3]: https://www.gnu.org/licenses/old-licenses/gpl-2.0.en.html
wking
added a commit
to wking/license-list-XML
that referenced
this pull request
Feb 16, 2018
These changes address the additional differences between the FSF's text/plain version [1] (unchanged since 2007-07-16 according to the Internet Archive [2]) and the FSF's HTML version [3]. There has been previous work in this direction in e9eb557 (Merge pull request spdx#496 from mlinksva/patch-9, 2017-12-15) and f2b71bd (GPL-2.0: Mark postal-code commas as optional, 2017-12-14, spdx#514). The final paragraph ("This General Public License does not permit...") is in both the text/plain and HTML FSF versions. I'm not clear on why it wasn't included in our template (our GPL-3.0 template does include a similar paragraph). I've put it in a new <optional> block to cover folks who were using the text we previously recommended (which lacked the paragraph). [1]: https://www.gnu.org/licenses/old-licenses/gpl-2.0.txt [2]: https://web.archive.org/web/20070716031727/https://www.gnu.org/licenses/old-licenses/gpl-2.0.txt [3]: https://www.gnu.org/licenses/old-licenses/gpl-2.0.en.html
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Upstream is not consistent about this:
so support both forms. I've stuck with our old comma version as canonical.
Reported by @1138-4eb.