From 973331a81782f99e5e5ade8edf6a12da947c3596 Mon Sep 17 00:00:00 2001 From: Yuri Astrakhan Date: Thu, 21 May 2020 18:25:21 -0400 Subject: [PATCH 1/2] Remove auto-generated debian/control I am not an expert in this, but to my knowledge debian/control file is auto-regenerated during the build --- .gitignore | 1 + debian/control | 25 ------------------------- 2 files changed, 1 insertion(+), 25 deletions(-) delete mode 100644 debian/control diff --git a/.gitignore b/.gitignore index aa246d4..75eafbb 100644 --- a/.gitignore +++ b/.gitignore @@ -12,6 +12,7 @@ debian/postgresql-*-osml10n* debian/debhelper-build-stamp *--*.sql *.control +debian/control debian/files country_languages.data debian/.debhelper diff --git a/debian/control b/debian/control deleted file mode 100644 index 0dd5961..0000000 --- a/debian/control +++ /dev/null @@ -1,25 +0,0 @@ -Source: osml10n -Section: misc -Priority: extra -Maintainer: Sven Geggus -Build-Depends: debhelper (>= 8.0.0), libicu-dev, - postgresql-server-dev-all, - postgresql-server-dev-10 | postgresql-server-dev-11 | postgresql-server-dev-12, - curl, libkakasi2-dev, libutf8proc-dev, pandoc -Standards-Version: 3.9.2 - -Package: postgresql-11-osml10n -Architecture: any -# "postgis" is used as some kind of meta package here, because it -# contains all dependencies for whatever version of PostGIS is available -# on the Debian or Ubuntu intallation this code is going to get built -Depends: ${shlibs:Depends}, ${misc:Depends}, postgresql-11, icu-devtools -Recommends: postgresql-plpython3-11, python3-matplotlib, python3-pip, postgis -Description: l10n package for generation of OSM based maps from PostGIS - localisation package for generation of OSM based maps from PostGIS. - This is currently used in german mapnik style but can be used in a - renderer independant way because ist is based on PostgreSQL stored - procedures. This includes a transliteration function based on - ICU any-latin, a kanji transcription library based on - libkakasi and a couple of pl/pgSQL funktions. - From 5fc6bb3f3de26922387c749d94ea2f6cc38119fa Mon Sep 17 00:00:00 2001 From: Yuri Astrakhan Date: Thu, 21 May 2020 18:50:34 -0400 Subject: [PATCH 2/2] trying to auto-update control --- .github/workflows/ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 63f078c..14f891a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -24,6 +24,7 @@ jobs: sudo apt-get update sudo apt-get -y install devscripts equivs python3-setuptools cd src + pg_buildext updatecontrol sudo mk-build-deps -t "apt-get -y" -i debian/control - name: Build