Merge all packages into one icinga-redis package

debian/control

@@ -18,49 +18,18 @@ Vcs-Browser: https://salsa.debian.org/lamby/pkg-redis
 Rules-Requires-Root: no
 
 Package: icinga-redis
-Architecture: all
-Depends:
- icinga-redis-server (<< ${binary:Version}.1~),
- icinga-redis-server (>= ${binary:Version}),
- ${misc:Depends},
-Description: Persistent key-value database with network interface (metapackage)
- Redis is a key-value database in a similar vein to memcache but the dataset
- is non-volatile. Redis additionally provides native support for atomically
- manipulating and querying data structures such as lists and sets.
- .
- The dataset is stored entirely in memory and periodically flushed to disk.
- .
- This package depends on the redis-server package.
-
-Package: icinga-redis-server
 Architecture: any
 Pre-Depends: ${misc:Pre-Depends}
 Depends:
+ adduser,
  lsb-base (>= 3.2-14),
- icinga-redis-tools (= ${binary:Version}),
  ${misc:Depends},
-Description: Persistent key-value database with network interface
+ ${shlibs:Depends},
+Description: Persistent key-value database with network interface (metapackage)
  Redis is a key-value database in a similar vein to memcache but the dataset
  is non-volatile. Redis additionally provides native support for atomically
  manipulating and querying data structures such as lists and sets.
  .
  The dataset is stored entirely in memory and periodically flushed to disk.
-
-Package: icinga-redis-tools
-Architecture: any
-Depends:
- adduser,
- ${misc:Depends},
- ${shlibs:Depends},
-Suggests:
- ruby-redis,
-Replaces:
- icinga-redis-server (<< 2:2.6.16-1),
-Breaks:
- icinga-redis-server (<< 2:2.6.16-1),
-Description: Persistent key-value database with network interface (client)
- Redis is a key-value database in a similar vein to memcache but the dataset
- is non-volatile. Redis additionally provides native support for atomically
- manipulating and querying data structures such as lists and sets.
  .
- This package contains the command line client and other tools.
+ This package depends on the redis-server package.

debian/icinga-redis-server.install

-debian/icinga-redis-server.service /lib/systemd/system
-redis.conf	/etc/icinga-redis

debian/icinga-redis-server.manpages

-debian/icinga-redis-server.1

debian/icinga-redis-server.postinst

-#!/bin/sh
-
-set -eu
-
-USER="icinga-redis"
-GROUP="$USER"
-CONFFILE="/etc/icinga-redis/redis.conf"
-
-if [ "$1" = "configure" ]
-then
-	if ! dpkg-statoverride --list ${CONFFILE} >/dev/null 2>&1
-	then
-		dpkg-statoverride --update --add ${USER} ${GROUP} 640 ${CONFFILE}
-	fi
-fi
-
-#DEBHELPER#
-
-if [ "$1" = "configure" ]
-then
-	find /etc/icinga-redis -maxdepth 1 -type d -name 'icinga-redis-server.*.d' -empty -delete
-fi
-
-exit 0

debian/icinga-redis-tools.postrm

-#!/bin/sh
-
-set -eu
-
-if [ "${1}" = "purge" ]
-then
-	userdel icinga-redis || true
-	rm -rf /var/lib/icinga-redis /var/log/icinga-redis
-fi
-
-#DEBHELPER#
-
-exit 0

debian/icinga-redis-tools.install → debian/icinga-redis.install

 debian/bash_completion.d/*	/usr/share/bash-completion/completions
+debian/icinga-redis-server.service /lib/systemd/system
+redis.conf	/etc/icinga-redis
 src/icinga-redis-benchmark		/usr/bin
 src/icinga-redis-check-aof	/usr/bin
 src/icinga-redis-check-rdb	/usr/bin

debian/icinga-redis-tools.manpages → debian/icinga-redis.manpages

+debian/icinga-redis-server.1
 debian/icinga-redis-benchmark.1
 debian/icinga-redis-check-aof.1
 debian/icinga-redis-check-rdb.1
 debian/icinga-redis-cli.1
+

debian/icinga-redis-tools.postinst → debian/icinga-redis.postinst

@@ -3,6 +3,8 @@
 set -eu
 
 USER="icinga-redis"
+GROUP="$USER"
+CONFFILE="/etc/icinga-redis/redis.conf"
 
 Setup_dir () {
 	DIR="${1}"
@@ -40,6 +42,11 @@ then
 
 	Setup_dir /var/log/icinga-redis ${USER}:adm 2750
 	Setup_dir /var/lib/icinga-redis ${USER}:${USER} 750
+
+	if ! dpkg-statoverride --list ${CONFFILE} >/dev/null 2>&1
+	then
+		dpkg-statoverride --update --add ${USER} ${GROUP} 640 ${CONFFILE}
+	fi
 fi
 
 #DEBHELPER#

debian/icinga-redis-server.postrm → debian/icinga-redis.postrm

@@ -7,6 +7,8 @@ CONFFILE="/etc/icinga-redis/redis.conf"
 if [ "${1}" = "purge" ]
 then
 	dpkg-statoverride --remove ${CONFFILE} || test $? -eq 2
+	userdel icinga-redis || true
+	rm -rf /var/lib/icinga-redis /var/log/icinga-redis
 fi
 
 #DEBHELPER#