[Git][debian-gis-team/libapache2-mod-tile][master] Refresh spelling-errors.patch. Make update-link-and-path.patch apply cleanly.

[Bas Couwenberg]

Bas Couwenberg pushed to branch master at Debian GIS Project / libapache2-mod-tile


Commits:
c80f8cc2 by Bas Couwenberg at 2020-08-21T07:17:46+02:00
Refresh spelling-errors.patch. Make update-link-and-path.patch apply cleanly.

- - - - -


3 changed files:

- debian/patches/series
- debian/patches/spelling-errors.patch
- debian/patches/update-link-and-path.patch


Changes:

=====================================
debian/patches/series
=====================================
@@ -3,4 +3,4 @@ openlayers.patch
 spelling-errors.patch
 manpage-section-mismatch.patch
 prevent-duplicates.patch
-update-link-and-typo.patch
+update-link-and-path.patch


=====================================
debian/patches/spelling-errors.patch
=====================================
@@ -29,7 +29,7 @@ Author: Bas Couwenberg <sebastic at debian.org>
  .TP
 --- a/src/daemon.c
 +++ b/src/daemon.c
-@@ -688,7 +688,7 @@ int main(int argc, char **argv)
+@@ -687,7 +687,7 @@ int main(int argc, char **argv)
          syslog(LOG_ERR, "Failed to initialise request queue");
          exit(1);
      }


=====================================
debian/patches/update-link-and-path.patch
=====================================
@@ -1,20 +1,9 @@
 Description: Update links and paths to new locations
 Author: Felix Delattre <debian at xama.nu>
 
---- 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
+@@ -75,7 +75,9 @@ 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"
@@ -24,4 +13,4 @@ Author: Felix Delattre <debian at xama.nu>
 +    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/-/commit/c80f8cc216c0aba38ae3f58e605fc585cfe64441

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/libapache2-mod-tile/-/commit/c80f8cc216c0aba38ae3f58e605fc585cfe64441
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/20200821/571ed377/attachment-0001.html>