[Git][debian-gis-team/proj-data][master] Add shortname for Data-license-Germany-attribution-2.0 & OGL-France-1.0.

[Bas Couwenberg]

Bas Couwenberg pushed to branch master at Debian GIS Project / proj-data


Commits:
f4c1ef29 by Bas Couwenberg at 2020-02-26T11:31:20+01:00
Add shortname for Data-license-Germany-attribution-2.0 & OGL-France-1.0.

- - - - -


1 changed file:

- debian/csv2dep5.py


Changes:

=====================================
debian/csv2dep5.py
=====================================
@@ -27,12 +27,14 @@ def csv2dep5():
 
             rows.append(row)
 
-    sections = []
-
     license_shortname = {
         'Creative Commons Attribution 4.0':   'CC-BY-4.0',
         'Creative Commons CC0 1.0 Universal': 'CC0-1.0',
         'Creative Commons Zero':              'CC0-1.0',
+        (
+          'Data licence Germany - attribution'
+          ' - version 2.0'
+        ): 'Data-license-Germany-attribution-2.0',
         (
           'Open Government Licence'
           ' - '
@@ -43,6 +45,12 @@ def csv2dep5():
           '/en'
           '/open-government-licence-canada'
         ):                                    'OGL-Canada-2.0',
+        (
+          'Open License France - '
+          'https://www.etalab.gouv.fr'
+          '/wp-content/uploads'
+          '/2014/05/Open_Licence.pdf'
+        ):                                    'OGL-France-1.0',
         'Public domain':                      'public-domain',
         'The 2-Clause BSD License':           'BSD-2-Clause',
     }
@@ -87,6 +95,14 @@ def csv2dep5():
 
         copyright_group[copyright][license].append(filename)
 
+    sections = [
+                 {
+                   'files':     ['*'],
+                   'copyright': 'disclaimed',
+                   'license':   'public-domain',
+                 },
+               ]
+
     seen = {}
 
     for filename in file_copyright:
@@ -114,6 +130,9 @@ def csv2dep5():
         if i > 0:
             output += "\n"
 
+        if section['license'] == 'public-domain':
+            section['license'] += "\n This content is in the public domain."
+
         output += (
                     "Files: %s\n"
                     "Copyright: %s\n"



View it on GitLab: https://salsa.debian.org/debian-gis-team/proj-data/-/commit/f4c1ef29445e3ad52dc9e3b088aee6790e526b35

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/proj-data/-/commit/f4c1ef29445e3ad52dc9e3b088aee6790e526b35
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-grass-devel/attachments/20200226/6eeb2c10/attachment-0001.html>