[Git][debian-gis-team/tirex][master] 3 commits: Remove experimental backends and plugins from packaging.
ǝɹʇʇɐʃǝ◖ xıʃǝɟ (@xamanu)
gitlab at salsa.debian.org
Fri Aug 20 11:20:16 BST 2021
ǝɹʇʇɐʃǝ◖ xıʃǝɟ pushed to branch master at Debian GIS Project / tirex
Commits:
5d32fe05 by Felix Delattre at 2021-08-20T10:17:47+00:00
Remove experimental backends and plugins from packaging.
- - - - -
d87adb94 by Felix Delattre at 2021-08-20T10:17:57+00:00
Cleaned up changelog and added ITP issue closure reference.
- - - - -
d3d511bb by Felix Delattre at 2021-08-20T10:18:26+00:00
Load utils into /usr/share.
- - - - -
15 changed files:
- debian/changelog
- debian/control
- debian/rules
- − debian/tirex-backend-mapserver.install
- − debian/tirex-backend-tms.install
- − debian/tirex-backend-wms.install
- − debian/tirex-munin-plugin.install
- − debian/tirex-munin-plugin.postinst
- − debian/tirex-munin-plugin.prerm
- − debian/tirex-nagios-plugin.install
- − debian/tirex-nagios-plugin.postinst
- − debian/tirex-nagios-plugin.postrm
- − debian/tirex-syncd.init
- − debian/tirex-syncd.install
- + debian/tirex.examples
Changes:
=====================================
debian/changelog
=====================================
@@ -1,7 +1,7 @@
tirex (0.6.4-1~exp1) UNRELEASED; urgency=medium
-
+
[ Felix Delattre ]
- * Targeted packaging to debian archive
+ * Targeted packaging to debian archive.
* Adjusted copyright information.
* Use tirex instead of tirex-core.
* Sort dependencies, specific dependencies first.
@@ -9,6 +9,7 @@ tirex (0.6.4-1~exp1) UNRELEASED; urgency=medium
* Remove packaging for example map.
* Place apache2 config when installing tirex.
* Introduced dedicated user _tirex.
+ * Initial package (Closes: #968676)
[ Bas Couwenberg ]
* Bump watch file version to 4.
@@ -18,19 +19,19 @@ tirex (0.6.4-1~exp1) UNRELEASED; urgency=medium
-- Felix Delattre <debian at xama.nu> Tue, 17 Aug 2021 17:13:23 +0000
tirex (0.6.3) bionic; urgency=medium
-
+
* modify TMS backend to take template URL parameter
-- Frederik Ramm <frederik.ramm at geofabrik.de> Mon, 29 Jun 2020 12:00:00 +0200
tirex (0.6.2) bionic; urgency=medium
-
+
* add TMS backend
-- Frederik Ramm <frederik.ramm at geofabrik.de> Wed, 21 Aug 2019 16:10:48 +0200
tirex (0.6.1) bionic; urgency=medium
-
+
* add openseamap backend
-- Frederik Ramm <frederik.ramm at geofabrik.de> Wed, 21 Aug 2019 16:10:48 +0200
@@ -57,7 +58,7 @@ tirex (0.5.1) bionic; urgency=medium
tirex (0.4.1precise1) precise; urgency=low
* support (alomst) arbitrary sized meta tiles
- * support for Mapnik2
+ * support for Mapnik2
-- Frederik Ramm <frederik.ramm at geofabrik.de> Tue, 26 Jun 2012 21:45:22 +0000
@@ -124,6 +125,6 @@ tirex (0.1.1) jaunty; urgency=low
tirex (0.1) unstable; urgency=low
- * Initial release.
+ * Initial release.
-- Frederik Ramm <frederik.ramm at geofabrik.de> Thu, 04 Feb 2010 00:57:52 +0100
=====================================
debian/control
=====================================
@@ -13,17 +13,17 @@ Vcs-Git: https://salsa.debian.org/debian-gis-team/tirex.git
Homepage: http://wiki.openstreetmap.org/wiki/Tirex
Package: tirex
-Section: web
+Section: utils
Architecture: any
Depends: adduser,
libapache2-mod-tile,
libgd-gd2-perl,
libjson-perl,
libipc-sharelite-perl,
- tirex-backend-mapnik | tirex-backend-wms | tirex-backend-tms,
- ${shlibs:Depends},
${misc:Depends},
-Suggests: tirex-backend-mapnik,
+ ${perl:Depends},
+Recommends: tirex-backend-mapnik,
+ ${misc:Recommends}
Description: Daemon that renders raster map tile using different backends
The Tirex suite of programs manages map raster tile rendering and caching.
This package contains the master daemon, rendering manager, test backend,
@@ -42,40 +42,3 @@ Description: Mapnik backend for the Tirex raster tile rendering system
This is the Mapnik backend for creating maps with the Mapnik renderer.
.
This package contains the backend connection with a Mapnik server
-
-Package: tirex-backend-wms
-Section: utils
-Architecture: any
-Depends: ${shlibs:Depends},
- ${misc:Depends},
- libwww-perl,
- tirex,
-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-tms
-Section: utils
-Architecture: any
-Depends: tirex,
- libwww-perl,
- libnet-https-nb-perl,
- libhttp-async-perl,
- ${shlibs:Depends},
- ${misc:Depends},
-Description: TMS backend for the Tirex tile rendering system
- The Tirex suite of programs manages map tile rendering and caching.
- This is the TMS backend for fetching maps from a TMS server.
-
-Package: tirex-syncd
-Section: utils
-Architecture: any
-Depends: tirex,
- ${shlibs:Depends},
- ${misc:Depends},
-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.
=====================================
debian/rules
=====================================
@@ -10,6 +10,3 @@ export DEB_BUILD_MAINT_OPTIONS=hardening=+all
override_dh_auto_test:
dh_auto_test || echo "Ignoring test failures"
-
-get-orig-source:
- . debian/get-orig-source
=====================================
debian/tirex-backend-mapserver.install deleted
=====================================
@@ -1,7 +0,0 @@
-usr/lib/tirex/backends/mapserver
-usr/share/perl5/Tirex/Backend/Mapserver.pm
-usr/share/man/man3/Tirex::Backend::Mapserver.3pm
-etc/tirex/renderer/mapserver.conf
-etc/tirex/renderer/mapserver/msdemo.conf
-etc/tirex/renderer/mapserver/msdemo.map
-etc/tirex/renderer/mapserver/fonts.lst
=====================================
debian/tirex-backend-tms.install deleted
=====================================
@@ -1,5 +0,0 @@
-usr/lib/tirex/backends/tms
-usr/share/perl5/Tirex/Backend/TMS.pm
-usr/share/man/man3/Tirex::Backend::TMS.3pm
-etc/tirex/renderer/tms.conf
-etc/tirex/renderer/tms/demotms.conf
=====================================
debian/tirex-backend-wms.install deleted
=====================================
@@ -1,5 +0,0 @@
-usr/lib/tirex/backends/wms
-usr/share/perl5/Tirex/Backend/WMS.pm
-usr/share/man/man3/Tirex::Backend::WMS.3pm
-etc/tirex/renderer/wms.conf
-etc/tirex/renderer/wms/demowms.conf
=====================================
debian/tirex-munin-plugin.install deleted
=====================================
@@ -1,4 +0,0 @@
-usr/share/man/man3/Tirex::Munin*
-usr/share/perl5/Tirex/Munin
-usr/share/perl5/Tirex/Munin.pm
-usr/share/munin/plugins/*
=====================================
debian/tirex-munin-plugin.postinst deleted
=====================================
@@ -1,29 +0,0 @@
-#! /bin/sh
-
-set -e
-
-if [ -d /etc/munin/plugins ]
-then
- for i in /usr/share/munin/plugins/tirex*
- do
- if [ -f /etc/munin/plugins/`basename $i` ]
- then
- # is a file, leave alone
- :
- else
- # does not exist or is a link
- ln -sf $i /etc/munin/plugins
- fi
- done
-
- if [ -x /etc/init.d/munin-node ]
- then
- if which invoke-rc.d >/dev/null 2>&1; then
- invoke-rc.d munin-node restart
- else
- /etc/init.d/munin-node restart
- fi
- fi
-fi
-
-#DEBHELPER#
=====================================
debian/tirex-munin-plugin.prerm deleted
=====================================
@@ -1,29 +0,0 @@
-#! /bin/sh
-
-set -e
-
-if [ -d /etc/munin/plugins ]
-then
- for i in /usr/share/munin/plugins/tirex*
- do
- if [ -f /etc/munin/plugins/`basename $i` ]
- then
- # is a file, leave alone
- :
- else
- # does not exist or is a link
- rm -f /etc/munin/plugins/`basename $i`
- fi
- done
-
- if [ -x /etc/init.d/munin-node ]
- then
- if which invoke-rc.d >/dev/null 2>&1; then
- invoke-rc.d munin-node restart
- else
- /etc/init.d/munin-node restart
- fi
- fi
-fi
-
-#DEBHELPER#
=====================================
debian/tirex-nagios-plugin.install deleted
=====================================
@@ -1,2 +0,0 @@
-usr/lib/nagios/plugins/*
-etc/nagios/nrpe.d/*
=====================================
debian/tirex-nagios-plugin.postinst deleted
=====================================
@@ -1,14 +0,0 @@
-#! /bin/sh
-
-set -e
-
-if [ -x /etc/init.d/nagios-nrpe-server ]
-then
- if which invoke-rc.d >/dev/null 2>&1; then
- invoke-rc.d nagios-nrpe-server restart
- else
- /etc/init.d/nagios-nrpe-server restart
- fi
-fi
-
-#DEBHELPER#
=====================================
debian/tirex-nagios-plugin.postrm deleted
=====================================
@@ -1,14 +0,0 @@
-#! /bin/sh
-
-set -e
-
-if [ -x /etc/init.d/nagios-nrpe-server ]
-then
- if which invoke-rc.d >/dev/null 2>&1; then
- invoke-rc.d nagios-nrpe-server restart
- else
- /etc/init.d/nagios-nrpe-server restart
- fi
-fi
-
-#DEBHELPER#
=====================================
debian/tirex-syncd.init deleted
=====================================
@@ -1,145 +0,0 @@
-#! /bin/sh
-### BEGIN INIT INFO
-# Provides: tirex-syncd
-# Required-Start:
-# Required-Stop:
-# Default-Start: 2 3 4 5
-# Default-Stop: 0 1 6
-# Short-Description: Tirex sync server
-# Description: Tirex sync server
-### END INIT INFO
-
-# Do NOT "set -e"
-
-# PATH should only include /usr/* if it runs after the mountnfs.sh script
-PATH=/sbin:/usr/sbin:/bin:/usr/bin
-DESC="Tirex sync server"
-NAME=tirex-syncd
-DAEMON=/usr/bin/$NAME
-DAEMON_ARGS=""
-PIDFILE=/var/run/tirex/$NAME.pid
-SCRIPTNAME=/etc/init.d/$NAME
-
-# Exit if the package is not installed
-[ -x "$DAEMON" ] || exit 0
-
-# Read configuration variable file if it is present
-[ -r /etc/default/$NAME ] && . /etc/default/$NAME
-
-# Load the VERBOSE setting and other rcS variables
-. /lib/init/vars.sh
-
-# Define LSB log_* functions.
-# Depend on lsb-base (>= 3.0-6) to ensure that this file is present.
-. /lib/lsb/init-functions
-
-#
-# Function that starts the daemon/service
-#
-do_start()
-{
- [ -d `dirname $PIDFILE` ] || (mkdir -p `dirname $PIDFILE` ; chown tirex:tirex `dirname $PIDFILE`)
-
- # Return
- # 0 if daemon has been started
- # 1 if daemon was already running
- # 2 if daemon could not be started
- start-stop-daemon --start --quiet --chuid tirex --exec $DAEMON --test > /dev/null \
- || return 1
- start-stop-daemon --start --quiet --chuid tirex --exec $DAEMON -- \
- $DAEMON_ARGS \
- || return 2
- # Add code here, if necessary, that waits for the process to be ready
- # to handle requests from services started subsequently which depend
- # on this one. As a last resort, sleep for some time.
-}
-
-#
-# Function that stops the daemon/service
-#
-do_stop()
-{
- # Return
- # 0 if daemon has been stopped
- # 1 if daemon was already stopped
- # 2 if daemon could not be stopped
- # other if a failure occurred
- start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile $PIDFILE
- RETVAL="$?"
- [ "$RETVAL" = 2 ] && return 2
- start-stop-daemon --stop --quiet --oknodo --retry=0/30/KILL/5 --exec $DAEMON
- [ "$?" = 2 ] && return 2
- # Many daemons don't delete their pidfiles when they exit.
- rm -f $PIDFILE
- return "$RETVAL"
-}
-
-#
-# Function that sends a SIGHUP to the daemon/service
-#
-do_reload() {
- #
- # If the daemon can reload its configuration without
- # restarting (for example, when it is sent a SIGHUP),
- # then implement that here.
- #
- start-stop-daemon --stop --signal 1 --quiet --pidfile $PIDFILE
- return 0
-}
-
-case "$1" in
- start)
- [ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC" "$NAME"
- do_start
- case "$?" in
- 0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
- 2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
- esac
- ;;
- stop)
- [ "$VERBOSE" != no ] && log_daemon_msg "Stopping $DESC" "$NAME"
- do_stop
- case "$?" in
- 0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
- 2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
- esac
- ;;
- #reload|force-reload)
- #
- # If do_reload() is not implemented then leave this commented out
- # and leave 'force-reload' as an alias for 'restart'.
- #
- #log_daemon_msg "Reloading $DESC" "$NAME"
- #do_reload
- #log_end_msg $?
- #;;
- restart|force-reload)
- #
- # If the "reload" option is implemented then remove the
- # 'force-reload' alias
- #
- log_daemon_msg "Restarting $DESC" "$NAME"
- do_stop
- case "$?" in
- 0|1)
- do_start
- case "$?" in
- 0) log_end_msg 0 ;;
- 1) log_end_msg 1 ;; # Old process is still running
- *) log_end_msg 1 ;; # Failed to start
- esac
- ;;
- *)
- # Failed to stop
- log_end_msg 1
- ;;
- esac
- ;;
- *)
- #echo "Usage: $SCRIPTNAME {start|stop|restart|reload|force-reload}" >&2
- echo "Usage: $SCRIPTNAME {start|stop|restart|force-reload}" >&2
- exit 3
- ;;
-esac
-
-:
=====================================
debian/tirex-syncd.install deleted
=====================================
@@ -1,2 +0,0 @@
-/usr/bin/tirex-syncd
-/usr/share/man/man1/tirex-syncd.1
=====================================
debian/tirex.examples
=====================================
@@ -0,0 +1 @@
+utils/*
View it on GitLab: https://salsa.debian.org/debian-gis-team/tirex/-/compare/6f0526dfcfec29c1596d8851fd6ffdcccebe104d...d3d511bb02bb918041d13f698fe2820520e7865c
--
View it on GitLab: https://salsa.debian.org/debian-gis-team/tirex/-/compare/6f0526dfcfec29c1596d8851fd6ffdcccebe104d...d3d511bb02bb918041d13f698fe2820520e7865c
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/20210820/94f5feda/attachment-0001.htm>
More information about the Pkg-grass-devel
mailing list