diff -Nru mapserver-7.4.1/debian/changelog mapserver-7.4.1/debian/changelog --- mapserver-7.4.1/debian/changelog 2019-07-14 14:00:00.000000000 +0000 +++ mapserver-7.4.1/debian/changelog 2019-07-25 16:00:00.000000000 +0000 @@ -1,3 +1,15 @@ +mapserver (7.4.1-1~bionic2) bionic; urgency=medium + + * Fix Python MapScript install. + + -- Angelos Tzotsos Thu, 25 Jul 2019 18:00:00 +0200 + +mapserver (7.4.1-1~bionic1) bionic; urgency=medium + + * Enable MapScript for Python 2. + + -- Angelos Tzotsos Thu, 25 Jul 2019 18:00:00 +0200 + mapserver (7.4.1-1~bionic0) bionic; urgency=medium * No change rebuild for Bionic. diff -Nru mapserver-7.4.1/debian/control mapserver-7.4.1/debian/control --- mapserver-7.4.1/debian/control 2019-07-10 16:30:00.000000000 +0000 +++ mapserver-7.4.1/debian/control 2019-07-25 16:00:00.000000000 +0000 @@ -36,9 +36,9 @@ pkg-config, pkg-kde-tools, protobuf-c-compiler, - python3-all, - python3-all-dev, - python3-setuptools, + python-all, + python-all-dev, + python-setuptools, swig, docbook2x, docbook-xsl, @@ -62,7 +62,7 @@ libmapscript-perl, php-mapscript, php-mapscript-ng, - python3-mapscript + python-mapscript Pre-Depends: ${misc:Pre-Depends} Description: Shared library for MapServer This package contains the shared library. @@ -83,7 +83,7 @@ libmapscript-perl, php-mapscript, php-mapscript-ng, - python3-mapscript + python-mapscript Breaks: libmapserver-6.2.1-dev (<< 6.4.0-1~), libmapserver1-dev (<< 7.0.0~) Replaces: libmapserver-6.2.1-dev (<< 6.4.0-1~), @@ -105,7 +105,7 @@ libmapscript-perl, php-mapscript, php-mapscript-ng, - python3-mapscript + python-mapscript Description: CGI executable for MapServer This package contains the mapserv CGI program. It provides the MapServer template language, and can be used to implement Web Map @@ -127,7 +127,7 @@ libmapscript-perl, php-mapscript, php-mapscript-ng, - python3-mapscript + python-mapscript Description: MapServer utilities This package provides command-line utilities for MapServer. . @@ -144,7 +144,7 @@ libmapscript-perl, php-mapscript, php-mapscript-ng, - python3-mapscript + python-mapscript Description: documentation for MapServer This package provides some brief documentation for MapServer. . @@ -202,16 +202,16 @@ MapServer is a CGI-based framework for Internet map services which supports Open Geospatial Consortium (OGC) standards. -Package: python3-mapscript +Package: python-mapscript Architecture: any Section: python Depends: ttf-bitstream-vera, - ${python3:Depends}, + ${python:Depends}, ${shlibs:Depends}, ${misc:Depends} Suggests: mapserver-bin, mapserver-doc -Provides: ${python3:Provides} +Provides: ${python:Provides} Description: Python library for MapServer Python MapScript provides MapServer functions for Python scripts. . diff -Nru mapserver-7.4.1/debian/python3-mapscript.examples mapserver-7.4.1/debian/python3-mapscript.examples --- mapserver-7.4.1/debian/python3-mapscript.examples 2019-07-07 06:53:23.000000000 +0000 +++ mapserver-7.4.1/debian/python3-mapscript.examples 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -mapscript/python/examples/* diff -Nru mapserver-7.4.1/debian/python3-mapscript.install mapserver-7.4.1/debian/python3-mapscript.install --- mapserver-7.4.1/debian/python3-mapscript.install 2019-07-07 06:53:23.000000000 +0000 +++ mapserver-7.4.1/debian/python3-mapscript.install 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -usr/lib/python*/ diff -Nru mapserver-7.4.1/debian/python3-mapscript.links mapserver-7.4.1/debian/python3-mapscript.links --- mapserver-7.4.1/debian/python3-mapscript.links 2019-07-07 06:53:23.000000000 +0000 +++ mapserver-7.4.1/debian/python3-mapscript.links 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -usr/share/fonts/truetype/ttf-bitstream-vera/Vera.ttf usr/lib/python3/dist-packages/mapscript/tests/data/vera/Vera.ttf -usr/share/fonts/truetype/ttf-bitstream-vera/VeraBd.ttf usr/lib/python3/dist-packages/mapscript/tests/data/vera/VeraBd.ttf diff -Nru mapserver-7.4.1/debian/python3-mapscript.lintian-overrides mapserver-7.4.1/debian/python3-mapscript.lintian-overrides --- mapserver-7.4.1/debian/python3-mapscript.lintian-overrides 2019-07-07 06:53:23.000000000 +0000 +++ mapserver-7.4.1/debian/python3-mapscript.lintian-overrides 1970-01-01 00:00:00.000000000 +0000 @@ -1,3 +0,0 @@ -# https://github.com/mapserver/mapserver/issues/5746 -file-references-package-build-path * - diff -Nru mapserver-7.4.1/debian/python-mapscript.examples mapserver-7.4.1/debian/python-mapscript.examples --- mapserver-7.4.1/debian/python-mapscript.examples 1970-01-01 00:00:00.000000000 +0000 +++ mapserver-7.4.1/debian/python-mapscript.examples 2019-07-07 06:53:23.000000000 +0000 @@ -0,0 +1 @@ +mapscript/python/examples/* diff -Nru mapserver-7.4.1/debian/python-mapscript.install mapserver-7.4.1/debian/python-mapscript.install --- mapserver-7.4.1/debian/python-mapscript.install 1970-01-01 00:00:00.000000000 +0000 +++ mapserver-7.4.1/debian/python-mapscript.install 2019-07-07 06:53:23.000000000 +0000 @@ -0,0 +1 @@ +usr/lib/python*/ diff -Nru mapserver-7.4.1/debian/python-mapscript.lintian-overrides mapserver-7.4.1/debian/python-mapscript.lintian-overrides --- mapserver-7.4.1/debian/python-mapscript.lintian-overrides 1970-01-01 00:00:00.000000000 +0000 +++ mapserver-7.4.1/debian/python-mapscript.lintian-overrides 2019-07-07 06:53:23.000000000 +0000 @@ -0,0 +1,3 @@ +# https://github.com/mapserver/mapserver/issues/5746 +file-references-package-build-path * + diff -Nru mapserver-7.4.1/debian/rules mapserver-7.4.1/debian/rules --- mapserver-7.4.1/debian/rules 2019-07-07 06:53:23.000000000 +0000 +++ mapserver-7.4.1/debian/rules 2019-07-25 16:00:00.000000000 +0000 @@ -28,7 +28,7 @@ BUILD_DATE := $(shell LC_ALL=C date -u "+%d %B %Y" -d "@$(SOURCE_DATE_EPOCH)") %: - dh $@ --with php,python3,pkgkde_symbolshelper \ + dh $@ --with php,python2,pkgkde_symbolshelper \ --parallel \ --buildsystem cmake @@ -126,8 +126,8 @@ override_dh_makeshlibs: dh_makeshlibs -Xphp_mapscript -- -c0 -v$(MS_VERSION) -override_dh_python3: - dh_python3 -ppython3-mapscript +override_dh_python2: + dh_python2 -ppython-mapscript override_dh_perl: dh_perl -plibmapscript-perl diff -Nru mapserver-7.4.1/debian/source/lintian-overrides mapserver-7.4.1/debian/source/lintian-overrides --- mapserver-7.4.1/debian/source/lintian-overrides 2019-07-07 06:53:23.000000000 +0000 +++ mapserver-7.4.1/debian/source/lintian-overrides 2019-07-25 16:00:00.000000000 +0000 @@ -1,3 +1,6 @@ +# Only a single Python version is supported during the build +python-foo-but-no-python3-foo python-mapscript + # Not worth the effort testsuite-autopkgtest-missing