diff -Nru mapproxy-1.15.1/debian/changelog mapproxy-1.15.1/debian/changelog --- mapproxy-1.15.1/debian/changelog 2022-08-03 10:00:00.000000000 +0000 +++ mapproxy-1.15.1/debian/changelog 2022-12-05 08:00:00.000000000 +0000 @@ -1,8 +1,22 @@ -mapproxy (1.15.1-1~jammy0) jammy; urgency=medium +mapproxy (1.15.1-2~jammy0) jammy; urgency=medium - * Patch mapnik.py to work with latest pached mapnik. + * No change rebuild for Jammy. - -- Angelos Tzotsos Wed, 03 Aug 2022 13:00:00 +0300 + -- Angelos Tzotsos Mon, 05 Dec 2022 10:00:00 +0200 + +mapproxy (1.15.1-2) unstable; urgency=medium + + [ Bas Couwenberg ] + * Add patch by Chris Lamb to make the build reproducible. + (closes: #1012836) + * Bump Standards-Version to 4.6.1, no changes. + * Add Rules-Requires-Root to control file. + * Update lintian overrides. + + [ Angelos Tzotsos ] + * Added patch to work with mapnik supporting latest proj. + + -- Bas Couwenberg Thu, 01 Dec 2022 12:46:51 +0100 mapproxy (1.15.1-1) unstable; urgency=medium diff -Nru mapproxy-1.15.1/debian/control mapproxy-1.15.1/debian/control --- mapproxy-1.15.1/debian/control 2022-06-14 10:49:56.000000000 +0000 +++ mapproxy-1.15.1/debian/control 2022-11-28 12:17:11.000000000 +0000 @@ -24,10 +24,11 @@ docbook-xsl, docbook-xml, xsltproc -Standards-Version: 4.6.0 +Standards-Version: 4.6.1 Vcs-Browser: https://salsa.debian.org/debian-gis-team/mapproxy Vcs-Git: https://salsa.debian.org/debian-gis-team/mapproxy.git Homepage: http://mapproxy.org/ +Rules-Requires-Root: no Package: mapproxy Architecture: all diff -Nru mapproxy-1.15.1/debian/mapproxy-doc.lintian-overrides mapproxy-1.15.1/debian/mapproxy-doc.lintian-overrides --- mapproxy-1.15.1/debian/mapproxy-doc.lintian-overrides 2021-03-12 12:21:48.000000000 +0000 +++ mapproxy-1.15.1/debian/mapproxy-doc.lintian-overrides 2022-11-28 12:17:11.000000000 +0000 @@ -1,8 +1,8 @@ # libjs-twitter-bootstrap is not compatible -embedded-javascript-library usr/share/doc/mapproxy/html/_static/bootstrap-*/js/bootstrap.js please use libjs-bootstrap -font-in-non-font-package usr/share/doc/mapproxy/html/_static/boot*/fonts/* -font-outside-font-dir usr/share/doc/mapproxy/html/_static/boots*/fonts/* +embedded-javascript-library please use libjs-bootstrap [usr/share/doc/mapproxy/html/_static/bootstrap-*/js/bootstrap.js] +font-in-non-font-package [usr/share/doc/mapproxy/html/_static/boot*/fonts/*] +font-outside-font-dir [usr/share/doc/mapproxy/html/_static/boots*/fonts/*] # libjs-jquery is not compatible -embedded-javascript-library usr/share/doc/mapproxy/html/_static/js/jquery* please use libjs-jquery +embedded-javascript-library please use libjs-jquery [usr/share/doc/mapproxy/html/_static/js/jquery*] diff -Nru mapproxy-1.15.1/debian/patches/mapnik.patch mapproxy-1.15.1/debian/patches/mapnik.patch --- mapproxy-1.15.1/debian/patches/mapnik.patch 2022-08-03 10:00:00.000000000 +0000 +++ mapproxy-1.15.1/debian/patches/mapnik.patch 2022-11-28 12:19:31.000000000 +0000 @@ -1,18 +1,6 @@ Description: Patch to work with latest mapnik proj support Author: Angelos Tzotsos - ---- -The information above should follow the Patch Tagging Guidelines, please -checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here -are templates for supplementary fields that you might want to add: - -Origin: , -Bug: -Bug-Debian: https://bugs.debian.org/ -Bug-Ubuntu: https://launchpad.net/bugs/ -Forwarded: -Reviewed-By: -Last-Update: 2022-08-04 +Forwarded: https://github.com/mapproxy/mapproxy/issues/538#issuecomment-1205046859 --- mapproxy-1.15.1.orig/mapproxy/source/mapnik.py +++ mapproxy-1.15.1/mapproxy/source/mapnik.py diff -Nru mapproxy-1.15.1/debian/patches/reproducible-build.patch mapproxy-1.15.1/debian/patches/reproducible-build.patch --- mapproxy-1.15.1/debian/patches/reproducible-build.patch 1970-01-01 00:00:00.000000000 +0000 +++ mapproxy-1.15.1/debian/patches/reproducible-build.patch 2022-06-15 12:07:40.000000000 +0000 @@ -0,0 +1,53 @@ +Description: Make the build reproducible +Author: Chris Lamb +Bug-Debian: https://bugs.debian.org/1012836 +Forwarded: https://github.com/mapproxy/mapproxy/pull/585 + +--- a/mapproxy/cache/geopackage.py ++++ b/mapproxy/cache/geopackage.py +@@ -14,12 +14,14 @@ + # limitations under the License. + + ++import datetime + import hashlib + import logging + import os + import re + import sqlite3 + import threading ++import time + + from mapproxy.cache.base import TileCacheBase, tile_buffer, REMOVE_ON_UNLOCK + from mapproxy.compat import BytesIO, PY2, itertools +@@ -305,6 +307,10 @@ AUTHORITY["EPSG","9122"]],AUTHORITY["EPS + log.info("srs_id already exists.".format(wkt_entry[0])) + db.commit() + ++ last_change = datetime.datetime.utcfromtimestamp( ++ int(os.environ.get('SOURCE_DATE_EPOCH', time.time())) ++ ) ++ + # Ensure that tile table exists here, don't overwrite a valid entry. + try: + db.execute(""" +@@ -313,16 +319,18 @@ AUTHORITY["EPSG","9122"]],AUTHORITY["EPS + data_type, + identifier, + description, ++ last_change, + min_x, + max_x, + min_y, + max_y, + srs_id) +- VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?); ++ VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?); + """, (self.table_name, + "tiles", + self.table_name, + "Created with Mapproxy.", ++ last_change, + self.tile_grid.bbox[0], + self.tile_grid.bbox[2], + self.tile_grid.bbox[1], diff -Nru mapproxy-1.15.1/debian/patches/series mapproxy-1.15.1/debian/patches/series --- mapproxy-1.15.1/debian/patches/series 2022-08-03 10:00:00.000000000 +0000 +++ mapproxy-1.15.1/debian/patches/series 2022-11-28 12:17:11.000000000 +0000 @@ -1,2 +1,3 @@ disable-tag_date.patch +reproducible-build.patch mapnik.patch