[Git][debian-gis-team/openstreetmap-carto][master] 4 commits: make sure that indexes.sql as shipped by the source package is identical to...

[Johannes Schauer Marin Rodrigues (@josch)]

Johannes Schauer Marin Rodrigues pushed to branch master at Debian GIS Project / openstreetmap-carto


Commits:
4ed33a16 by Johannes Schauer Marin Rodrigues at 2021-11-18T15:17:49+01:00
make sure that indexes.sql as shipped by the source package is identical to the one generated by ./scripts/indexes.py

- - - - -
34ac0143 by Johannes Schauer Marin Rodrigues at 2021-11-18T15:17:49+01:00
debian/openstreetmap-carto-common.install: also install project.mml, openstreetmap-carto.lua, openstreetmap-carto.style, indexes.sql

- - - - -
d4c9a0d9 by Johannes Schauer Marin Rodrigues at 2021-11-18T15:19:05+01:00
debian/control: add myself to Uploaders

- - - - -
10e4c018 by Johannes Schauer Marin Rodrigues at 2021-11-18T15:19:20+01:00
debian/changelog: gbp dch

- - - - -


4 changed files:

- debian/changelog
- debian/control
- debian/openstreetmap-carto-common.install
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,7 +1,6 @@
 openstreetmap-carto (5.4.0-1) UNRELEASED; urgency=medium
 
   [ Bas Couwenberg ]
-  * Team upload.
   * New upstream release 4.0.0.
   * Require at least node-carto 0.18.0.
   * Update package for get-shapefiles.sh to get-shapefiles.py rename.
@@ -31,6 +30,11 @@ openstreetmap-carto (5.4.0-1) UNRELEASED; urgency=medium
     anymore
   * debian/openstreetmap-carto-common.install: add external-data.yml as needed
     by get-external-data.py
+  * make sure that indexes.sql as shipped by the source package is identical to
+    the one generated by ./scripts/indexes.py
+  * debian/openstreetmap-carto-common.install: also install project.mml,
+    openstreetmap-carto.lua, openstreetmap-carto.style, indexes.sql
+  * debian/control: add myself to Uploaders
 
  -- Johannes Schauer Marin Rodrigues <josch at debian.org>  Thu, 18 Nov 2021 11:34:30 +0100
 


=====================================
debian/control
=====================================
@@ -1,11 +1,14 @@
 Source: openstreetmap-carto
 Maintainer: Debian GIS Project <pkg-grass-devel at lists.alioth.debian.org>
-Uploaders: Christopher Baines <mail at cbaines.net>
+Uploaders: Christopher Baines <mail at cbaines.net>,
+ Johannes Schauer Marin Rodrigues <josch at debian.org>
 Section: graphics
 Priority: optional
 Build-Depends: debhelper-compat (= 13),
                node-carto (>= 0.18.0),
-               po-debconf
+               po-debconf,
+               python3,
+               python3-yaml
 Standards-Version: 4.5.0
 Vcs-Browser: https://salsa.debian.org/debian-gis-team/openstreetmap-carto
 Vcs-Git: https://salsa.debian.org/debian-gis-team/openstreetmap-carto.git


=====================================
debian/openstreetmap-carto-common.install
=====================================
@@ -2,3 +2,7 @@ scripts/get-external-data.py usr/share/openstreetmap-carto-common/
 symbols                      usr/share/openstreetmap-carto-common/
 style.xml                    usr/share/openstreetmap-carto-common/
 external-data.yml            usr/share/openstreetmap-carto-common/
+project.mml                  usr/share/openstreetmap-carto-common/
+openstreetmap-carto.lua      usr/share/openstreetmap-carto-common/
+openstreetmap-carto.style    usr/share/openstreetmap-carto-common/
+indexes.sql                  usr/share/openstreetmap-carto-common/


=====================================
debian/rules
=====================================
@@ -9,6 +9,9 @@
 
 override_dh_auto_build:
 	carto project.mml > style.xml
+	# make sure that indexes.sql as shipped by the source package is
+	# identical to the one generated by ./scripts/indexes.py
+	python3 scripts/indexes.py | diff -u - indexes.sql
 
 execute_after_dh_auto_clean:
 	debconf-updatepo



View it on GitLab: https://salsa.debian.org/debian-gis-team/openstreetmap-carto/-/compare/ca33e20a138e4e33c06cc58a27757fb3d283b0a6...10e4c018fed1eb1ca41d139996e08d5aa4c051f3

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/openstreetmap-carto/-/compare/ca33e20a138e4e33c06cc58a27757fb3d283b0a6...10e4c018fed1eb1ca41d139996e08d5aa4c051f3
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/20211118/402a8b93/attachment-0001.htm>