Merge branch 'master' into dist/eole/2.7.0/master

debian/eole-redis.redis2-server.service

@@ -0,0 +1 @@
+../init/redis2-server.service

debian/preinst

@@ -1,35 +0,0 @@
-#!/bin/sh
-# preinst script for eole-redis
-#
-# see: dh_installdeb(1)
-
-set -e
-
-# summary of how this script can be called:
-#        * <new-preinst> `install'
-#        * <new-preinst> `install' <old-version>
-#        * <new-preinst> `upgrade' <old-version>
-#        * <old-preinst> `abort-upgrade' <new-version>
-# for details, see https://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
-
-case "$1" in
-    install|upgrade)
-        deb-systemd-helper mask redis-server.service
-    ;;
-
-    abort-upgrade)
-    ;;
-
-    *)
-        echo "preinst called with unknown argument \`$1'" >&2
-        exit 1
-    ;;
-esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0