Felix Delattre pushed to branch master at Debian GIS Project / libapache2-mod-tile
Commits: 112fd6e1 by Felix Delattre at 2020-08-20T19:35:56+00:00 fixed another spelling error (upstream pr #175) - - - - - 214f1eac by Felix Delattre at 2020-08-20T19:36:53+00:00 added myself as one of the uploaders - - - - - a7434314 by Felix Delattre at 2020-08-20T19:38:10+00:00 added patch to prevent duplicates problem compiling (upstream pr #202) - - - - - cb0177f1 by Felix Delattre at 2020-08-20T19:39:00+00:00 added patch to update some links and paths (upstream pr #174 and #175) - - - - - 5 changed files: - debian/control - + debian/patches/prevent-duplicates.patch - debian/patches/series - debian/patches/spelling-errors.patch - + debian/patches/update-link-and-path.patch Changes: ===================================== debian/control ===================================== @@ -1,6 +1,7 @@ Source: libapache2-mod-tile Maintainer: Debian GIS Project <[email protected]> Uploaders: Bas Couwenberg <[email protected]> + Felix Delattre <[email protected]> Section: science Priority: optional Build-Depends: debhelper (>= 10~), ===================================== debian/patches/prevent-duplicates.patch ===================================== @@ -0,0 +1,75 @@ +Description: Move variables to prevent duplicates (from https://github.com/openstreetmap/mod_tile/pull/202) +Author: Felix Delattre <[email protected]> + +--- a/includes/daemon.h ++++ b/includes/daemon.h +@@ -45,7 +45,7 @@ typedef struct { + + + +-struct request_queue * render_request_queue; ++extern struct request_queue * render_request_queue; + + void statsRenderFinish(int z, long time); + void request_exit(void); +--- a/includes/render_submit_queue.h ++++ b/includes/render_submit_queue.h +@@ -5,8 +5,6 @@ extern "C" { + #endif + + +-int work_complete; +- + void enqueue(const char *xmlname, int x, int y, int z); + void spawn_workers(int num, const char *socketpath, int maxLoad); + void wait_for_empty_queue(void); +--- a/src/daemon.c ++++ b/src/daemon.c +@@ -49,6 +49,7 @@ static renderd_config config; + + int noSlaveRenders; + ++struct request_queue * render_request_queue; + + static const char *cmdStr(enum protoCmd c) + { +--- a/src/render_expired.c ++++ b/src/render_expired.c +@@ -89,7 +89,6 @@ unsigned long long twopow[MAX_ZOOM]; + static int minZoom = 0; + static int maxZoom = 18; + static int verbose = 0; +-int work_complete; + static int maxLoad = MAX_LOAD_OLD; + + void display_rate(struct timeval start, struct timeval end, int num) +--- a/src/render_list.c ++++ b/src/render_list.c +@@ -40,7 +40,6 @@ static int maxZoom = MAX_ZOOM; + static int verbose = 0; + static int maxLoad = MAX_LOAD_OLD; + +-int work_complete; + + void display_rate(struct timeval start, struct timeval end, int num) + { +--- a/src/render_old.c ++++ b/src/render_old.c +@@ -47,7 +47,6 @@ static time_t planetTime; + static struct timeval start, end; + + +-int work_complete; + + void display_rate(struct timeval start, struct timeval end, int num) + { +--- a/src/render_submit_queue.c ++++ b/src/render_submit_queue.c +@@ -47,6 +47,7 @@ static struct qItem *qHead, *qTail; + + static int no_workers; + static pthread_t *workers; ++static int work_complete; + + static void check_load(void) + { ===================================== debian/patches/series ===================================== @@ -2,3 +2,5 @@ iniparser.patch openlayers.patch spelling-errors.patch manpage-section-mismatch.patch +prevent-duplicates.patch +update-link-and-typo.patch ===================================== debian/patches/spelling-errors.patch ===================================== @@ -26,6 +26,17 @@ Author: Bas Couwenberg <[email protected]> passes requests to the slaves. This parameter specifies which of the slave sections of renderd.conf applies to this instance of renderd. The default is to use the master section .TP +--- a/src/daemon.c ++++ b/src/daemon.c +@@ -688,7 +688,7 @@ int main(int argc, char **argv) + syslog(LOG_ERR, "Failed to initialise request queue"); + exit(1); + } +- syslog(LOG_ERR, "Initiating reqyest_queue"); ++ syslog(LOG_ERR, "Initiating request_queue"); + + xmlconfigitem maps[XMLCONFIGS_MAX]; + bzero(maps, sizeof(xmlconfigitem) * XMLCONFIGS_MAX); --- a/src/mod_tile.c +++ b/src/mod_tile.c @@ -2412,7 +2412,7 @@ static const command_rec tile_cmds[] = ===================================== debian/patches/update-link-and-path.patch ===================================== @@ -0,0 +1,27 @@ +Description: Update links and paths to new locations +Author: Felix Delattre <[email protected]> + +--- a/debian/renderd.conf ++++ b/debian/renderd.conf +@@ -5,7 +5,7 @@ num_threads=4 + tile_dir=/var/lib/mod_tile + + [mapnik] +-plugins_dir=/usr/lib/mapnik/2.0/input ++plugins_dir=/usr/lib/mapnik/3.0/input + font_dir=/usr/share/fonts/truetype/ttf-dejavu + font_dir_recurse=false + +--- a/openstreetmap-tiles-update-expire ++++ b/openstreetmap-tiles-update-expire +@@ -75,7 +75,7 @@ if [ $# -eq 1 ] ; then + m_info "Initialising Osmosis replication system to $1" + mkdir $WORKOSM_DIR + $OSMOSIS_BIN --read-replication-interval-init workingDirectory=$WORKOSM_DIR 1>&2 2> "$OSMOSISLOG" +- wget "http://osm.personalwerk.de/replicate-sequences/?"$1"T00:00:00Z"; -O $WORKOSM_DIR/state.txt ++ wget "https://replicate-sequences.osm.mazdermind.de/?"$1"T00:00:00Z"; -O $WORKOSM_DIR/state.txt ++ mv $WORKOSM_DIR/configuration.txt $WORKOSM_DIR/configuration_orig.txt ++ sed "s!baseUrl=http://planet.openstreetmap.org/replication/minute!baseUrl=https://planet.openstreetmap.org/replication/minute!"; $WORKOSM_DIR/configuration_orig.txt > $WORKOSM_DIR/configuration.txt + else + # make sure the lockfile is removed when we exit and then claim it + \ No newline at end of file View it on GitLab: https://salsa.debian.org/debian-gis-team/libapache2-mod-tile/-/compare/40c84d51b0234c162cb4a9c3f09c676d46a30899...cb0177f10062750df42272dcd3ba54be93efb7b0 -- View it on GitLab: https://salsa.debian.org/debian-gis-team/libapache2-mod-tile/-/compare/40c84d51b0234c162cb4a9c3f09c676d46a30899...cb0177f10062750df42272dcd3ba54be93efb7b0 You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ Pkg-grass-devel mailing list [email protected] https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-grass-devel
