[Git][debian-gis-team/openstreetmap-carto][master] 8 commits: upstream renamed get-shapefiles.py -> get-external-data.py
Johannes Schauer Marin Rodrigues (@josch)
gitlab at salsa.debian.org
Thu Nov 18 10:23:10 GMT 2021
Johannes Schauer Marin Rodrigues pushed to branch master at Debian GIS Project / openstreetmap-carto
Commits:
15734355 by Johannes Schauer Marin Rodrigues at 2021-11-18T10:46:19+01:00
upstream renamed get-shapefiles.py -> get-external-data.py
- - - - -
1acc3de5 by Johannes Schauer Marin Rodrigues at 2021-11-18T10:54:23+01:00
debian/control: switch to python3
- - - - -
d54a6d6d by Johannes Schauer Marin Rodrigues at 2021-11-18T11:00:05+01:00
debian/control: bump dh compat to 13
- - - - -
f8721327 by Johannes Schauer Marin Rodrigues at 2021-11-18T11:05:06+01:00
use openstreetmap-carto.maintscript instead of manual call to dpkg-maintscript-helper
- - - - -
87f3dd02 by Johannes Schauer Marin Rodrigues at 2021-11-18T11:17:01+01:00
debian/copyright: add myself
- - - - -
6bbdf97e by Johannes Schauer Marin Rodrigues at 2021-11-18T11:17:17+01:00
debian/control: add Rules-Requires-Root: no
- - - - -
40f4f291 by Johannes Schauer Marin Rodrigues at 2021-11-18T11:17:37+01:00
debian/rules: mark ./symbols/man_made/crane.svg as not executable
- - - - -
0fc68c8e by Johannes Schauer Marin Rodrigues at 2021-11-18T11:22:00+01:00
debian/openstreetmap-carto.lintian-overrides: warning is not emitted anymore
- - - - -
24 changed files:
- − debian/compat
- debian/control
- debian/copyright
- debian/openstreetmap-carto-common.install
- debian/openstreetmap-carto-common.postinst
- debian/openstreetmap-carto-common.templates
- − debian/openstreetmap-carto.lintian-overrides
- + debian/openstreetmap-carto.maintscript
- debian/openstreetmap-carto.postinst
- debian/openstreetmap-carto.postrm
- debian/openstreetmap-carto.preinst
- debian/openstreetmap-carto.prerm
- debian/po/cs.po
- debian/po/da.po
- debian/po/de.po
- debian/po/fr.po
- debian/po/it.po
- debian/po/nl.po
- debian/po/pt.po
- debian/po/pt_BR.po
- debian/po/ru.po
- debian/po/sv.po
- debian/po/templates.pot
- debian/rules
Changes:
=====================================
debian/compat deleted
=====================================
@@ -1 +0,0 @@
-9
=====================================
debian/control
=====================================
@@ -3,13 +3,14 @@ Maintainer: Debian GIS Project <pkg-grass-devel at lists.alioth.debian.org>
Uploaders: Christopher Baines <mail at cbaines.net>
Section: graphics
Priority: optional
-Build-Depends: debhelper (>= 9.0.0),
+Build-Depends: debhelper-compat (= 13),
node-carto (>= 0.18.0),
po-debconf
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
Homepage: https://github.com/gravitystorm/openstreetmap-carto
+Rules-Requires-Root: no
Package: openstreetmap-carto-common
Architecture: all
@@ -20,7 +21,7 @@ Depends: curl,
fonts-noto-unhinted,
gdal-bin,
mapnik-utils,
- python,
+ python3,
ttf-unifont,
unzip,
${misc:Depends}
=====================================
debian/copyright
=====================================
@@ -9,6 +9,7 @@ License: CC0
Files: debian/*
Copyright: 2014-2015 Christopher Baines <mail at cbaines.net>
2015 Ruben Undheim <ruben.undheim at gmail.com>
+ 2021 Johannes Schauer Marin Rodrigues <josch at debian.org>
License: CC0
License: CC0
=====================================
debian/openstreetmap-carto-common.install
=====================================
@@ -1,3 +1,3 @@
-scripts/get-shapefiles.py usr/share/openstreetmap-carto-common/
-symbols usr/share/openstreetmap-carto-common/
-style.xml usr/share/openstreetmap-carto-common/
+scripts/get-external-data.py usr/share/openstreetmap-carto-common/
+symbols usr/share/openstreetmap-carto-common/
+style.xml usr/share/openstreetmap-carto-common/
=====================================
debian/openstreetmap-carto-common.postinst
=====================================
@@ -7,7 +7,7 @@ set -e
db_get openstreetmap-carto/fetch-data
if [ "$RET" = "true" ]; then
- cd /usr/share/openstreetmap-carto-common/ && ./get-shapefiles.py
+ cd /usr/share/openstreetmap-carto-common/ && ./get-external-data.py
db_set openstreetmap-carto/fetch-data false
elif [ -d /usr/share/openstreetmap-carto/data.old ] &&
[ ! -L /usr/share/openstreetmap-carto/data.old ] &&
=====================================
debian/openstreetmap-carto-common.templates
=====================================
@@ -14,5 +14,5 @@ _Description: Download OpenStreetMap data files from the Internet?
be downloaded from the Internet.
.
If you choose not to do this now, it can be done manually later
- by running the "get-shapefiles.py" script in the /usr/share/openstreetmap-carto-common
+ by running the "get-external-data.py" script in the /usr/share/openstreetmap-carto-common
directory.
=====================================
debian/openstreetmap-carto.lintian-overrides deleted
=====================================
@@ -1,3 +0,0 @@
-# This symlink is not broken after the configure step of openstreetmap-carto-common has
-# completed
-package-contains-broken-symlink usr/share/openstreetmap-carto/data ../openstreetmap-carto-common/data
=====================================
debian/openstreetmap-carto.maintscript
=====================================
@@ -0,0 +1,3 @@
+# This is necessary in order to replace the dir with a symbolic link since a dir will never be
+# replaced by a symbolic link during upgrade if not done in maintainer scripts.
+dir_to_symlink /usr/share/openstreetmap-carto/symbols ../openstreetmap-carto-common/symbols 2.35.0-2 openstreetmap-carto
=====================================
debian/openstreetmap-carto.postinst
=====================================
@@ -27,11 +27,6 @@ case "$1" in
esac
-# This is necessary in order to replace the dir with a symbolic link since a dir will never be
-# replaced by a symbolic link during upgrade if not done in maintainer scripts.
-dpkg-maintscript-helper dir_to_symlink /usr/share/openstreetmap-carto/symbols \
- ../openstreetmap-carto-common/symbols 2.35.0-2 openstreetmap-carto -- "$@"
-
#DEBHELPER#
=====================================
debian/openstreetmap-carto.postrm
=====================================
@@ -29,11 +29,6 @@ case "$1" in
;;
esac
-# This is necessary in order to replace the dir with a symbolic link since a dir will never be
-# replaced by a symbolic link during upgrade if not done in maintainer scripts.
-dpkg-maintscript-helper dir_to_symlink /usr/share/openstreetmap-carto/symbols \
- ../openstreetmap-carto-common/symbols 2.35.0-2 openstreetmap-carto -- "$@"
-
# dh_installdeb will replace this with shell code automatically
# generated by other debhelper scripts.
=====================================
debian/openstreetmap-carto.preinst
=====================================
@@ -52,11 +52,6 @@ case "$1" in
;;
esac
-# This is necessary in order to replace the dir with a symbolic link since a dir will never be
-# replaced by a symbolic link during upgrade if not done in maintainer scripts.
-dpkg-maintscript-helper dir_to_symlink /usr/share/openstreetmap-carto/symbols \
- ../openstreetmap-carto-common/symbols 2.35.0-2 openstreetmap-carto -- "$@"
-
# dh_installdeb will replace this with shell code automatically
# generated by other debhelper scripts.
=====================================
debian/openstreetmap-carto.prerm
=====================================
@@ -34,11 +34,6 @@ case "$1" in
;;
esac
-# This is necessary in order to replace the dir with a symbolic link since a dir will never be
-# replaced by a symbolic link during upgrade if not done in maintainer scripts.
-dpkg-maintscript-helper dir_to_symlink /usr/share/openstreetmap-carto/symbols \
- ../openstreetmap-carto-common/symbols 2.35.0-2 openstreetmap-carto -- "$@"
-
# dh_installdeb will replace this with shell code automatically
# generated by other debhelper scripts.
=====================================
debian/po/cs.po
=====================================
@@ -37,11 +37,11 @@ msgstr ""
#: ../openstreetmap-carto-common.templates:2001
msgid ""
"If you choose not to do this now, it can be done manually later by running "
-"the \"get-shapefiles.py\" script in the /usr/share/openstreetmap-carto-common "
+"the \"get-external-data.py\" script in the /usr/share/openstreetmap-carto-common "
"directory."
msgstr ""
"Pokud tyto datové soubory nyní nestáhnete, můžete je později stáhnout ručně "
-"spuštěním skriptu \"get-shapefiles.py\" v adresáři /usr/share/openstreetmap-"
+"spuštěním skriptu \"get-external-data.py\" v adresáři /usr/share/openstreetmap-"
"carto-common."
#. Type: string
=====================================
debian/po/da.po
=====================================
@@ -37,11 +37,11 @@ msgstr ""
#: ../openstreetmap-carto-common.templates:2001
msgid ""
"If you choose not to do this now, it can be done manually later by running "
-"the \"get-shapefiles.py\" script in the /usr/share/openstreetmap-carto-common "
+"the \"get-external-data.py\" script in the /usr/share/openstreetmap-carto-common "
"directory."
msgstr ""
"Hvis du vælger ikke at gøre dette, så kan det gøres manuelt senere ved at "
-"køre skriptet »get-shapefiles.py« i mappen /usr/share/openstreetmap-carto-"
+"køre skriptet »get-external-data.py« i mappen /usr/share/openstreetmap-carto-"
"common."
#. Type: string
=====================================
debian/po/de.po
=====================================
@@ -40,11 +40,11 @@ msgstr ""
#: ../openstreetmap-carto-common.templates:2001
msgid ""
"If you choose not to do this now, it can be done manually later by running "
-"the \"get-shapefiles.py\" script in the /usr/share/openstreetmap-carto-common "
+"the \"get-external-data.py\" script in the /usr/share/openstreetmap-carto-common "
"directory."
msgstr ""
"Falls Sie das nun nicht möchten, können Sie dies später nachholen, indem Sie "
-"das Skript »get-shapefiles.py« im Verzeichnis »/usr/share/openstreetmap-"
+"das Skript »get-external-data.py« im Verzeichnis »/usr/share/openstreetmap-"
"carto-common« ausführen."
#. Type: string
=====================================
debian/po/fr.po
=====================================
@@ -39,11 +39,11 @@ msgstr ""
#: ../openstreetmap-carto-common.templates:2001
msgid ""
"If you choose not to do this now, it can be done manually later by running "
-"the \"get-shapefiles.py\" script in the /usr/share/openstreetmap-carto-common "
+"the \"get-external-data.py\" script in the /usr/share/openstreetmap-carto-common "
"directory."
msgstr ""
"Si vous choisissez de ne pas le faire maintenant, vous pouvez le faire vous-"
-"même plus tard en exécutant le script « get-shapefiles.py » dans le "
+"même plus tard en exécutant le script « get-external-data.py » dans le "
"répertoire /usr/share/openstreetmap-carto-common."
#. Type: string
=====================================
debian/po/it.po
=====================================
@@ -38,11 +38,11 @@ msgstr ""
#: ../openstreetmap-carto-common.templates:2001
msgid ""
"If you choose not to do this now, it can be done manually later by running "
-"the \"get-shapefiles.py\" script in the /usr/share/openstreetmap-carto-common "
+"the \"get-external-data.py\" script in the /usr/share/openstreetmap-carto-common "
"directory."
msgstr ""
"Se si sceglie di non farlo ora, può essere fatto manualmente in seguito "
-"eseguendo lo script «get-shapefiles.py» nella directory /usr/share/"
+"eseguendo lo script «get-external-data.py» nella directory /usr/share/"
"openstreetmap-carto-common."
#. Type: string
=====================================
debian/po/nl.po
=====================================
@@ -40,11 +40,11 @@ msgstr ""
#: ../openstreetmap-carto-common.templates:2001
msgid ""
"If you choose not to do this now, it can be done manually later by running "
-"the \"get-shapefiles.py\" script in the /usr/share/openstreetmap-carto-common "
+"the \"get-external-data.py\" script in the /usr/share/openstreetmap-carto-common "
"directory."
msgstr ""
"Indien u er voor kiest om dit nu niet te doen, dan kunt u dit later "
-"handmatig doen door het script \"get-shapefiles.py\" uit de map /usr/share/"
+"handmatig doen door het script \"get-external-data.py\" uit de map /usr/share/"
"openstreetmap-carto-common uit te voeren."
#. Type: string
=====================================
debian/po/pt.po
=====================================
@@ -39,11 +39,11 @@ msgstr ""
#: ../openstreetmap-carto-common.templates:2001
msgid ""
"If you choose not to do this now, it can be done manually later by running "
-"the \"get-shapefiles.py\" script in the /usr/share/openstreetmap-carto-common "
+"the \"get-external-data.py\" script in the /usr/share/openstreetmap-carto-common "
"directory."
msgstr ""
"Se escolher não fazer isto agora, pode ser feito manualmente mais tarde ao "
-"correr o script \"get-shapefiles.py\" no directório /usr/share/openstreetmap-"
+"correr o script \"get-external-data.py\" no directório /usr/share/openstreetmap-"
"carto-common."
#. Type: string
=====================================
debian/po/pt_BR.po
=====================================
@@ -38,11 +38,11 @@ msgstr ""
#: ../openstreetmap-carto-common.templates:2001
msgid ""
"If you choose not to do this now, it can be done manually later by running "
-"the \"get-shapefiles.py\" script in the /usr/share/openstreetmap-carto-common "
+"the \"get-external-data.py\" script in the /usr/share/openstreetmap-carto-common "
"directory."
msgstr ""
"Se você escolher não fazer isso agora, poderá fazer manualmente mais tarde "
-"executando o script \"get-shapefiles.py\" no diretório /usr/share/"
+"executando o script \"get-external-data.py\" no diretório /usr/share/"
"openstreetmap-carto-common."
#. Type: string
=====================================
debian/po/ru.po
=====================================
@@ -39,11 +39,11 @@ msgstr ""
#: ../openstreetmap-carto-common.templates:2001
msgid ""
"If you choose not to do this now, it can be done manually later by running "
-"the \"get-shapefiles.py\" script in the /usr/share/openstreetmap-carto-common "
+"the \"get-external-data.py\" script in the /usr/share/openstreetmap-carto-common "
"directory."
msgstr ""
"Если ответить отрицательно, то это действие можно выполнить позднее с "
-"помощью сценария «get-shapefiles.py» из каталога /usr/share/openstreetmap-"
+"помощью сценария «get-external-data.py» из каталога /usr/share/openstreetmap-"
"carto-common."
#. Type: string
=====================================
debian/po/sv.po
=====================================
@@ -33,8 +33,8 @@ msgstr "OpenStreetMap-carto-formatmall använder flera datafiler som måste häm
#. Type: boolean
#. Description
#: ../openstreetmap-carto-common.templates:2001
-msgid "If you choose not to do this now, it can be done manually later by running the \"get-shapefiles.sh\" script in the /usr/share/openstreetmap-carto-common directory."
-msgstr "Om du väljer att inte göra det nu kan det göras manuellt senare genom att köra \"get-shapefiles.sh\"-skriptet i mappen /usr/share/openstreetmap-carto-common."
+msgid "If you choose not to do this now, it can be done manually later by running the \"get-external-data.py\" script in the /usr/share/openstreetmap-carto-common directory."
+msgstr "Om du väljer att inte göra det nu kan det göras manuellt senare genom att köra \"get-external-data.py\"-skriptet i mappen /usr/share/openstreetmap-carto-common."
#. Type: string
#. Description
=====================================
debian/po/templates.pot
=====================================
@@ -36,7 +36,7 @@ msgstr ""
#: ../openstreetmap-carto-common.templates:2001
msgid ""
"If you choose not to do this now, it can be done manually later by running "
-"the \"get-shapefiles.py\" script in the /usr/share/openstreetmap-carto-"
+"the \"get-external-data.py\" script in the /usr/share/openstreetmap-carto-"
"common directory."
msgstr ""
=====================================
debian/rules
=====================================
@@ -5,11 +5,12 @@
#export DH_VERBOSE=1
%:
- dh $@ --parallel
+ dh $@
override_dh_auto_build:
carto project.mml > style.xml
-override_dh_auto_clean:
- dh_auto_clean
+execute_after_dh_auto_clean:
debconf-updatepo
+ # workaround for https://github.com/gravitystorm/openstreetmap-carto/issues/4493
+ chmod -x ./symbols/man_made/crane.svg
View it on GitLab: https://salsa.debian.org/debian-gis-team/openstreetmap-carto/-/compare/9bfc3231fa9992da477a42b99c442faaa00c1cc3...0fc68c8efdfd2cbcc95865f5d04a439777ec93c9
--
View it on GitLab: https://salsa.debian.org/debian-gis-team/openstreetmap-carto/-/compare/9bfc3231fa9992da477a42b99c442faaa00c1cc3...0fc68c8efdfd2cbcc95865f5d04a439777ec93c9
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/8d01f9b2/attachment-0001.htm>
More information about the Pkg-grass-devel
mailing list