From 86e5939c078b7ad42725ec334ee2b613d882f70f Mon Sep 17 00:00:00 2001 From: Stephen-Gates Date: Tue, 18 Jul 2017 00:24:26 +1000 Subject: [PATCH 01/23] Add CHANGELOG Change README to link to CHANGELOG --- CHANGELOG.md | 42 ++++++++++++++++++++++++++++++++++++++++++ README.md | 35 ++--------------------------------- 2 files changed, 44 insertions(+), 33 deletions(-) create mode 100644 CHANGELOG.md diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 index 0000000..6eab790 --- /dev/null +++ b/CHANGELOG.md @@ -0,0 +1,42 @@ +# Changelog +All notable changes to this project will be documented in this file. + +The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/). The + [project releases](https://github.com/okfn/licenses/releases) adhere to [semantic versioning](http://semver.org/spec/v2.0.0.html) going forward. + +! See fd.io recommendations on versions + +To see what's planned, see our [milestones](https://github.com/okfn/licenses/milestones). + +[Unreleased]: https://github.com/okfn/licenses/compare/0.7...HEAD +## [Unreleased] + +[0.7]: https://github.com/okfn/licenses/compare/v0.6.1...0.7.0 +## 0.7 - 2012-03-18 + +[0.6.1]: https://github.com/okfn/licenses/compare/v0.6...0.6.1 +## 0.6.1 - 2011-02-23 +### Changed +- Minor tweak to CC by-sa license name + +[0.6]: https://github.com/okfn/licenses/compare/v0.5...0.6 +## 0.6 - 2011-02-11 +### Changed +- Heavy refactoring and simplification +- Improve and add documentation + +[0.5]: https://github.com/okfn/licenses/compare/v0.4...0.5 +## 0.5 - 2010-05-12 +### Added +- Addition of Licenses SoS v2.0 capabilities + +[0.4]: https://github.com/okfn/licenses/compare/v0.3...0.4 +## 0.4 - 2010-03-08 +### Added +- Addition of Licenses SoS v1.0 capabilities (Specification of Service) +### Changed +- This module is redesigned to be a web service + +## 0.3 - 2010-03-06 and older +### Added +- Module is designed to be imported to provide its list of licenses diff --git a/README.md b/README.md index e55232f..88e74da 100644 --- a/README.md +++ b/README.md @@ -34,39 +34,8 @@ To build files for deployment do: bin/deploy.py run -For deployment simply upload the current directory files to a relevant online -location. +For deployment simply upload the current directory files to a relevant online location. We currently use github pages (we previously used s3). -## Changelog - -### HEAD - -* Complete rewrite to be simpler (just data, no longer python library). - See - -### v0.6.1 2011-02-22 - -* Minor tweak to CC by-sa license name - -### v0.6 2011-02-11 - -* Heavy refactoring and simplification -* Improve and add documentation - -### v0.5 2010-05-11 - -* Addition of Licenses SoS v2.0 capabilities - - -### v0.4 2010-03-08 - -* This module is redesigned to be a web service -* Addition of Licenses SoS v1.0 capabilities (Specification of Service) - - -### v0.3 2010-03-06 and older - -* Module is designed to be imported to provide its list of licenses - +The changes in each [release](https://github.com/okfn/licenses/releases) are recorded in the [Change Log](./CHANGELOG.md). From 9a603be712db26d44a90bcfa14eed85992dfcd2a Mon Sep 17 00:00:00 2001 From: Stephen-Gates Date: Tue, 18 Jul 2017 00:32:50 +1000 Subject: [PATCH 02/23] Fix CHANGLOG links --- CHANGELOG.md | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6eab790..3bbade3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,9 +2,7 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/). The - [project releases](https://github.com/okfn/licenses/releases) adhere to [semantic versioning](http://semver.org/spec/v2.0.0.html) going forward. - -! See fd.io recommendations on versions + [project releases](https://github.com/okfn/licenses/releases) will adhere to [semantic versioning](http://semver.org/spec/v2.0.0.html) going forward from release 0.7. To see what's planned, see our [milestones](https://github.com/okfn/licenses/milestones). @@ -12,26 +10,26 @@ To see what's planned, see our [milestones](https://github.com/okfn/licenses/mil ## [Unreleased] [0.7]: https://github.com/okfn/licenses/compare/v0.6.1...0.7.0 -## 0.7 - 2012-03-18 +## [0.7] - 2012-03-18 [0.6.1]: https://github.com/okfn/licenses/compare/v0.6...0.6.1 -## 0.6.1 - 2011-02-23 +## [0.6.1] - 2011-02-23 ### Changed - Minor tweak to CC by-sa license name [0.6]: https://github.com/okfn/licenses/compare/v0.5...0.6 -## 0.6 - 2011-02-11 +## [0.6] - 2011-02-11 ### Changed - Heavy refactoring and simplification - Improve and add documentation [0.5]: https://github.com/okfn/licenses/compare/v0.4...0.5 -## 0.5 - 2010-05-12 +## [0.5] - 2010-05-12 ### Added - Addition of Licenses SoS v2.0 capabilities [0.4]: https://github.com/okfn/licenses/compare/v0.3...0.4 -## 0.4 - 2010-03-08 +## [0.4] - 2010-03-08 ### Added - Addition of Licenses SoS v1.0 capabilities (Specification of Service) ### Changed From ede790fc95930827a156b3a3cc1bbac5f54e4186 Mon Sep 17 00:00:00 2001 From: Stephen-Gates Date: Tue, 18 Jul 2017 00:44:07 +1000 Subject: [PATCH 03/23] Adjust for missing releases in GitHub Making releases seemed to be an inconsisent practice --- CHANGELOG.md | 15 ++++++++------- README.md | 1 - 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3bbade3..0084942 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,32 +9,33 @@ To see what's planned, see our [milestones](https://github.com/okfn/licenses/mil [Unreleased]: https://github.com/okfn/licenses/compare/0.7...HEAD ## [Unreleased] -[0.7]: https://github.com/okfn/licenses/compare/v0.6.1...0.7.0 +[0.7]: https://github.com/okfn/licenses/compare/0.6.1...0.7 ## [0.7] - 2012-03-18 -[0.6.1]: https://github.com/okfn/licenses/compare/v0.6...0.6.1 +[0.6.1]: https://github.com/okfn/licenses/compare/0.6...0.6.1 ## [0.6.1] - 2011-02-23 ### Changed - Minor tweak to CC by-sa license name -[0.6]: https://github.com/okfn/licenses/compare/v0.5...0.6 +[0.6]: https://github.com/okfn/licenses/compare/0.5...0.6 ## [0.6] - 2011-02-11 ### Changed - Heavy refactoring and simplification - Improve and add documentation -[0.5]: https://github.com/okfn/licenses/compare/v0.4...0.5 -## [0.5] - 2010-05-12 +## 0.5 - 2010-05-12 ### Added - Addition of Licenses SoS v2.0 capabilities -[0.4]: https://github.com/okfn/licenses/compare/v0.3...0.4 -## [0.4] - 2010-03-08 +## 0.4 - 2010-03-08 +Release not implemented in GitHub. ### Added - Addition of Licenses SoS v1.0 capabilities (Specification of Service) + ### Changed - This module is redesigned to be a web service ## 0.3 - 2010-03-06 and older +Release 0.3 not implemented in GitHub. ### Added - Module is designed to be imported to provide its list of licenses diff --git a/README.md b/README.md index 88e74da..176feae 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,6 @@ All data (and associated content) is placed in the Public Domain using the License](http://opendatacommons.org/licenses/pddl/1-0/). All code is licensed under the [MIT License](http://www.opensource.org/licenses/mit-license.php). - ## Layout 

