[Git][debian-gis-team/proj-data][master] 5 commits: Change closing parenthesis alignment.
Bas Couwenberg (@sebastic)
gitlab at salsa.debian.org
Fri Nov 25 18:51:50 GMT 2022
Bas Couwenberg pushed to branch master at Debian GIS Project / proj-data
Commits:
87409cd6 by Bas Couwenberg at 2022-10-05T20:27:00+02:00
Change closing parenthesis alignment.
- - - - -
f5d88d4e by Bas Couwenberg at 2022-11-25T19:12:35+01:00
New upstream version 1.12~rc1
- - - - -
f6d70d27 by Bas Couwenberg at 2022-11-25T19:32:28+01:00
Update upstream source from tag 'upstream/1.12_rc1'
Update to upstream version '1.12~rc1'
with Debian dir 8672a1228288fb7c8f7691af049db818fe49e4ce
- - - - -
0037e9a4 by Bas Couwenberg at 2022-11-25T19:33:28+01:00
New upstream release candidate.
- - - - -
1e7a60fe by Bas Couwenberg at 2022-11-25T19:34:20+01:00
Update copyright file.
- - - - -
7 changed files:
- + at_bev_AT_GIS_GRID_2021_09_28.tif
- at_bev_README.txt
- copyright_and_licenses.csv
- debian/changelog
- debian/copyright
- debian/copyright.grids
- debian/csv2dep5.py
Changes:
=====================================
at_bev_AT_GIS_GRID_2021_09_28.tif
=====================================
Binary files /dev/null and b/at_bev_AT_GIS_GRID_2021_09_28.tif differ
=====================================
at_bev_README.txt
=====================================
@@ -11,8 +11,12 @@ from [Austria Bundesamt für Eich- und Vermessungswessen](www.bev.gv.at)
*Format*: GeoTIFF converted from NTv2
*License*: [Creative Commons Attribution 4.0](https://creativecommons.org/licenses/by/4.0/)
+Grid from 2014 with 0.0125 x 0.0083333 degree resolution:
* at_bev_AT_GIS_GRID.tif
+Grid from 2021 with 0.00194444 x 0.00138889 degree resolution:
+* at_bev_AT_GIS_GRID_2021_09_28.tif
+
### Austria :GHA height -> EVRF2000 Austria height
*Source*: [BEV](http://www.bev.gv.at/portal/page?_pageid=713,2601281&_dad=portal&_schema=PORTAL)
=====================================
copyright_and_licenses.csv
=====================================
@@ -1,5 +1,6 @@
filename,copyright,license,version_added,version_removed
at_bev_AT_GIS_GRID.tif,Austria Bundesamt für Eich- und Vermessungswessen (BEV),CC-BY-4.0,,
+at_bev_AT_GIS_GRID_2021_09_28.tif,Austria Bundesamt für Eich- und Vermessungswessen (BEV),CC-BY-4.0,1.12,
at_bev_GEOID_BESSEL_Oesterreich.tif,Austria Bundesamt für Eich- und Vermessungswessen (BEV),CC-BY-4.0,,
at_bev_GEOID_GRS80_Oesterreich.tif,Austria Bundesamt für Eich- und Vermessungswessen (BEV),CC-BY-4.0,,
at_bev_GV_Hoehengrid_plus_Geoid_V2.tif,Austria Bundesamt für Eich- und Vermessungswessen (BEV),CC-BY-4.0,,
=====================================
debian/changelog
=====================================
@@ -1,9 +1,9 @@
-proj-data (1.11-1) UNRELEASED; urgency=medium
+proj-data (1.12~rc1-1) UNRELEASED; urgency=medium
TODO: Fix BETA2007 license
https://github.com/OSGeo/PROJ/pull/383#issuecomment-622246695
- * New upstream release.
+ * New upstream release candidate.
* Bump debhelper compat to 12, changes:
- Drop --parallel option, enabled by default
- Drop --list-missing from dh_install
@@ -17,7 +17,7 @@ proj-data (1.11-1) UNRELEASED; urgency=medium
* Add binary packages for Mexico & South Africa.
* Add binary package for Poland.
- -- Bas Couwenberg <sebastic at debian.org> Thu, 01 Sep 2022 18:01:32 +0200
+ -- Bas Couwenberg <sebastic at debian.org> Fri, 25 Nov 2022 19:33:16 +0100
proj-data (1.0-1~exp1) experimental; urgency=medium
=====================================
debian/copyright
=====================================
@@ -8,6 +8,7 @@ License: public-domain
This content is in the public domain.
Files: at_bev_AT_GIS_GRID.tif
+ at_bev_AT_GIS_GRID_2021_09_28.tif
at_bev_GEOID_BESSEL_Oesterreich.tif
at_bev_GEOID_GRS80_Oesterreich.tif
at_bev_GV_Hoehengrid_plus_Geoid_V2.tif
=====================================
debian/copyright.grids
=====================================
@@ -4,6 +4,7 @@ License: public-domain
This content is in the public domain.
Files: at_bev_AT_GIS_GRID.tif
+ at_bev_AT_GIS_GRID_2021_09_28.tif
at_bev_GEOID_BESSEL_Oesterreich.tif
at_bev_GEOID_GRS80_Oesterreich.tif
at_bev_GV_Hoehengrid_plus_Geoid_V2.tif
=====================================
debian/csv2dep5.py
=====================================
@@ -60,7 +60,7 @@ def csv2dep5():
copyright_group = {}
for row in rows:
- if(
+ if (
row['filename'].endswith('_README.txt') or
row['filename'] == 'README.DATA' or
row['version_removed'] != ''
@@ -85,9 +85,9 @@ def csv2dep5():
license = "FIXME: %s" % license
file_copyright[filename] = {
- 'copyright': copyright,
- 'license': license,
- }
+ 'copyright': copyright,
+ 'license': license,
+ }
if copyright not in copyright_group:
copyright_group[copyright] = {}
@@ -98,12 +98,12 @@ def csv2dep5():
copyright_group[copyright][license].append(filename)
sections = [
- {
- 'files': ['*'],
- 'copyright': 'disclaimed',
- 'license': 'public-domain',
- },
- ]
+ {
+ 'files': ['*'],
+ 'copyright': 'disclaimed',
+ 'license': 'public-domain',
+ },
+ ]
seen = {}
@@ -113,10 +113,10 @@ def csv2dep5():
if copyright not in seen or license not in seen[copyright]:
section = {
- 'files': copyright_group[copyright][license],
- 'copyright': copyright,
- 'license': license
- }
+ 'files': copyright_group[copyright][license],
+ 'copyright': copyright,
+ 'license': license
+ }
sections.append(section)
@@ -136,14 +136,14 @@ def csv2dep5():
section['license'] += "\n This content is in the public domain."
output += (
- "Files: %s\n"
- "Copyright: %s\n"
- "License: %s\n"
- ) % (
- "\n ".join(section['files']),
- section['copyright'],
- section['license'],
- )
+ "Files: %s\n"
+ "Copyright: %s\n"
+ "License: %s\n"
+ ) % (
+ "\n ".join(section['files']),
+ section['copyright'],
+ section['license'],
+ )
i += 1
@@ -154,30 +154,30 @@ def main():
global args
default = {
- 'input-file': 'copyright_and_licenses.csv',
- }
+ 'input-file': 'copyright_and_licenses.csv',
+ }
parser = argparse.ArgumentParser()
parser.add_argument(
- '-i', '--input-file',
- metavar='<PATH>',
- action='store',
- help='Path to input CSV file (default: %s)' % (
- default['input-file']
- ),
- default=default['input-file'],
- )
+ '-i', '--input-file',
+ metavar='<PATH>',
+ action='store',
+ help='Path to input CSV file (default: %s)' % (
+ default['input-file']
+ ),
+ default=default['input-file'],
+ )
parser.add_argument(
- '-d', '--debug',
- action='store_true',
- help='Enable debug output',
- )
+ '-d', '--debug',
+ action='store_true',
+ help='Enable debug output',
+ )
parser.add_argument(
- '-v', '--verbose',
- action='store_true',
- help='Enable verbose output',
- )
+ '-v', '--verbose',
+ action='store_true',
+ help='Enable verbose output',
+ )
args = parser.parse_args()
View it on GitLab: https://salsa.debian.org/debian-gis-team/proj-data/-/compare/8e009c6eb02a0aa6072108e5e1fa177035556e25...1e7a60fe61b1966f065ade59536582cedeaa3bf4
--
View it on GitLab: https://salsa.debian.org/debian-gis-team/proj-data/-/compare/8e009c6eb02a0aa6072108e5e1fa177035556e25...1e7a60fe61b1966f065ade59536582cedeaa3bf4
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/20221125/4a7baeb3/attachment-0001.htm>
More information about the Pkg-grass-devel
mailing list