[Git][debian-gis-team/libapache2-mod-tile][master] renamed patches, handling them through gbp pq with patch queue branches in git
Felix Delattre
gitlab at salsa.debian.org
Tue Aug 25 21:08:57 BST 2020
Felix Delattre pushed to branch master at Debian GIS Project / libapache2-mod-tile
Commits:
3b40acaa by Felix Delattre at 2020-08-25T16:13:43+00:00
renamed patches, handling them through gbp pq with patch queue branches in git
- - - - -
8 changed files:
- debian/patches/iniparser.patch → debian/patches/0001-iniparser.patch
- debian/patches/openlayers.patch → debian/patches/0002-openlayers.patch
- debian/patches/spelling-errors.patch → debian/patches/0003-spelling-errors.patch
- debian/patches/manpage-section-mismatch.patch → debian/patches/0004-manpage-section-mismatch.patch
- debian/patches/prevent-duplicates.patch → debian/patches/0005-Move-variables-to-prevent-duplicates.patch
- + debian/patches/0006-replicate-seqences-tool-has-long-been-moved.patch
- debian/patches/update-link-and-path.patch → debian/patches/0007-Change-to-fetch-minutely-updates-from-https-not-http.patch
- debian/patches/series
Changes:
=====================================
debian/patches/iniparser.patch → debian/patches/0001-iniparser.patch
=====================================
@@ -1,6 +1,14 @@
-Description: Support libiniparser package.
-Author: Boris Shtrasman <borissh1983 at gmail.com>
+From: Boris Shtrasman <borissh1983 at gmail.com>
+Date: Tue, 25 Aug 2020 15:47:52 +0000
+Subject: Support libiniparser package.
+---
+ configure.ac | 2 +-
+ src/daemon.c | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index c6ff10a..328f114 100644
--- a/configure.ac
+++ b/configure.ac
@@ -75,7 +75,7 @@ if test "$APXS" = "reject"; then
@@ -12,6 +20,8 @@ Author: Boris Shtrasman <borissh1983 at gmail.com>
])
AM_CONDITIONAL([SYSTEM_LIBINIPARSER], [test "x$have_system_iniparser" = "xyes"])
if test "x$have_system_iniparser" = "xyes"; then
+diff --git a/src/daemon.c b/src/daemon.c
+index 56a5b0b..8e10103 100644
--- a/src/daemon.c
+++ b/src/daemon.c
@@ -29,7 +29,7 @@
=====================================
debian/patches/openlayers.patch → debian/patches/0002-openlayers.patch
=====================================
@@ -1,6 +1,13 @@
-Description: Use libjs-openlayers package.
-Author: Bas Couwenberg <sebastic at debian.org>
+From: Bas Couwenberg <sebastic at debian.org>
+Date: Tue, 25 Aug 2020 15:47:52 +0000
+Subject: Use libjs-openlayers package.
+---
+ slippymap.html | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/slippymap.html b/slippymap.html
+index 52b684d..5c4fc1e 100644
--- a/slippymap.html
+++ b/slippymap.html
@@ -5,7 +5,7 @@
=====================================
debian/patches/spelling-errors.patch → debian/patches/0003-spelling-errors.patch
=====================================
@@ -1,24 +1,19 @@
-Description: Fix spelling errors.
- * recieve -> receive
- * accross -> across
- * determins -> determines
- * reqyest -> request
-Author: Bas Couwenberg <sebastic at debian.org>
+From: Bas Couwenberg <sebastic at debian.org>
+Date: Tue, 25 Aug 2020 15:47:52 +0000
+Subject: Fix spelling errors.
---- a/src/protocol_helper.c
-+++ b/src/protocol_helper.c
-@@ -42,7 +42,7 @@ int recv_cmd(struct protocol * cmd, int
- return 0;
- }
- if ((cmd->ver > 3) || (cmd->ver < 1)) {
-- syslog(LOG_WARNING, "WARNING: Failed to recieve render cmd with unknown protocol version %i\n", cmd->ver);
-+ syslog(LOG_WARNING, "WARNING: Failed to receive render cmd with unknown protocol version %i\n", cmd->ver);
- return -1;
- }
- syslog(LOG_DEBUG, "DEBUG: Got incoming request with protocol version %i\n", cmd->ver);
+---
+ docs/renderd.8 | 2 +-
+ src/daemon.c | 2 +-
+ src/mod_tile.c | 2 +-
+ src/protocol_helper.c | 2 +-
+ 4 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/docs/renderd.8 b/docs/renderd.8
+index 6b9a756..60104f2 100644
--- a/docs/renderd.8
+++ b/docs/renderd.8
-@@ -30,7 +30,7 @@ Set the location of the config file used
+@@ -30,7 +30,7 @@ Set the location of the config file used to configure the various parameters of
like the mapnik style sheet. The default is /etc/renderd.conf
.TP
\fB\-s\fR|\-\-slave
@@ -27,6 +22,8 @@ Author: Bas Couwenberg <sebastic at debian.org>
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
+diff --git a/src/daemon.c b/src/daemon.c
+index 8e10103..d370463 100644
--- a/src/daemon.c
+++ b/src/daemon.c
@@ -687,7 +687,7 @@ int main(int argc, char **argv)
@@ -38,6 +35,8 @@ Author: Bas Couwenberg <sebastic at debian.org>
xmlconfigitem maps[XMLCONFIGS_MAX];
bzero(maps, sizeof(xmlconfigitem) * XMLCONFIGS_MAX);
+diff --git a/src/mod_tile.c b/src/mod_tile.c
+index 010fc69..123315d 100644
--- a/src/mod_tile.c
+++ b/src/mod_tile.c
@@ -2412,7 +2412,7 @@ static const command_rec tile_cmds[] =
@@ -49,3 +48,16 @@ Author: Bas Couwenberg <sebastic at debian.org>
),
AP_INIT_TAKE2(
"ModTileCacheDurationLowZoom", /* directive name */
+diff --git a/src/protocol_helper.c b/src/protocol_helper.c
+index e7a80d6..324b20c 100644
+--- a/src/protocol_helper.c
++++ b/src/protocol_helper.c
+@@ -42,7 +42,7 @@ int recv_cmd(struct protocol * cmd, int fd, int block) {
+ return 0;
+ }
+ if ((cmd->ver > 3) || (cmd->ver < 1)) {
+- syslog(LOG_WARNING, "WARNING: Failed to recieve render cmd with unknown protocol version %i\n", cmd->ver);
++ syslog(LOG_WARNING, "WARNING: Failed to receive render cmd with unknown protocol version %i\n", cmd->ver);
+ return -1;
+ }
+ syslog(LOG_DEBUG, "DEBUG: Got incoming request with protocol version %i\n", cmd->ver);
=====================================
debian/patches/manpage-section-mismatch.patch → debian/patches/0004-manpage-section-mismatch.patch
=====================================
@@ -1,6 +1,31 @@
-Description: Fix manpage section for renderd.
-Author: Bas Couwenberg <sebastic at debian.org>
+From: Bas Couwenberg <sebastic at debian.org>
+Date: Tue, 25 Aug 2020 15:47:52 +0000
+Subject: Fix manpage section for renderd.
+---
+ Makefile.am | 2 +-
+ docs/renderd.1 | 46 ++++++++++++++++++++++++++++++++++++++++++++++
+ docs/renderd.8 | 46 ----------------------------------------------
+ 3 files changed, 47 insertions(+), 47 deletions(-)
+ create mode 100644 docs/renderd.1
+ delete mode 100644 docs/renderd.8
+
+diff --git a/Makefile.am b/Makefile.am
+index 7fe98fa..bff4988 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -13,7 +13,7 @@ STORE_CPPFLAGS =
+
+ bin_PROGRAMS = renderd render_expired render_list render_speedtest render_old
+ noinst_PROGRAMS = gen_tile_test
+-man_MANS = docs/renderd.8 docs/render_expired.1 docs/render_list.1 docs/render_old.1 docs/render_speedtest.1
++man_MANS = docs/renderd.1 docs/render_expired.1 docs/render_list.1 docs/render_old.1 docs/render_speedtest.1
+
+ renderddir = $(sysconfdir)
+ renderd_SOURCES = src/daemon.c src/daemon_compat.c src/gen_tile.cpp src/sys_utils.c src/request_queue.c src/cache_expire.c src/metatile.cpp src/parameterize_style.cpp src/protocol_helper.c $(STORE_SOURCES)
+diff --git a/docs/renderd.1 b/docs/renderd.1
+new file mode 100644
+index 0000000..60104f2
--- /dev/null
+++ b/docs/renderd.1
@@ -0,0 +1,46 @@
@@ -50,6 +75,9 @@ Author: Bas Couwenberg <sebastic at debian.org>
+renderd was written by Jon Burgess, and other OpenStreetMap project members.
+.PP
+This manual page was written by OpenStreetMap authors.
+diff --git a/docs/renderd.8 b/docs/renderd.8
+deleted file mode 100644
+index 60104f2..0000000
--- a/docs/renderd.8
+++ /dev/null
@@ -1,46 +0,0 @@
@@ -99,14 +127,3 @@ Author: Bas Couwenberg <sebastic at debian.org>
-renderd was written by Jon Burgess, and other OpenStreetMap project members.
-.PP
-This manual page was written by OpenStreetMap authors.
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -13,7 +13,7 @@ STORE_CPPFLAGS =
-
- bin_PROGRAMS = renderd render_expired render_list render_speedtest render_old
- noinst_PROGRAMS = gen_tile_test
--man_MANS = docs/renderd.8 docs/render_expired.1 docs/render_list.1 docs/render_old.1 docs/render_speedtest.1
-+man_MANS = docs/renderd.1 docs/render_expired.1 docs/render_list.1 docs/render_old.1 docs/render_speedtest.1
-
- renderddir = $(sysconfdir)
- renderd_SOURCES = src/daemon.c src/daemon_compat.c src/gen_tile.cpp src/sys_utils.c src/request_queue.c src/cache_expire.c src/metatile.cpp src/parameterize_style.cpp src/protocol_helper.c $(STORE_SOURCES)
=====================================
debian/patches/prevent-duplicates.patch → debian/patches/0005-Move-variables-to-prevent-duplicates.patch
=====================================
@@ -1,6 +1,20 @@
-Description: Move variables to prevent duplicates (from https://github.com/openstreetmap/mod_tile/pull/202)
-Author: Felix Delattre <debian at xama.nu>
+From: Jon Burgess <jburgess777 at gmail.com>
+Date: Sat, 23 May 2020 12:42:07 +0100
+Subject: Move variables to prevent duplicates
+Origin: https://github.com/openstreetmap/mod_tile/pull/202
+---
+ includes/daemon.h | 2 +-
+ includes/render_submit_queue.h | 2 --
+ src/daemon.c | 1 +
+ src/render_expired.c | 1 -
+ src/render_list.c | 1 -
+ src/render_old.c | 1 -
+ src/render_submit_queue.c | 1 +
+ 7 files changed, 3 insertions(+), 6 deletions(-)
+
+diff --git a/includes/daemon.h b/includes/daemon.h
+index 85fa647..507fb83 100644
--- a/includes/daemon.h
+++ b/includes/daemon.h
@@ -45,7 +45,7 @@ typedef struct {
@@ -12,6 +26,8 @@ Author: Felix Delattre <debian at xama.nu>
void statsRenderFinish(int z, long time);
void request_exit(void);
+diff --git a/includes/render_submit_queue.h b/includes/render_submit_queue.h
+index 1183623..65b83fb 100644
--- a/includes/render_submit_queue.h
+++ b/includes/render_submit_queue.h
@@ -5,8 +5,6 @@ extern "C" {
@@ -23,6 +39,8 @@ Author: Felix Delattre <debian at xama.nu>
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);
+diff --git a/src/daemon.c b/src/daemon.c
+index d370463..e406500 100644
--- a/src/daemon.c
+++ b/src/daemon.c
@@ -49,6 +49,7 @@ static renderd_config config;
@@ -33,6 +51,8 @@ Author: Felix Delattre <debian at xama.nu>
static const char *cmdStr(enum protoCmd c)
{
+diff --git a/src/render_expired.c b/src/render_expired.c
+index 824d587..98177bd 100644
--- a/src/render_expired.c
+++ b/src/render_expired.c
@@ -89,7 +89,6 @@ unsigned long long twopow[MAX_ZOOM];
@@ -43,6 +63,8 @@ Author: Felix Delattre <debian at xama.nu>
static int maxLoad = MAX_LOAD_OLD;
void display_rate(struct timeval start, struct timeval end, int num)
+diff --git a/src/render_list.c b/src/render_list.c
+index bc0f032..cb11c20 100644
--- a/src/render_list.c
+++ b/src/render_list.c
@@ -40,7 +40,6 @@ static int maxZoom = MAX_ZOOM;
@@ -53,6 +75,8 @@ Author: Felix Delattre <debian at xama.nu>
void display_rate(struct timeval start, struct timeval end, int num)
{
+diff --git a/src/render_old.c b/src/render_old.c
+index 5e83cbd..42b12fc 100644
--- a/src/render_old.c
+++ b/src/render_old.c
@@ -47,7 +47,6 @@ static time_t planetTime;
@@ -63,6 +87,8 @@ Author: Felix Delattre <debian at xama.nu>
void display_rate(struct timeval start, struct timeval end, int num)
{
+diff --git a/src/render_submit_queue.c b/src/render_submit_queue.c
+index 5d63987..0f850a6 100644
--- a/src/render_submit_queue.c
+++ b/src/render_submit_queue.c
@@ -47,6 +47,7 @@ static struct qItem *qHead, *qTail;
=====================================
debian/patches/0006-replicate-seqences-tool-has-long-been-moved.patch
=====================================
@@ -0,0 +1,30 @@
+From: Peter <MaZderMind at users.noreply.github.com>
+Date: Fri, 8 Dec 2017 12:40:19 +0100
+Subject: replicate-seqences-tool has long been moved
+Origin: https://github.com/openstreetmap/mod_tile/pull/174
+
+As I'm not working at Personalwerk anymore, I moved the service to my own Server
+---
+ openstreetmap-tiles-update-expire | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/openstreetmap-tiles-update-expire b/openstreetmap-tiles-update-expire
+index 220a19f..a0c6e5f 100755
+--- 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
+ else
+ # make sure the lockfile is removed when we exit and then claim it
+
+@@ -120,4 +120,4 @@ else
+
+
+
+-fi
+\ No newline at end of file
++fi
=====================================
debian/patches/update-link-and-path.patch → debian/patches/0007-Change-to-fetch-minutely-updates-from-https-not-http.patch
=====================================
@@ -1,14 +1,20 @@
-Description: Update links and paths to new locations
-Author: Felix Delattre <debian at xama.nu>
+From: Andy Townsend <ajtown at atownsend.org.uk>
+Date: Sat, 6 Jan 2018 01:46:33 +0000
+Subject: Change to fetch minutely updates from https not http
+Origin: https://github.com/SomeoneElseOSM/mod_tile/commit/1d243f397ae27e4aaead057f379c59546d49870e
+---
+ openstreetmap-tiles-update-expire | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/openstreetmap-tiles-update-expire b/openstreetmap-tiles-update-expire
+index a0c6e5f..cdaa04b 100755
--- a/openstreetmap-tiles-update-expire
+++ b/openstreetmap-tiles-update-expire
-@@ -75,7 +75,9 @@ if [ $# -eq 1 ] ; then
- m_info "Initialising Osmosis replication system to $1"
+@@ -76,6 +76,8 @@ if [ $# -eq 1 ] ; then
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
+ 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
=====================================
debian/patches/series
=====================================
@@ -1,6 +1,7 @@
-iniparser.patch
-openlayers.patch
-spelling-errors.patch
-manpage-section-mismatch.patch
-prevent-duplicates.patch
-update-link-and-path.patch
+0001-iniparser.patch
+0002-openlayers.patch
+0003-spelling-errors.patch
+0004-manpage-section-mismatch.patch
+0005-Move-variables-to-prevent-duplicates.patch
+0006-replicate-seqences-tool-has-long-been-moved.patch
+0007-Change-to-fetch-minutely-updates-from-https-not-http.patch
View it on GitLab: https://salsa.debian.org/debian-gis-team/libapache2-mod-tile/-/commit/3b40acaaa145f944b0597938bd39521f532b102c
--
View it on GitLab: https://salsa.debian.org/debian-gis-team/libapache2-mod-tile/-/commit/3b40acaaa145f944b0597938bd39521f532b102c
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/20200825/04dcac68/attachment-0001.html>
More information about the Pkg-grass-devel
mailing list