[Git][debian-gis-team/tirex][master] 5 commits: adjusted gbp.conf to standard branches
Felix Delattre
gitlab at salsa.debian.org
Wed Aug 19 13:58:31 BST 2020
Felix Delattre pushed to branch master at Debian GIS Project / tirex
Commits:
8002e62f by Felix Delattre at 2020-08-19T10:59:32+00:00
adjusted gbp.conf to standard branches
- - - - -
c3c3dc38 by Felix Delattre at 2020-08-19T11:42:08+00:00
adjusted urls to vcs repositories and improved indentation in control file
- - - - -
4866e6f4 by Felix Delattre at 2020-08-19T11:59:18+00:00
removed tirex-example-map for now
- - - - -
49a503e8 by Felix Delattre at 2020-08-19T12:48:44+00:00
removed init.d scripts
- - - - -
9c186d56 by Felix Delattre at 2020-08-19T12:56:19+00:00
changed to architecture `any` and renamed install and postinst files to
match main package name tirex-master
- - - - -
10 changed files:
- debian/control
- debian/gbp.conf
- − debian/tirex-core.tirex-backend-manager.init
- − debian/tirex-core.tirex-backend-manager.simple-init
- − debian/tirex-core.tirex-master.init
- − debian/tirex-core.tirex-master.simple-init
- − debian/tirex-example-map.install
- − debian/tirex-example-map.postinst
- debian/tirex-core.install → debian/tirex-master.install
- debian/tirex-core.postinst → debian/tirex-master.postinst
Changes:
=====================================
debian/control
=====================================
@@ -4,45 +4,39 @@ Priority: optional
Maintainer: Debian GIS Project <pkg-grass-devel at lists.alioth.debian.org>
Uploaders: Felix Delattre <debian at xama.nu>
Build-Depends: debhelper (>= 10~),
- libboost-program-options-dev,
- libmapnik-dev,
+ libboost-program-options-dev,
+ libmapnik-dev,
Standards-Version: 4.5.0
Homepage: http://wiki.openstreetmap.org/wiki/Tirex
-Vcs-Browser: https://github.com/openstreetmap/tirex
-Vcs-Git: https://github.com/openstreetmap/tirex.git
+Vcs-Browser: https://salsa.debian.org/debian-gis-team/libapache2-mod-tile
+Vcs-Git: https://salsa.debian.org/debian-gis-team/tirex.git
Package: tirex-master
Section: web
-Architecture: all
+Architecture: any
Depends: ${shlibs:Depends},
- ${misc:Depends},
- libjson-perl,
- libipc-sharelite-perl,
- libgd-gd2-perl,
- adduser,
-Suggests: libapache2-mod-tile, tirex-backend-mapnik
+ ${misc:Depends},
+ libjson-perl,
+ libipc-sharelite-perl,
+ libgd-gd2-perl,
+ adduser,
+Suggests: libapache2-mod-tile,
+ tirex-backend-mapnik,
Description: Tirex raster tile rendering system
The Tirex suite of programs manages map raster tile rendering and caching.
This package contains the master daemon, rendering manager, test backend,
and assorted utility programs.
+ .
+ This package contains the core piece of tirex.
Package: tirex-backend-mapnik
Section: utils
-Architecture: all
+Architecture: any
Depends: ${shlibs:Depends},
- ${misc:Depends},
- tirex-core,
+ ${misc:Depends},
+ tirex-core,
Description: Mapnik backend for the Tirex raster tile rendering system
The Tirex suite of programs manages taster map tile rendering and caching.
This is the Mapnik backend for creating maps with the Mapnik renderer.
-
-Package: tirex-example-map
-Section: web
-Architecture: all
-Depends: ${shlibs:Depends},
- ${misc:Depends},
- tirex-backend-mapnik,
-Description: Tirex example map vizualisations
- The Tirex suite of programs manages raster map tile rendering and caching.
- This package includes example map data and an example config for the Mapnik
- renderer.
+ .
+ This package contains the backend connection with a Mapnik server
=====================================
debian/gbp.conf
=====================================
@@ -2,11 +2,11 @@
# The default name for the upstream branch is "upstream".
# Change it if the name is different (for instance, "master").
-upstream-branch = upstream/latest
+upstream-branch = upstream
# The default name for the Debian branch is "master".
# Change it if the name is different (for instance, "debian/unstable").
-debian-branch = debian/main
+debian-branch = master
# git-import-orig uses the following names for the upstream tags.
# Change the value if you are not using git-import-orig
=====================================
debian/tirex-core.tirex-backend-manager.init deleted
=====================================
@@ -1,137 +0,0 @@
-#! /bin/sh
-### BEGIN INIT INFO
-# Provides: tirex-backend-manager
-# Required-Start:
-# Required-Stop:
-# Default-Start: 2 3 4 5
-# Default-Stop: 0 1 6
-# Short-Description: Mapnik rendering daemon for Tirex.
-# Description: Mapnik rendering daemon for Tirex.
-### 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="Mapnik rendering daemon for Tirex"
-NAME=tirex-backend-manager
-DAEMON=/usr/bin/$NAME
-PIDFILE=/var/run/tirex/$NAME.pid
-DAEMON_ARGS=""
-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)
- log_daemon_msg "Reloading $DESC" "$NAME"
- do_reload
- log_end_msg $?
- ;;
- restart)
- 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-core.tirex-backend-manager.simple-init deleted
=====================================
@@ -1,86 +0,0 @@
-#! /bin/sh
-### BEGIN INIT INFO
-# Provides: tirex-backend-manager
-# Required-Start:
-# Required-Stop:
-# Default-Start: 2 3 4 5
-# Default-Stop: 0 1 6
-# Short-Description: Mapnik rendering daemon for Tirex.
-# Description: Mapnik rendering daemon for Tirex.
-### 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="Mapnik rendering daemon for Tirex"
-NAME=tirex-backend-manager
-DAEMON=/usr/bin/$NAME
-PIDFILE=/var/run/tirex/$NAME.pid
-DAEMON_ARGS=""
-SCRIPTNAME=/etc/init.d/$NAME
-
-# Exit if the package is not installed
-[ -x "$DAEMON" ] || exit 0
-
-#
-# 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
- su tirex -c $DAEMON
-}
-
-#
-# 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
- kill `cat $PIDFILE`
-}
-
-#
-# 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.
- #
- kill -HUP `cat $PIDFILE`
-}
-
-case "$1" in
- start)
- do_start
- ;;
- stop)
- do_stop
- ;;
- restart|force-reload)
- #
- # If the "reload" option is implemented then remove the
- # 'force-reload' alias
- #
- do_stop
- do_start
- ;;
- *)
- echo "Usage: $SCRIPTNAME {start|stop|restart|force-reload}" >&2
- exit 3
- ;;
-esac
-
-:
=====================================
debian/tirex-core.tirex-master.init deleted
=====================================
@@ -1,145 +0,0 @@
-#! /bin/sh
-### BEGIN INIT INFO
-# Provides: tirex-master
-# Required-Start:
-# Required-Stop:
-# Default-Start: 2 3 4 5
-# Default-Stop: 0 1 6
-# Short-Description: Tirex master server
-# Description: Tirex master 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 master server"
-NAME=tirex-master
-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-core.tirex-master.simple-init deleted
=====================================
@@ -1,86 +0,0 @@
-#! /bin/sh
-### BEGIN INIT INFO
-# Provides: tirex-master
-# Required-Start:
-# Required-Stop:
-# Default-Start: 2 3 4 5
-# Default-Stop: 0 1 6
-# Short-Description: Tirex master server
-# Description: Tirex master 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 master server"
-NAME=tirex-master
-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
-
-#
-# 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
- su tirex -c $DAEMON
-}
-
-#
-# 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
- kill `cat $PIDFILE`
-}
-
-#
-# 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.
- #
- kill -HUP `cat $PIDFILE`
-}
-
-case "$1" in
- start)
- do_start
- ;;
- stop)
- do_stop
- ;;
- restart|force-reload)
- #
- # If the "reload" option is implemented then remove the
- # 'force-reload' alias
- #
- do_stop
- do_start
- ;;
- *)
- echo "Usage: $SCRIPTNAME {start|stop|restart|force-reload}" >&2
- exit 3
- ;;
-esac
-
-:
=====================================
debian/tirex-example-map.install deleted
=====================================
@@ -1,2 +0,0 @@
-etc/tirex/renderer/mapnik/example.conf
-usr/share/tirex/example-map
=====================================
debian/tirex-example-map.postinst deleted
=====================================
@@ -1,7 +0,0 @@
-#! /bin/sh
-
-set -e
-
-[ -d /var/lib/tirex/tiles/example ] || mkdir -p /var/lib/tirex/tiles/example && chown tirex:tirex /var/lib/tirex/tiles/example
-
-#DEBHELPER#
=====================================
debian/tirex-core.install → debian/tirex-master.install
=====================================
=====================================
debian/tirex-core.postinst → debian/tirex-master.postinst
=====================================
View it on GitLab: https://salsa.debian.org/debian-gis-team/tirex/-/compare/f17510655995b7d29fbd583163e1c283a03792d9...9c186d56569033e7e720c977eb3f218776f4712a
--
View it on GitLab: https://salsa.debian.org/debian-gis-team/tirex/-/compare/f17510655995b7d29fbd583163e1c283a03792d9...9c186d56569033e7e720c977eb3f218776f4712a
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/20200819/06c34110/attachment-0001.html>
More information about the Pkg-grass-devel
mailing list