Skip to content

Commit

Permalink
Merge pull request #61 from amandasaurus/align-with-debian
Browse files Browse the repository at this point in the history
Align with debian
  • Loading branch information
woodpeck authored Jul 29, 2024
2 parents 137903b + b231232 commit 80fe693
Show file tree
Hide file tree
Showing 14 changed files with 288 additions and 77 deletions.
154 changes: 154 additions & 0 deletions CHANGELOG
Original file line number Diff line number Diff line change
@@ -0,0 +1,154 @@
tirex (0.8.0-pre) unstable; urgency=medium

* preliminary build for github HEAD

-- Frederik Ramm <[email protected]> Thu, 19 May 2022 13:41:14 +0200

tirex (0.7.0-1) unstable; urgency=medium

* Move from experimental to unstable.

-- Felix Delattre <[email protected]> Mon, 22 Nov 2021 16:56:21 +0000

tirex (0.7.0-1~exp1) experimental; urgency=medium

[ Felix Delattre ]
* Initial package (Closes: #968676).
* New upstream release 0.7.0
* Adjusted copyright information.
* Use tirex package.
* Sort and review dependencies.
* Review section declaration of packages.
* Place apache2 config when installing tirex.
* Introduce dedicated user _tirex.
* Remove experimental backends, plugins, and example map from packaging.
* Load utils into /usr/share.
* Handle tiles and stats in cache directory.
* Use daemon under /run.
* Check on systemd service files.
* Revisit configuration.
* Bump Standards-Version to 4.6.0, no changes.

[ Bas Couwenberg ]
* Bump watch file version to 4.
* Bump Standards-Version to 4.5.1, no changes.
* Update watch file for GitHub URL changes.

-- Felix Delattre <[email protected]> Thu, 07 Oct 2021 14:37:41 +0000

tirex (0.6.4) focal; urgency=medium

* allow adding a dot and zoom level after mapfile parameter to override map file for specific zoom levels

-- Frederik Ramm <[email protected]> Fri, 13 Aug 2021 11:55:10 +0200

tirex (0.6.3) bionic; urgency=medium

* modify TMS backend to take template URL parameter

-- Frederik Ramm <[email protected]> Mon, 29 Jun 2020 15:57:07 +0200

tirex (0.6.2) bionic; urgency=medium

* add TMS backend

-- Frederik Ramm <[email protected]> Wed, 21 Aug 2019 16:10:48 +0200

tirex (0.6.1) bionic; urgency=medium

* add openseamap backend

-- Frederik Ramm <[email protected]> Wed, 21 Aug 2019 16:10:48 +0200

tirex (0.6.0) bionic; urgency=medium

* tirex-syncd to use ssh master, also allow multiple destinations

-- Frederik Ramm <[email protected]> Sat, 02 Mar 2019 14:23:23 +0000

tirex (0.5.2) bionic; urgency=medium

* die after serving X requests

-- Frederik Ramm <[email protected]> Mon, 14 Dec 2015 20:06:23 +0000

tirex (0.5.1) bionic; urgency=medium

* jpeg tiles
* mapnik 3

-- Frederik Ramm <[email protected]> Mon, 14 Dec 2015 20:06:23 +0000

tirex (0.4.1precise1) precise; urgency=low

* support (alomst) arbitrary sized meta tiles
* support for Mapnik2

-- Frederik Ramm <[email protected]> Tue, 26 Jun 2012 21:45:22 +0000

tirex (0.3.1debian1) precise; urgency=low

* fix epsg3857 bug

-- Frederik Ramm <[email protected]> Tue, 08 May 2012 20:27:04 +0000

tirex (0.3.0) jaunty; urgency=low

* add mapserver backend

-- Sven Geggus <[email protected]> Fri, 03 Feb 2012 19:43:24 +0100

tirex (0.2.0) jaunty; urgency=low

* new renderd architecture allows several different renderers at the same time
* lots of other small improvements

-- Frederik Ramm <[email protected]> Mon, 3 May 2010 10:30:44 +0100

tirex (0.1.7) jaunty; urgency=low

* bugfixes on zoom level 1+2

-- Frederik Ramm <[email protected]> Mon, 15 Mar 2010 21:48:44 +0100

tirex (0.1.6) jaunty; urgency=low

* munin plugin overhaul

-- Frederik Ramm <[email protected]> Fri, 26 Feb 2010 22:38:03 +0100

tirex (0.1.5) jaunty; urgency=low

* new commands to stop/continue buckets

-- Frederik Ramm <[email protected]> Wed, 24 Feb 2010 15:03:40 +0100

tirex (0.1.4) jaunty; urgency=low

* new features+utilities, manpages

-- Frederik Ramm <[email protected]> Thu, 18 Feb 2010 12:02:16 +0100

tirex (0.1.3) jaunty; urgency=low

* lots of new features

-- Frederik Ramm <[email protected]> Mon, 15 Feb 2010 19:17:53 +0100

tirex (0.1.2) jaunty; urgency=low

* fixed renderd starter dying

-- Frederik Ramm <[email protected]> Wed, 10 Feb 2010 17:15:52 +0100

tirex (0.1.1) jaunty; urgency=low

* new build

-- Frederik Ramm <[email protected]> Wed, 10 Feb 2010 11:40:21 +0100

tirex (0.1) unstable; urgency=low

* Initial release.

-- Frederik Ramm <[email protected]> Thu, 04 Feb 2010 00:57:52 +0100
13 changes: 6 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -59,16 +59,15 @@ to create the packages. The following packages will be created in the parent
directory:

tirex
tirex-backend-mapnik
tirex-backend-wms
tirex-backend-mapserver
tirex-example-map
tirex-munin-plugin
tirex-nagios-plugin
tirex-syncd

Call 'make deb-clean' to cleanup after a 'make deb'.

This package is also maintained in Debian by the [Debian GIS Team](https://wiki.debian.org/Teams/DebianGis).

* [Debian packages](https://packages.debian.org/search?keywords=tirex)
* [Ubuntu packages](https://packages.ubuntu.com/search?keywords=tirex)
* [Debian Salsa/git packaging repo](https://salsa.debian.org/debian-gis-team/tirex)

## TESTS

Call 'prove' in the main directory to run Perl unit tests. You need Test::More
Expand Down
11 changes: 11 additions & 0 deletions debian/.gitlab-ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
---
include:
- https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/recipes/debian.yml

variables:
SALSA_CI_AUTOPKGTEST_ARGS: '--no-auto-control'
SALSA_CI_DISABLE_BUILD_PACKAGE_I386: 1
SALSA_CI_ENABLE_BUILD_PACKAGE_TWICE: 1

blhc:
allow_failure: true
59 changes: 59 additions & 0 deletions debian/changelog
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,65 @@ tirex (0.8.0-pre) unstable; urgency=medium

-- Frederik Ramm <[email protected]> Thu, 19 May 2022 13:41:14 +0200

tirex (0.7.1-3) unstable; urgency=medium

* Team upload.
* Add patch to fix FTBFS with Mapnik 4.0.
(closes: #1069109)

-- Bas Couwenberg <[email protected]> Mon, 17 Jun 2024 08:04:22 +0200

tirex (0.7.1-2) unstable; urgency=medium

* Team upload.

[ datendelphin ]
* Fix logrotate entry in tirex.install.

[ Bas Couwenberg ]
* Add architecture-is-64-bit to build dependencies to match mod_tile.

-- Bas Couwenberg <[email protected]> Mon, 06 May 2024 18:05:29 +0200

tirex (0.7.1-1) unstable; urgency=medium

* Team upload.

[ Bas Couwenberg ]
* New upstream release.
* Bump debhelper compat to 13.
* Enable Salsa CI.
* Switch to dh-sequence-*.
* Refresh patches.
* Update lintian overrides.

[ Helmut Grohne ]
* Let dh_installsystemd choose the location of systemd units.
(closes: #1052715)

-- Bas Couwenberg <[email protected]> Sat, 16 Mar 2024 10:01:46 +0100

tirex (0.7.0-3) unstable; urgency=medium

* Team upload.
* Add Rules-Requires-Root to control file.
* Update lintian overrides.
* Bump Standards-Version to 4.6.2, no changes.
* Move systemd services to /lib/systemd.
(closes: #1034222)

-- Bas Couwenberg <[email protected]> Tue, 11 Apr 2023 10:20:03 +0200

tirex (0.7.0-2) unstable; urgency=medium

[ Frederik Ramm ]
* Avoid deletion of tile cache on upgrade.

[ Bas Couwenberg ]
* Bump Standards-Version to 4.6.1, no changes.

-- Felix Delattre <[email protected]> Wed, 03 Aug 2022 08:27:51 +0000

tirex (0.7.0-1) unstable; urgency=medium

* Move from experimental to unstable.
Expand Down
63 changes: 6 additions & 57 deletions debian/control
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,19 @@ Maintainer: Debian GIS Project <[email protected]>
Uploaders: Felix Delattre <[email protected]>
Section: science
Priority: optional
Build-Depends: debhelper-compat (= 12),
Build-Depends: architecture-is-64-bit,
debhelper-compat (= 13),
dh-apache2,
dh-sequence-apache2,
libboost-program-options-dev,
libboost-filesystem-dev,
libipc-sharelite-perl,
libjson-perl,
libmapnik-dev
Standards-Version: 4.6.0
libmapnik-dev (>= 4.0.0)
Standards-Version: 4.6.2
Vcs-Browser: https://salsa.debian.org/debian-gis-team/tirex
Vcs-Git: https://salsa.debian.org/debian-gis-team/tirex.git
Homepage: https://wiki.openstreetmap.org/wiki/Tirex
Rules-Requires-Root: no

Package: tirex
Section: utils
Expand Down Expand Up @@ -44,56 +46,3 @@ Description: Tirex example map data and configuration
with Mapnik and Apache2 webserver.
After installation the map can be visisted in a web
browser by going to http://localhost/tirex-example-map.

Package: tirex-munin-plugin
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, tirex, munin-node
Description: Munin plugin for the Tirex tile rendering system
The Tirex suite of programs manages map tile rendering and caching.
This package contains plugins that help to graph Tirex activity with Munin.

Package: tirex-nagios-plugin
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, tirex
Suggests: nagios3 | nagios-nrpe-server
Description: Nagios plugins for the Tirex tile rendering system
The Tirex suite of programs manages map tile rendering and caching.
This package contains plugins that help to monitor Tirex activity with Nagios.

Package: tirex-backend-wms
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, tirex, libwww-perl
Description: WMS backend for the Tirex tile rendering system
The Tirex suite of programs manages map tile rendering and caching.
This is the WMS backend for fetching maps from a WMS server.

Package: tirex-backend-mapserver
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, tirex, libwww-perl, libmapscript-perl, ttf-dejavu-core
Description: Mapserver backend for the Tirex tile rendering system
The Tirex suite of programs manages map tile rendering and caching.
This is the Mapserver backend for rendering maps with Mapserver.

Package: tirex-backend-mapnik
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, tirex
Description: Mapnik backend for the Tirex tile rendering system
The Tirex suite of programs manages map tile rendering and caching.
This is the Mapnik backend for creating maps with the Mapnik renderer.

Package: tirex-backend-openseamap
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, tirex, default-jre-headless | java8-runtime-headless
Description: OpenSeaMap backend for the Tirex tile rendering system
The Tirex suite of programs manages map tile rendering and caching.
This is the OpenSeaMap backend for creating maps with the OpenSeaMap renderer.

Package: tirex-syncd
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, tirex
Description: Tirex sync daemon
The Tirex suite of programs manages map tile rendering and caching.
This is the sync daemon which listens for messages of tiles fully rendered,
and then copies the metatile to another server. The sync daemon is intended
to be used in setups where you have multiple tile servers with their own
rendering queues.
4 changes: 2 additions & 2 deletions debian/copyright
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ License: public-domain
This file is explicitly placed in the public domain.

Files: debian/*
Copyright: 2010-2020, Frederik Ramm <[email protected]>
2020-2021, Felix Delattre <[email protected]>
Copyright: 2010-2022, Frederik Ramm <[email protected]>
2020-2022, Felix Delattre <[email protected]>
License: GPL-2+

License: GPL-2+
Expand Down
28 changes: 28 additions & 0 deletions debian/patches/mapnik-4.0.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
Description: Use pkg-config for Mapnik 4.0.0.
Author: Bas Couwenberg <[email protected]>
Forwarded: https://github.com/openstreetmap/tirex/issues/60

--- a/backend-mapnik/Makefile
+++ b/backend-mapnik/Makefile
@@ -1,8 +1,7 @@
INSTALLOPTS=-g root -o root
-CFLAGS += -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
-CXXFLAGS = `mapnik-config --cflags` $(CFLAGS)
+CXXFLAGS += `pkg-config --cflags libmapnik` -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
CXXFLAGS += -Wall -Wextra -pedantic -Wredundant-decls -Wdisabled-optimization -Wctor-dtor-privacy -Wnon-virtual-dtor -Woverloaded-virtual -Wsign-promo -Wold-style-cast
-LDFLAGS= `mapnik-config --libs --ldflags --dep-libs`
+LDFLAGS += `pkg-config --libs libmapnik` -lboost_filesystem

backend-mapnik: renderd.o metatilehandler.o networklistener.o networkmessage.o networkrequest.o networkresponse.o debuggable.o requesthandler.o
$(CXX) -o $@ $^ $(LDFLAGS)
--- a/backend-mapnik/metatilehandler.cc
+++ b/backend-mapnik/metatilehandler.cc
@@ -25,7 +25,7 @@
#include <mapnik/agg_renderer.hpp>
#include <mapnik/image_util.hpp>
#include <mapnik/load_map.hpp>
-#include <mapnik/box2d.hpp>
+#include <mapnik/geometry/box2d.hpp>

#if MAPNIK_VERSION >= 300000
# include <mapnik/datasource.hpp>
12 changes: 12 additions & 0 deletions debian/patches/rules-requires-root.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
Description: Fix FTBFS Rules-Requires-Root: no.
Author: Bas Couwenberg <[email protected]>
Forwarded: not-needed

--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-INSTALLOPTS=-g root -o root
+INSTALLOPTS=
build: Makefile.perl
cd backend-mapnik; $(MAKE) $(MFLAGS)
$(MAKE) -f Makefile.perl
2 changes: 2 additions & 0 deletions debian/patches/series
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
rules-requires-root.patch
mapnik-4.0.patch
Loading

0 comments on commit 80fe693

Please sign in to comment.