From 0c252dcf56a6da0042ad5c2c17ed3bc323cab0ad Mon Sep 17 00:00:00 2001
From: Stephen-Gates 
Date: Tue, 18 Jul 2017 09:03:37 +1000
Subject: [PATCH 04/23] Add Community files

Add Code of coduct, Contributing, Issue Template
Update wording on Change log
---
 .github/CODE_OF_CONDUCT.md |  5 +++
 .github/CONTRIBUTING.md    | 69 ++++++++++++++++++++++++++++++++++++++
 .github/ISSUE_TEMPLATE.md  | 24 +++++++++++++
 CHANGELOG.md               |  6 ++--
 4 files changed, 102 insertions(+), 2 deletions(-)
 create mode 100644 .github/CODE_OF_CONDUCT.md
 create mode 100644 .github/CONTRIBUTING.md
 create mode 100644 .github/ISSUE_TEMPLATE.md

diff --git a/.github/CODE_OF_CONDUCT.md b/.github/CODE_OF_CONDUCT.md
new file mode 100644
index 0000000..81063f9
--- /dev/null
+++ b/.github/CODE_OF_CONDUCT.md
@@ -0,0 +1,5 @@
+## Code of Conduct
+
+We are a worldwide network of people passionate about openness, and we use advocacy, technology and training to unlock information so everyone can benefit from open knowledge.
+
+Read about [our vision and values](https://okfn.org/about/vision-and-values/).
diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
new file mode 100644
index 0000000..6cc5110
--- /dev/null
+++ b/.github/CONTRIBUTING.md
@@ -0,0 +1,69 @@
+# Contributing
+
+Firstly, thanks for being here. All types of contributions are valued and gratefully received. Please consider how you may be able to contribute:
+
+- [financial support](#contribute-financial-support)
+- [ideas and feature requests](#contribute-ideas-and-feature-requests)
+- [issues or bug reports](#contribute-issues)
+- [documentation](#contribute-documentation)
+- [code](#contribute-code)
+
+## Contribute Financial Support
+
+We are grateful to all [our funders](https://okfn.org/about/funders/). Would you like to [make a donation][donate]?
+
+## Contribute Ideas and Feature Requests
+
+Your idea for a feature addition may already exist on our [issues] backlog. If you find it, join the conversation.
+
+If the gist of your idea isn't there:
+- [add an issue][issues]
+- to discuss your idea privately, [contact us][contact_us]
+
+## Contribute Issues
+
+If you encounter a problem, please [add an issue][issues]. Make sure it hasn't already be reported.
+
+In order for us to best respond to the issue, we need as much information about the issue as you can provide. Please provide:
+
+- as much detail as possible in the issue template.
+- a descriptive name for your issue.
+
+We may add or change labels on your issue to help us manage the issue backlog.
+
+## Contribute Documentation
+
+Documentation helps people use and contribute to the work we do. You may like to:
+
+- improve the [README.md][readme]
+- add or improve documentation in this repository
+- write a Guide, Blog post or even Tweet
+
+## Contribute Code
+This work is open source, and we are grateful to all our [contributors]. By participating in this project, you agree to abide by our [Code of Conduct][code_of_conduct].
+
+Before you start coding, please reach out to us to discuss how you can help.
+
+If this is your first time contributing code,  you will need to [create a fork of this repository](https://help.github.com/articles/fork-a-repo/).
+
+Follow the [readme instructions][readme] to get your development environment running locally.
+
+Ensure that all automated tests pass before starting work on your contribution.
+
+## Code Review Process
+
+All contributions to the codebase will be reviewed. To increase your chances of your code being accepted please be aware of the following:
+
+- Write [well formed commit messages](http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html)
+- Write tests for all changes (additions or refactors of existing code).
+- We may use GitHub integrations to check your contribution.
+- Once your Pull Request (PR) is published and passes the above checks a repository administrator will review your contribution. Where appropriate, comments will be provided and amendments suggested before your PR is merged into Master.
+
+[readme]: ./README.md
+[code_of_conduct]: CODE_OF_CONDUCT.md
+
+[contact_us]: [https://okfn.org/contact/]
+[donate]: [https://okfn.org/donate/]
+
+[issues]: [https://github.com/okfn/licenses/issues]
+[contributors]: [https://github.com/okfn/licenses/graphs/contributors]
diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
new file mode 100644
index 0000000..c3e02e2
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE.md
@@ -0,0 +1,24 @@
+> Please provide a general summary of the issue in the Issue Title above
+> fill out the headings below as applicable to the issue you are reporting,
+> deleting as appropriate but offering us as much detail as you can to help us resolve the issue
+
+### Expected Behaviour
+> What should happen?
+
+### Desired Behaviour (for enhancement suggestions only)
+> if relevant include images or hyperlinks to other resources that clarify the enhancement you're seeking
+
+### Current Behaviour (for problems)
+> What currently happens that isn't expected behaviour?
+
+### Steps to Reproduce (for problems)
+> Provide a link to a live example, or an unambiguous set of steps to reproduce this bug. Include code to reproduce, if relevant
+1.
+2.
+3.
+4.
+
+### Your Environment
+> Include as many relevant details about the environment you experienced the bug in - this will help us resolve the bug more expediently
+* Environment name and version (e.g. Chrome 39, node.js 5.4):
+* Operating System and version (desktop or mobile):
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0084942..73239aa 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,9 +2,11 @@
 All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/). The
- [project releases](https://github.com/okfn/licenses/releases) will adhere to [semantic versioning](http://semver.org/spec/v2.0.0.html) going forward from release 0.7.
+ [project releases](https://github.com/okfn/licenses/releases) will adhere to [semantic versioning](http://semver.org/spec/v2.0.0.html)
 
-To see what's planned, see our [milestones](https://github.com/okfn/licenses/milestones).
+This approach was adopted after release 0.7.  
+
+To see what's planned, see our [milestones](https://github.com/okfn/licenses/milestones) or unreleased changes.
 
 [Unreleased]: https://github.com/okfn/licenses/compare/0.7...HEAD
 ## [Unreleased]

From 6a7f8abfea2fa2ea4196167fc1e818e2fe818bf3 Mon Sep 17 00:00:00 2001
From: Stephen-Gates 
Date: Tue, 18 Jul 2017 18:45:53 +1000
Subject: [PATCH 05/23] Fix broken CONTRIBUTING.md links

---
 .github/CONTRIBUTING.md | 22 +++++++++++-----------
 CHANGELOG.md            |  4 +++-
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
index 6cc5110..a107f21 100644
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -10,7 +10,7 @@ Firstly, thanks for being here. All types of contributions are valued and gratef
 
 ## Contribute Financial Support
 
-We are grateful to all [our funders](https://okfn.org/about/funders/). Would you like to [make a donation][donate]?
+We are grateful to all [our funders][funders]. Would you like to [make a donation][donate]?
 
 ## Contribute Ideas and Feature Requests
 
@@ -35,8 +35,8 @@ We may add or change labels on your issue to help us manage the issue backlog.
 
 Documentation helps people use and contribute to the work we do. You may like to:
 
-- improve the [README.md][readme]
-- add or improve documentation in this repository
+- improve the [Readme.md][readme]
+- add or improve other documentation in this repository
 - write a Guide, Blog post or even Tweet
 
 ## Contribute Code
@@ -50,7 +50,7 @@ Follow the [readme instructions][readme] to get your development environment run
 
 Ensure that all automated tests pass before starting work on your contribution.
 
-## Code Review Process
+### Code Review Process
 
 All contributions to the codebase will be reviewed. To increase your chances of your code being accepted please be aware of the following:
 
@@ -59,11 +59,11 @@ All contributions to the codebase will be reviewed. To increase your chances of
 - We may use GitHub integrations to check your contribution.
 - Once your Pull Request (PR) is published and passes the above checks a repository administrator will review your contribution. Where appropriate, comments will be provided and amendments suggested before your PR is merged into Master.
 
-[readme]: ./README.md
-[code_of_conduct]: CODE_OF_CONDUCT.md
-
-[contact_us]: [https://okfn.org/contact/]
-[donate]: [https://okfn.org/donate/]
 
-[issues]: [https://github.com/okfn/licenses/issues]
-[contributors]: [https://github.com/okfn/licenses/graphs/contributors]
+[code_of_conduct]: CODE_OF_CONDUCT.md
+[contact_us]: https://okfn.org/contact/
+[contributors]: https://github.com/okfn/licenses/graphs/contributors
+[donate]: https://okfn.org/donate/
+[funders]: https://okfn.org/about/funders/
+[issues]: https://github.com/okfn/licenses/issues
+[readme]: ./README.md
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 73239aa..b939a60 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -17,7 +17,7 @@ To see what's planned, see our [milestones](https://github.com/okfn/licenses/mil
 [0.6.1]: https://github.com/okfn/licenses/compare/0.6...0.6.1
 ## [0.6.1] - 2011-02-23
 ### Changed
-- Minor tweak to CC by-sa license name
+- Minor tweak to CC BY-SA license name
 
 [0.6]: https://github.com/okfn/licenses/compare/0.5...0.6
 ## [0.6] - 2011-02-11
@@ -26,6 +26,7 @@ To see what's planned, see our [milestones](https://github.com/okfn/licenses/mil
 - Improve and add documentation
 
 ## 0.5 - 2010-05-12
+No GitHub compare between 0.4 and 0.5 available as 0.4 was not tagged as a release in GitHub.
 ### Added
 - Addition of Licenses SoS v2.0 capabilities
 
@@ -39,5 +40,6 @@ Release not implemented in GitHub.
 
 ## 0.3 - 2010-03-06 and older
 Release 0.3 not implemented in GitHub.
+
 ### Added
 - Module is designed to be imported to provide its list of licenses

From 6276e812f152910f6f40ac4e7f817830075c432a Mon Sep 17 00:00:00 2001
From: Stephen-Gates 
Date: Tue, 18 Jul 2017 18:52:08 +1000
Subject: [PATCH 06/23] Fix Readme link in CONTRIBUTING

---
 .github/CONTRIBUTING.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
index a107f21..d7798cf 100644
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -66,4 +66,4 @@ All contributions to the codebase will be reviewed. To increase your chances of
 [donate]: https://okfn.org/donate/
 [funders]: https://okfn.org/about/funders/
 [issues]: https://github.com/okfn/licenses/issues
-[readme]: ./README.md
+[readme]: ../README.md

From 26614c1ca6e5413b522f4fd65d2ec3b638d96410 Mon Sep 17 00:00:00 2001
From: Stephen-Gates 
Date: Tue, 24 Oct 2017 19:35:28 +1000
Subject: [PATCH 07/23] move community files

---
 CHANGELOG.md                                     | 3 +--
 .github/CODE_OF_CONDUCT.md => CODE_OF_CONDUCT.md | 0
 .github/CONTRIBUTING.md => CONTRIBUTING.md       | 0
 .github/ISSUE_TEMPLATE.md => ISSUE_TEMPLATE.md   | 5 +++--
 README.md                                        | 5 +++++
 5 files changed, 9 insertions(+), 4 deletions(-)
 rename .github/CODE_OF_CONDUCT.md => CODE_OF_CONDUCT.md (100%)
 rename .github/CONTRIBUTING.md => CONTRIBUTING.md (100%)
 rename .github/ISSUE_TEMPLATE.md => ISSUE_TEMPLATE.md (88%)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b939a60..414ac1a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,8 +1,7 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
-The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/). The
- [project releases](https://github.com/okfn/licenses/releases) will adhere to [semantic versioning](http://semver.org/spec/v2.0.0.html)
+The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/). The [project releases](https://github.com/okfn/licenses/releases) will adhere to [semantic versioning](http://semver.org/spec/v2.0.0.html)
 
 This approach was adopted after release 0.7.  
 
diff --git a/.github/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
similarity index 100%
rename from .github/CODE_OF_CONDUCT.md
rename to CODE_OF_CONDUCT.md
diff --git a/.github/CONTRIBUTING.md b/CONTRIBUTING.md
similarity index 100%
rename from .github/CONTRIBUTING.md
rename to CONTRIBUTING.md
diff --git a/.github/ISSUE_TEMPLATE.md b/ISSUE_TEMPLATE.md
similarity index 88%
rename from .github/ISSUE_TEMPLATE.md
rename to ISSUE_TEMPLATE.md
index c3e02e2..b505d4e 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/ISSUE_TEMPLATE.md
@@ -20,5 +20,6 @@
 
 ### Your Environment
 > Include as many relevant details about the environment you experienced the bug in - this will help us resolve the bug more expediently
-* Environment name and version (e.g. Chrome 39, node.js 5.4):
-* Operating System and version (desktop or mobile):
+
+* Environment name and version:
+* Operating System and version: 
diff --git a/README.md b/README.md
index 176feae..dfd3827 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,5 @@
+[![Gitter chat](https://badges.gitter.im/gitterHQ/gitter.png)](https://gitter.im/okfn/chat)
+
 Machine readable list of open (http://opensource.org/,
 http://opendefinition.org/) licenses and web service - see
 .
@@ -13,6 +15,9 @@ All data (and associated content) is placed in the Public Domain using the
 License](http://opendatacommons.org/licenses/pddl/1-0/). All code is licensed
 under the [MIT License](http://www.opensource.org/licenses/mit-license.php).
 
+## contributions
+Your contributions are very welcome. [Learn how you can help](./CONTRIBUTING.md)
+
 ## Layout
 
 

From 60a5187d41a936d5c0dc94372f5933b69ff41c90 Mon Sep 17 00:00:00 2001
From: Stephen-Gates 
Date: Tue, 24 Oct 2017 20:12:33 +1000
Subject: [PATCH 08/23] update data package with constraints

---
 datapackage.json | 179 +++++++++++++++++++++++++++--------------------
 1 file changed, 102 insertions(+), 77 deletions(-)

diff --git a/datapackage.json b/datapackage.json
index bda027e..c6dda1a 100644
--- a/datapackage.json
+++ b/datapackage.json
@@ -1,83 +1,108 @@
 {
-  "title": "Licenses",
   "name": "licenses",
+  "title": "Licenses",
   "description": "a list of open (http://opensource.org/, http://opendefinition.org/) licenses.",
-  "sources": [
-     {
-      "name":"Open Definition Licenses Service",
-      "web": "http://licenses.opendefinition.org"
-     }
-   ],
-  "licenses": [
-    {
-      "url": "http://www.opendefinition.org/licenses/odc-pddl",
-      "title": "Open Data Commons Public Domain Dedication and Licence 1.0",
-      "id": "ODC-PDDL-1.0"
-    }
-  ],
-  "resources": [
-    {
-      "name": "licenses.csv",
-      "path": "licenses.csv",
-      "mediatype": "text/csv",
-      "bytes": 15051,
-      "schema": {
-        "fields": [
-          {
-            "name": "id",
-            "type": "string"
-          },
-          {
-            "name": "domain_content",
-            "type": "string",
-            "description": "Open Content License"
-          },
-          {
-            "name": "domain_data",
-            "type": "string",
-            "description": "Open Data License"
-          },
-          {
-            "name": "domain_software",
-            "type": "string",
-            "description": "Open Software License"
-          },
-          {
-            "name": "family",
-            "type": "number"
-          },
-          {
-            "name": "is_generic",
-            "type": "number"
-          },
-          {
-            "name": "maintainer",
-            "type": "number"
-          },
-          {
-            "name": "od_conformance",
-            "type": "string",
-            "description": "Conforming to the Open Definition"
-          },
-          {
-            "name": "osd_conformance",
-            "type": "string",
-            "description": "Conforming to Open Source Definition"
-          },
-          {
-            "name": "status",
-            "type": "string"
-          },
-          {
-            "name": "title",
-            "type": "string"
-          },
-          {
-            "name": "url",
-            "type": "string"
+  "profile": "tabular-data-package",
+  "sources": [{
+    "title": "Open Definition Licenses Service",
+    "path": "http://licenses.opendefinition.org"
+  }],
+  "licenses": [{
+    "name": "ODC-PDDL-1.0",
+    "path": "http://www.opendefinition.org/licenses/odc-pddl",
+    "title": "Open Data Commons Public Domain Dedication and Licence 1.0"
+  }],
+  "resources": [{
+    "name": "licenses.csv",
+    "path": "licenses.csv",
+    "profile": "tabular-data-resource",
+    "format": "csv",
+    "mediatype": "text/csv",
+    "schema": {
+      "fields": [{
+          "name": "id",
+          "type": "string",
+          "constraints": {
+            "required": "true",
+            "unique": "true"
+          }
+        },
+        {
+          "name": "domain_content",
+          "type": "boolean",
+          "description": "Open Content License",
+          "constraints": {
+            "required": "true"
+          }
+        },
+        {
+          "name": "domain_data",
+          "type": "boolean",
+          "description": "Open Data License",
+          "constraints": {
+            "required": "true"
+          }
+        },
+        {
+          "name": "domain_software",
+          "type": "boolean",
+          "description": "Open Software License",
+          "constraints": {
+            "required": "true"
+          }
+        },
+        {
+          "name": "family",
+          "type": "string"
+        },
+        {
+          "name": "is_generic",
+          "type": "boolean"
+        },
+        {
+          "name": "maintainer",
+          "type": "string"
+        },
+        {
+          "name": "od_conformance",
+          "type": "string",
+          "description": "Conforming to the Open Definition",
+          "constraints": {
+            "enum": ["approved", "not reviewed", "rejected"]
+          }
+        },
+        {
+          "name": "osd_conformance",
+          "type": "string",
+          "description": "Conforming to Open Source Definition",
+          "constraints": {
+            "enum": ["approved", "not reviewed", "rejected"]
+          }
+        },
+        {
+          "name": "status",
+          "type": "string",
+          "constraints": {
+            "enum": ["active", "retired", "superceded"]
+          }
+        },
+        {
+          "name": "title",
+          "type": "string",
+          "constraints": {
+            "required": "true",
+            "unique": "true"
+          }
+        },
+        {
+          "name": "url",
+          "type": "string",
+          "format": "uri",
+          "constraints": {
+            "unique": "true"
           }
-        ]
-      }
+        }
+      ]
     }
-  ]
+  }]
 }

From 1460781ded02bd82ca343f255e1c493572896969 Mon Sep 17 00:00:00 2001
From: Stephen-Gates 
Date: Tue, 24 Oct 2017 20:59:14 +1000
Subject: [PATCH 09/23] remove quotes from "true" in constraints

---
 datapackage.json | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/datapackage.json b/datapackage.json
index c6dda1a..c41549d 100644
--- a/datapackage.json
+++ b/datapackage.json
@@ -23,8 +23,8 @@
           "name": "id",
           "type": "string",
           "constraints": {
-            "required": "true",
-            "unique": "true"
+            "required": true,
+            "unique": true
           }
         },
         {
@@ -32,7 +32,7 @@
           "type": "boolean",
           "description": "Open Content License",
           "constraints": {
-            "required": "true"
+            "required": true
           }
         },
         {
@@ -40,7 +40,7 @@
           "type": "boolean",
           "description": "Open Data License",
           "constraints": {
-            "required": "true"
+            "required": true
           }
         },
         {
@@ -48,7 +48,7 @@
           "type": "boolean",
           "description": "Open Software License",
           "constraints": {
-            "required": "true"
+            "required": true
           }
         },
         {
@@ -90,8 +90,8 @@
           "name": "title",
           "type": "string",
           "constraints": {
-            "required": "true",
-            "unique": "true"
+            "required": true,
+            "unique": true
           }
         },
         {
@@ -99,7 +99,7 @@
           "type": "string",
           "format": "uri",
           "constraints": {
-            "unique": "true"
+            "unique": true
           }
         }
       ]

From bba338cbcdd7641a5f2b0aed48de810d4b2ea1f7 Mon Sep 17 00:00:00 2001
From: Stephen-Gates 
Date: Tue, 24 Oct 2017 21:19:34 +1000
Subject: [PATCH 10/23] Add Open Government Data License Taiwan 1.0

---
 licenses.csv | 1 +
 1 file changed, 1 insertion(+)

diff --git a/licenses.csv b/licenses.csv
index dd8b5a4..f504c51 100644
--- a/licenses.csv
+++ b/licenses.csv
@@ -108,3 +108,4 @@ ukclickusepsi,TRUE,FALSE,FALSE,,,,rejected,not reviewed,active,UK Click Use PSI,
 ukcrown,FALSE,FALSE,FALSE,,,,rejected,not reviewed,active,UK Crown Copyright,
 ukcrown-withrights,TRUE,FALSE,FALSE,,,,approved,not reviewed,active,UK Crown Copyright with data.gov.uk rights,
 ukpsi,TRUE,FALSE,FALSE,,,,rejected,not reviewed,active,UK PSI Public Sector Information,http://www.opendefinition.org/licenses/ukpsi
+OGL-TW-1.0,FALSE,TRUE,FALSE,,FALSE,Republic of China (Taiwan),approved,not reviewed,active,Open Government Data License Taiwan 1.0,https://data.gov.tw/license

From 38def69c0577b73450e09207a160145dddc48ffc Mon Sep 17 00:00:00 2001
From: Stephen-Gates 
Date: Tue, 24 Oct 2017 21:30:12 +1000
Subject: [PATCH 11/23] add German Government licences

as documented on http://opendefinition.org/licenses/#other-conformant-licenses
---
 licenses.csv | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/licenses.csv b/licenses.csv
index f504c51..b43f61b 100644
--- a/licenses.csv
+++ b/licenses.csv
@@ -109,3 +109,5 @@ ukcrown,FALSE,FALSE,FALSE,,,,rejected,not reviewed,active,UK Crown Copyright,
 ukcrown-withrights,TRUE,FALSE,FALSE,,,,approved,not reviewed,active,UK Crown Copyright with data.gov.uk rights,
 ukpsi,TRUE,FALSE,FALSE,,,,rejected,not reviewed,active,UK PSI Public Sector Information,http://www.opendefinition.org/licenses/ukpsi
 OGL-TW-1.0,FALSE,TRUE,FALSE,,FALSE,Republic of China (Taiwan),approved,not reviewed,active,Open Government Data License Taiwan 1.0,https://data.gov.tw/license
+OGL-DE-BY-2.0,FALSE,TRUE,FALSE,FALSE,German Government,approved,not reviewed,active,Data Licence Germany-attribution-version 2.0,https://www.govdata.de/dl-de/by-2-0
+OGL-DE-ZERO-2.0,FALSE,TRUE,FALSE,FALSE,German Government,approved,not reviewed,active,Data Licence Germany-Zero-Version 2.0,https://www.govdata.de/dl-de/zero-2-0

From d9a1916ba4fc71c1056dc33420353d7fd13cbd10 Mon Sep 17 00:00:00 2001
From: Stephen-Gates 
Date: Tue, 24 Oct 2017 21:32:24 +1000
Subject: [PATCH 12/23] add missing commas in German Licences

---
 licenses.csv | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/licenses.csv b/licenses.csv
index b43f61b..a971a3a 100644
--- a/licenses.csv
+++ b/licenses.csv
@@ -109,5 +109,5 @@ ukcrown,FALSE,FALSE,FALSE,,,,rejected,not reviewed,active,UK Crown Copyright,
 ukcrown-withrights,TRUE,FALSE,FALSE,,,,approved,not reviewed,active,UK Crown Copyright with data.gov.uk rights,
 ukpsi,TRUE,FALSE,FALSE,,,,rejected,not reviewed,active,UK PSI Public Sector Information,http://www.opendefinition.org/licenses/ukpsi
 OGL-TW-1.0,FALSE,TRUE,FALSE,,FALSE,Republic of China (Taiwan),approved,not reviewed,active,Open Government Data License Taiwan 1.0,https://data.gov.tw/license
-OGL-DE-BY-2.0,FALSE,TRUE,FALSE,FALSE,German Government,approved,not reviewed,active,Data Licence Germany-attribution-version 2.0,https://www.govdata.de/dl-de/by-2-0
-OGL-DE-ZERO-2.0,FALSE,TRUE,FALSE,FALSE,German Government,approved,not reviewed,active,Data Licence Germany-Zero-Version 2.0,https://www.govdata.de/dl-de/zero-2-0
+OGL-DE-BY-2.0,FALSE,TRUE,FALSE,,FALSE,German Government,approved,not reviewed,active,Data Licence Germany-attribution-version 2.0,https://www.govdata.de/dl-de/by-2-0
+OGL-DE-ZERO-2.0,FALSE,TRUE,FALSE,,FALSE,German Government,approved,not reviewed,active,Data Licence Germany-Zero-Version 2.0,https://www.govdata.de/dl-de/zero-2-0

From f0c2d68160151b024e0f794fc2d2cb0f7ba40b5d Mon Sep 17 00:00:00 2001
From: Stephen-Gates 
Date: Tue, 24 Oct 2017 21:44:58 +1000
Subject: [PATCH 13/23] add non-conformant cc licences

based on http://opendefinition.org/licenses/nonconformant/
---
 licenses.csv | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/licenses.csv b/licenses.csv
index a971a3a..84a2806 100644
--- a/licenses.csv
+++ b/licenses.csv
@@ -111,3 +111,6 @@ ukpsi,TRUE,FALSE,FALSE,,,,rejected,not reviewed,active,UK PSI Public Sector Info
 OGL-TW-1.0,FALSE,TRUE,FALSE,,FALSE,Republic of China (Taiwan),approved,not reviewed,active,Open Government Data License Taiwan 1.0,https://data.gov.tw/license
 OGL-DE-BY-2.0,FALSE,TRUE,FALSE,,FALSE,German Government,approved,not reviewed,active,Data Licence Germany-attribution-version 2.0,https://www.govdata.de/dl-de/by-2-0
 OGL-DE-ZERO-2.0,FALSE,TRUE,FALSE,,FALSE,German Government,approved,not reviewed,active,Data Licence Germany-Zero-Version 2.0,https://www.govdata.de/dl-de/zero-2-0
+CC-BY-ND-4.0,TRUE,TRUE,FALSE,,,Creative Commons,rejected,not reviewed,active,Creative Commons Attribution No-Derivatives 4.0,https://creativecommons.org/licenses/by-nd/4.0/
+CC-BY-NC-ND-4.0,TRUE,TRUE,FALSE,,,Creative Commons,rejected,not reviewed,active,Creative Commons Attribution NonCommercial No-Derivatives 4.0,https://creativecommons.org/licenses/by-nc-nd/4.0/
+CC-BY-NC-SA-4.0,TRUE,TRUE,FALSE,,,Creative Commons,rejected,not reviewed,active,Creative Commons Attribution NonCommercial Share-Alike 4.0,https://creativecommons.org/licenses/by-nc-sa/4.0/

From 5fdf54a88831d3744d590ab6b924da0df1a18c89 Mon Sep 17 00:00:00 2001
From: Stephen-Gates 
Date: Tue, 24 Oct 2017 21:51:04 +1000
Subject: [PATCH 14/23] Add Open License 2.0 (France)

---
 licenses.csv | 1 +
 1 file changed, 1 insertion(+)

diff --git a/licenses.csv b/licenses.csv
index 84a2806..343b577 100644
--- a/licenses.csv
+++ b/licenses.csv
@@ -114,3 +114,4 @@ OGL-DE-ZERO-2.0,FALSE,TRUE,FALSE,,FALSE,German Government,approved,not reviewed,
 CC-BY-ND-4.0,TRUE,TRUE,FALSE,,,Creative Commons,rejected,not reviewed,active,Creative Commons Attribution No-Derivatives 4.0,https://creativecommons.org/licenses/by-nd/4.0/
 CC-BY-NC-ND-4.0,TRUE,TRUE,FALSE,,,Creative Commons,rejected,not reviewed,active,Creative Commons Attribution NonCommercial No-Derivatives 4.0,https://creativecommons.org/licenses/by-nc-nd/4.0/
 CC-BY-NC-SA-4.0,TRUE,TRUE,FALSE,,,Creative Commons,rejected,not reviewed,active,Creative Commons Attribution NonCommercial Share-Alike 4.0,https://creativecommons.org/licenses/by-nc-sa/4.0/
+LO-2.0,FALSE,TRUE,FALSE,,FALSE,Etalab,not reviewed,not reviewed,active,Open License 2.0,https://www.etalab.gouv.fr/licence-ouverte-open-licence

From 82fc321114bbbc633f1badaaaa05188c4d1117da Mon Sep 17 00:00:00 2001
From: Stephen-Gates 
Date: Tue, 24 Oct 2017 22:08:14 +1000
Subject: [PATCH 15/23] Fix missing value and status in Geogratis
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Licence link is broken

https://www.nrcan.gc.ca/earth-sciences/geography/topographic-information/free-data-geogratis/11042 states, "Use of the GeoGratis data is subject to the Open Government Licence – Canada."

Also, "as of August 31, 2017, the GeoGratis Catalogue and Search tools will no longer be available. As of that date, you should consult the Open Government of Canada search tool."
---
 licenses.csv | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/licenses.csv b/licenses.csv
index 343b577..cc7df29 100644
--- a/licenses.csv
+++ b/licenses.csv
@@ -93,7 +93,7 @@ Xnet,FALSE,FALSE,TRUE,,,,not reviewed,approved,active,X.Net License,http://www.o
 ZPL-2.0,FALSE,FALSE,TRUE,,,Zope Foundation,not reviewed,approved,active,Zope Public License 2.0,http://www.opensource.org/licenses/ZPL-2.0
 Zlib,FALSE,FALSE,TRUE,,,,not reviewed,approved,active,zlib/libpng license,http://www.opensource.org/licenses/Zlib
 dli-model-use,FALSE,TRUE,FALSE,,,,not reviewed,not reviewed,retired,Statistics Canada: Data Liberation Initiative (DLI) - Model Data Use Licence,http://data.library.ubc.ca/datalib/geographic/DMTI/license.html
-geogratis,FALSE,TRUE,FALSE,,,,,not reviewed,active,Geogratis,http://geogratis.gc.ca/geogratis/licenceGG
+geogratis,FALSE,TRUE,FALSE,,,,not reviewed,not reviewed,retired,Geogratis,http://geogratis.gc.ca/geogratis/licenceGG
 hesa-withrights,TRUE,FALSE,FALSE,,,,approved,not reviewed,active,Higher Education Statistics Agency Copyright with data.gov.uk rights,http://www.hesa.ac.uk/index.php?option=com_content&task=view&id=2619&Itemid=209
 localauth-withrights,TRUE,FALSE,FALSE,,,,approved,not reviewed,active,Local Authority Copyright with data.gov.uk rights,
 met-office-cp,FALSE,FALSE,FALSE,,,,not reviewed,not reviewed,active,Met Office UK Climate Projections Licence Agreement,http://www.metoffice.gov.uk/climatechange/science/monitoring/ukcp09/UKCIP08_license_agreement_130709.pdf
@@ -114,4 +114,4 @@ OGL-DE-ZERO-2.0,FALSE,TRUE,FALSE,,FALSE,German Government,approved,not reviewed,
 CC-BY-ND-4.0,TRUE,TRUE,FALSE,,,Creative Commons,rejected,not reviewed,active,Creative Commons Attribution No-Derivatives 4.0,https://creativecommons.org/licenses/by-nd/4.0/
 CC-BY-NC-ND-4.0,TRUE,TRUE,FALSE,,,Creative Commons,rejected,not reviewed,active,Creative Commons Attribution NonCommercial No-Derivatives 4.0,https://creativecommons.org/licenses/by-nc-nd/4.0/
 CC-BY-NC-SA-4.0,TRUE,TRUE,FALSE,,,Creative Commons,rejected,not reviewed,active,Creative Commons Attribution NonCommercial Share-Alike 4.0,https://creativecommons.org/licenses/by-nc-sa/4.0/
-LO-2.0,FALSE,TRUE,FALSE,,FALSE,Etalab,not reviewed,not reviewed,active,Open License 2.0,https://www.etalab.gouv.fr/licence-ouverte-open-licence
+LO-2.0,FALSE,TRUE,FALSE,,FALSE,Etalab,not reviewed,not reviewed,active,Open License 2.0,https://www.etalab.gouv.fr/licence-ouverte-open-licence
\ No newline at end of file

From 0bcc3e29ef518cd8c4dd87dcf2b238f7b2abb614 Mon Sep 17 00:00:00 2001
From: Stephen-Gates 
Date: Tue, 24 Oct 2017 22:12:59 +1000
Subject: [PATCH 16/23] Add Open Data Commons as maintainer for PDDL and ODbL

---
 licenses.csv | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/licenses.csv b/licenses.csv
index cc7df29..ea65c01 100644
--- a/licenses.csv
+++ b/licenses.csv
@@ -63,8 +63,8 @@ Naumen,FALSE,FALSE,TRUE,,,,not reviewed,approved,active,Naumen Public License,ht
 Nokia,FALSE,FALSE,TRUE,,,,not reviewed,approved,active,Nokia Open Source License,http://www.opensource.org/licenses/Nokia
 OCLC-2.0,FALSE,FALSE,TRUE,,,,not reviewed,approved,active,OCLC Research Public License 2.0,http://www.opensource.org/licenses/OCLC-2.0
 ODC-BY-1.0,FALSE,TRUE,FALSE,,,Open Data Commons,approved,not reviewed,active,Open Data Commons Attribution License 1.0,http://www.opendefinition.org/licenses/odc-by
-ODC-PDDL-1.0,FALSE,TRUE,FALSE,,,,approved,not reviewed,active,Open Data Commons Public Domain Dedication and Licence 1.0,http://www.opendefinition.org/licenses/odc-pddl
-ODbL-1.0,FALSE,TRUE,FALSE,,,,approved,not reviewed,active,Open Data Commons Open Database License 1.0,http://www.opendefinition.org/licenses/odc-odbl
+ODC-PDDL-1.0,FALSE,TRUE,FALSE,,,Open Data Commons,approved,not reviewed,active,Open Data Commons Public Domain Dedication and Licence 1.0,http://www.opendefinition.org/licenses/odc-pddl
+ODbL-1.0,FALSE,TRUE,FALSE,,,Open Data Commons,approved,not reviewed,active,Open Data Commons Open Database License 1.0,http://www.opendefinition.org/licenses/odc-odbl
 OFL-1.1,FALSE,FALSE,TRUE,,,,not reviewed,approved,active,Open Font License 1.1,http://www.opensource.org/licenses/OFL-1.1
 OGL-Canada-2.0,TRUE,TRUE,FALSE,,FALSE,Government of Canada,approved,not reviewed,active,Open Government License 2.0 (Canada),http://data.gc.ca/eng/open-government-licence-canada
 OGL-UK-1.0,TRUE,TRUE,TRUE,,,,not reviewed,not reviewed,superseded,Open Government Licence 1.0 (United Kingdom),http://reference.data.gov.uk/id/open-government-licence

From 00c3a740c70bad21cad694b23fee0e9dfc04b99d Mon Sep 17 00:00:00 2001
From: Stephen-Gates 
Date: Tue, 24 Oct 2017 22:17:27 +1000
Subject: [PATCH 17/23] add line ending to licenses.csv

---
 licenses.csv | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/licenses.csv b/licenses.csv
index ea65c01..aaaecc8 100644
--- a/licenses.csv
+++ b/licenses.csv
@@ -114,4 +114,4 @@ OGL-DE-ZERO-2.0,FALSE,TRUE,FALSE,,FALSE,German Government,approved,not reviewed,
 CC-BY-ND-4.0,TRUE,TRUE,FALSE,,,Creative Commons,rejected,not reviewed,active,Creative Commons Attribution No-Derivatives 4.0,https://creativecommons.org/licenses/by-nd/4.0/
 CC-BY-NC-ND-4.0,TRUE,TRUE,FALSE,,,Creative Commons,rejected,not reviewed,active,Creative Commons Attribution NonCommercial No-Derivatives 4.0,https://creativecommons.org/licenses/by-nc-nd/4.0/
 CC-BY-NC-SA-4.0,TRUE,TRUE,FALSE,,,Creative Commons,rejected,not reviewed,active,Creative Commons Attribution NonCommercial Share-Alike 4.0,https://creativecommons.org/licenses/by-nc-sa/4.0/
-LO-2.0,FALSE,TRUE,FALSE,,FALSE,Etalab,not reviewed,not reviewed,active,Open License 2.0,https://www.etalab.gouv.fr/licence-ouverte-open-licence
\ No newline at end of file
+LO-2.0,FALSE,TRUE,FALSE,,FALSE,Etalab,not reviewed,not reviewed,active,Open License 2.0,https://www.etalab.gouv.fr/licence-ouverte-open-licence

From c80e020e8deba11bd165799a2d9f46a27ff902f9 Mon Sep 17 00:00:00 2001
From: Stephen-Gates 
Date: Tue, 24 Oct 2017 22:23:43 +1000
Subject: [PATCH 18/23] fix broken links in readme

---
 CONTRIBUTING.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index d7798cf..19f653f 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -64,6 +64,6 @@ All contributions to the codebase will be reviewed. To increase your chances of
 [contact_us]: https://okfn.org/contact/
 [contributors]: https://github.com/okfn/licenses/graphs/contributors
 [donate]: https://okfn.org/donate/
-[funders]: https://okfn.org/about/funders/
+[funders]: https://okfn.org/team/funders/
 [issues]: https://github.com/okfn/licenses/issues
-[readme]: ../README.md
+[readme]: README.md

From 61637bd998e9f8ec179fc3d0081a4bb8100bdea3 Mon Sep 17 00:00:00 2001
From: Stephen-Gates 
Date: Wed, 25 Oct 2017 06:49:04 +1000
Subject: [PATCH 19/23] Mark OGL-UK-2.0 as "superseded"

goodtables.io validation should fail
---
 licenses.csv | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/licenses.csv b/licenses.csv
index aaaecc8..583896e 100644
--- a/licenses.csv
+++ b/licenses.csv
@@ -68,7 +68,7 @@ ODbL-1.0,FALSE,TRUE,FALSE,,,Open Data Commons,approved,not reviewed,active,Open
 OFL-1.1,FALSE,FALSE,TRUE,,,,not reviewed,approved,active,Open Font License 1.1,http://www.opensource.org/licenses/OFL-1.1
 OGL-Canada-2.0,TRUE,TRUE,FALSE,,FALSE,Government of Canada,approved,not reviewed,active,Open Government License 2.0 (Canada),http://data.gc.ca/eng/open-government-licence-canada
 OGL-UK-1.0,TRUE,TRUE,TRUE,,,,not reviewed,not reviewed,superseded,Open Government Licence 1.0 (United Kingdom),http://reference.data.gov.uk/id/open-government-licence
-OGL-UK-2.0,TRUE,TRUE,TRUE,,FALSE,UK Government,approved,not reviewed,active,Open Government Licence 2.0 (United Kingdom),https://www.nationalarchives.gov.uk/doc/open-government-licence/version/2/
+OGL-UK-2.0,TRUE,TRUE,TRUE,,FALSE,UK Government,approved,not reviewed,superseded,Open Government Licence 2.0 (United Kingdom),https://www.nationalarchives.gov.uk/doc/open-government-licence/version/2/
 OGL-UK-3.0,TRUE,TRUE,TRUE,,FALSE,UK Government,approved,not reviewed,active,Open Government Licence 3.0 (United Kingdom),https://www.nationalarchives.gov.uk/doc/open-government-licence/version/3/
 OGTSL,FALSE,FALSE,TRUE,,,,not reviewed,approved,active,Open Group Test Suite License,http://www.opensource.org/licenses/OGTSL
 OSL-3.0,TRUE,FALSE,TRUE,,,Lawrence Rosen,not reviewed,approved,active,Open Software License 3.0,http://www.opensource.org/licenses/OSL-3.0

From 371bc7a189b4b3fc6116ebba21335663387fefb8 Mon Sep 17 00:00:00 2001
From: Stephen-Gates 
Date: Thu, 26 Oct 2017 05:08:48 +1000
Subject: [PATCH 20/23] adjust LO-FR-2.0

---
 licenses.csv | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/licenses.csv b/licenses.csv
index 583896e..0ecaf85 100644
--- a/licenses.csv
+++ b/licenses.csv
@@ -114,4 +114,4 @@ OGL-DE-ZERO-2.0,FALSE,TRUE,FALSE,,FALSE,German Government,approved,not reviewed,
 CC-BY-ND-4.0,TRUE,TRUE,FALSE,,,Creative Commons,rejected,not reviewed,active,Creative Commons Attribution No-Derivatives 4.0,https://creativecommons.org/licenses/by-nd/4.0/
 CC-BY-NC-ND-4.0,TRUE,TRUE,FALSE,,,Creative Commons,rejected,not reviewed,active,Creative Commons Attribution NonCommercial No-Derivatives 4.0,https://creativecommons.org/licenses/by-nc-nd/4.0/
 CC-BY-NC-SA-4.0,TRUE,TRUE,FALSE,,,Creative Commons,rejected,not reviewed,active,Creative Commons Attribution NonCommercial Share-Alike 4.0,https://creativecommons.org/licenses/by-nc-sa/4.0/
-LO-2.0,FALSE,TRUE,FALSE,,FALSE,Etalab,not reviewed,not reviewed,active,Open License 2.0,https://www.etalab.gouv.fr/licence-ouverte-open-licence
+LO-FR-2.0,FALSE,TRUE,FALSE,,FALSE,Etalab,not reviewed,not reviewed,active,Open License 2.0,https://www.etalab.gouv.fr/licence-ouverte-open-licence

From d02d8d6f0523446c84fe23291031f5fc02080a42 Mon Sep 17 00:00:00 2001
From: Stephen-Gates 
Date: Fri, 27 Oct 2017 20:30:08 +1000
Subject: [PATCH 21/23] correct spelling

still one error - should fail in goodtables
---
 licenses.csv | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/licenses.csv b/licenses.csv
index 0ecaf85..07a1efc 100644
--- a/licenses.csv
+++ b/licenses.csv
@@ -67,7 +67,7 @@ ODC-PDDL-1.0,FALSE,TRUE,FALSE,,,Open Data Commons,approved,not reviewed,active,O
 ODbL-1.0,FALSE,TRUE,FALSE,,,Open Data Commons,approved,not reviewed,active,Open Data Commons Open Database License 1.0,http://www.opendefinition.org/licenses/odc-odbl
 OFL-1.1,FALSE,FALSE,TRUE,,,,not reviewed,approved,active,Open Font License 1.1,http://www.opensource.org/licenses/OFL-1.1
 OGL-Canada-2.0,TRUE,TRUE,FALSE,,FALSE,Government of Canada,approved,not reviewed,active,Open Government License 2.0 (Canada),http://data.gc.ca/eng/open-government-licence-canada
-OGL-UK-1.0,TRUE,TRUE,TRUE,,,,not reviewed,not reviewed,superseded,Open Government Licence 1.0 (United Kingdom),http://reference.data.gov.uk/id/open-government-licence
+OGL-UK-1.0,TRUE,TRUE,TRUE,,,,not reviewed,not reviewed,superceded,Open Government Licence 1.0 (United Kingdom),http://reference.data.gov.uk/id/open-government-licence
 OGL-UK-2.0,TRUE,TRUE,TRUE,,FALSE,UK Government,approved,not reviewed,superseded,Open Government Licence 2.0 (United Kingdom),https://www.nationalarchives.gov.uk/doc/open-government-licence/version/2/
 OGL-UK-3.0,TRUE,TRUE,TRUE,,FALSE,UK Government,approved,not reviewed,active,Open Government Licence 3.0 (United Kingdom),https://www.nationalarchives.gov.uk/doc/open-government-licence/version/3/
 OGTSL,FALSE,FALSE,TRUE,,,,not reviewed,approved,active,Open Group Test Suite License,http://www.opensource.org/licenses/OGTSL

From fede711aa07787bf141757668e96febd2572d066 Mon Sep 17 00:00:00 2001
From: Stephen-Gates 
Date: Sun, 29 Oct 2017 07:29:54 +1000
Subject: [PATCH 22/23] Change superceded spelling to test schema

---
 licenses.csv | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/licenses.csv b/licenses.csv
index 07a1efc..3267cca 100644
--- a/licenses.csv
+++ b/licenses.csv
@@ -67,8 +67,8 @@ ODC-PDDL-1.0,FALSE,TRUE,FALSE,,,Open Data Commons,approved,not reviewed,active,O
 ODbL-1.0,FALSE,TRUE,FALSE,,,Open Data Commons,approved,not reviewed,active,Open Data Commons Open Database License 1.0,http://www.opendefinition.org/licenses/odc-odbl
 OFL-1.1,FALSE,FALSE,TRUE,,,,not reviewed,approved,active,Open Font License 1.1,http://www.opensource.org/licenses/OFL-1.1
 OGL-Canada-2.0,TRUE,TRUE,FALSE,,FALSE,Government of Canada,approved,not reviewed,active,Open Government License 2.0 (Canada),http://data.gc.ca/eng/open-government-licence-canada
-OGL-UK-1.0,TRUE,TRUE,TRUE,,,,not reviewed,not reviewed,superceded,Open Government Licence 1.0 (United Kingdom),http://reference.data.gov.uk/id/open-government-licence
-OGL-UK-2.0,TRUE,TRUE,TRUE,,FALSE,UK Government,approved,not reviewed,superseded,Open Government Licence 2.0 (United Kingdom),https://www.nationalarchives.gov.uk/doc/open-government-licence/version/2/
+OGL-UK-1.0,TRUE,TRUE,TRUE,,,,not reviewed,not reviewed,superseded,Open Government Licence 1.0 (United Kingdom),http://reference.data.gov.uk/id/open-government-licence
+OGL-UK-2.0,TRUE,TRUE,TRUE,,FALSE,UK Government,approved,not reviewed,superceded,Open Government Licence 2.0 (United Kingdom),https://www.nationalarchives.gov.uk/doc/open-government-licence/version/2/
 OGL-UK-3.0,TRUE,TRUE,TRUE,,FALSE,UK Government,approved,not reviewed,active,Open Government Licence 3.0 (United Kingdom),https://www.nationalarchives.gov.uk/doc/open-government-licence/version/3/
 OGTSL,FALSE,FALSE,TRUE,,,,not reviewed,approved,active,Open Group Test Suite License,http://www.opensource.org/licenses/OGTSL
 OSL-3.0,TRUE,FALSE,TRUE,,,Lawrence Rosen,not reviewed,approved,active,Open Software License 3.0,http://www.opensource.org/licenses/OSL-3.0

From 4cb55640df09b56c58949c57b61e1f96a1f964df Mon Sep 17 00:00:00 2001
From: Stephen-Gates 
Date: Sun, 29 Oct 2017 07:33:09 +1000
Subject: [PATCH 23/23] fix superseded spelling

GoodTables.io schema test now working
Thanks @roll
---
 licenses.csv | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/licenses.csv b/licenses.csv
index 3267cca..e14a56c 100644
--- a/licenses.csv
+++ b/licenses.csv
@@ -67,7 +67,7 @@ ODC-PDDL-1.0,FALSE,TRUE,FALSE,,,Open Data Commons,approved,not reviewed,active,O
 ODbL-1.0,FALSE,TRUE,FALSE,,,Open Data Commons,approved,not reviewed,active,Open Data Commons Open Database License 1.0,http://www.opendefinition.org/licenses/odc-odbl
 OFL-1.1,FALSE,FALSE,TRUE,,,,not reviewed,approved,active,Open Font License 1.1,http://www.opensource.org/licenses/OFL-1.1
 OGL-Canada-2.0,TRUE,TRUE,FALSE,,FALSE,Government of Canada,approved,not reviewed,active,Open Government License 2.0 (Canada),http://data.gc.ca/eng/open-government-licence-canada
-OGL-UK-1.0,TRUE,TRUE,TRUE,,,,not reviewed,not reviewed,superseded,Open Government Licence 1.0 (United Kingdom),http://reference.data.gov.uk/id/open-government-licence
+OGL-UK-1.0,TRUE,TRUE,TRUE,,,,not reviewed,not reviewed,superceded,Open Government Licence 1.0 (United Kingdom),http://reference.data.gov.uk/id/open-government-licence
 OGL-UK-2.0,TRUE,TRUE,TRUE,,FALSE,UK Government,approved,not reviewed,superceded,Open Government Licence 2.0 (United Kingdom),https://www.nationalarchives.gov.uk/doc/open-government-licence/version/2/
 OGL-UK-3.0,TRUE,TRUE,TRUE,,FALSE,UK Government,approved,not reviewed,active,Open Government Licence 3.0 (United Kingdom),https://www.nationalarchives.gov.uk/doc/open-government-licence/version/3/
 OGTSL,FALSE,FALSE,TRUE,,,,not reviewed,approved,active,Open Group Test Suite License,http://www.opensource.org/licenses/OGTSL