diff -Nru kopanocore-8.6.91/debian/changelog kopanocore-8.6.91/debian/changelog --- kopanocore-8.6.91/debian/changelog 2018-12-23 19:01:31.000000000 +0000 +++ kopanocore-8.6.91/debian/changelog 2018-12-30 00:46:04.000000000 +0000 @@ -1,3 +1,11 @@ +kopanocore (8.6.91-1+rpi1) buster-staging; urgency=medium + + * The build system now seems to be properly putting systemd units in + /lib/systemd , update install files to match. + * Fix clean target. + + -- Peter Michael Green Sun, 30 Dec 2018 00:46:04 +0000 + kopanocore (8.6.91-1) unstable; urgency=medium * [07e91b4] New upstream version 8.6.91 diff -Nru kopanocore-8.6.91/debian/kopano-contacts.install kopanocore-8.6.91/debian/kopano-contacts.install --- kopanocore-8.6.91/debian/kopano-contacts.install 1970-01-01 00:00:00.000000000 +0000 +++ kopanocore-8.6.91/debian/kopano-contacts.install 2018-12-30 00:45:52.000000000 +0000 @@ -0,0 +1,2 @@ +usr/lib/mapi.d/zcontacts.inf +usr/lib/arm-linux-gnueabihf/kopano/libkccontacts.so diff -Nru kopanocore-8.6.91/debian/kopano-dagent.install kopanocore-8.6.91/debian/kopano-dagent.install --- kopanocore-8.6.91/debian/kopano-dagent.install 2018-12-21 20:11:16.000000000 +0000 +++ kopanocore-8.6.91/debian/kopano-dagent.install 2018-12-30 00:45:52.000000000 +0000 @@ -1,6 +1,6 @@ etc/kopano/autorespond.cfg etc/kopano/dagent.cfg -#usr/lib/systemd/system/kopano-dagent.service lib/systemd/system/ +#lib/systemd/system/kopano-dagent.service lib/systemd/system/ usr/sbin/kopano-autorespond usr/sbin/kopano-dagent usr/sbin/kopano-mr-accept diff -Nru kopanocore-8.6.91/debian/kopano-dev.install kopanocore-8.6.91/debian/kopano-dev.install --- kopanocore-8.6.91/debian/kopano-dev.install 1970-01-01 00:00:00.000000000 +0000 +++ kopanocore-8.6.91/debian/kopano-dev.install 2018-12-30 00:45:52.000000000 +0000 @@ -0,0 +1,15 @@ +usr/include +usr/lib/arm-linux-gnueabihf/libkcarchiver.so +usr/lib/arm-linux-gnueabihf/libkcarchivercore.so +usr/lib/arm-linux-gnueabihf/libkcfreebusy.so +usr/lib/arm-linux-gnueabihf/libkcicalmapi.so +usr/lib/arm-linux-gnueabihf/libkcinetmapi.so +usr/lib/arm-linux-gnueabihf/libkcpyconv.so +usr/lib/arm-linux-gnueabihf/libkcpydirector.so +usr/lib/arm-linux-gnueabihf/libkcpyplug.so +usr/lib/arm-linux-gnueabihf/libkcserver.so +usr/lib/arm-linux-gnueabihf/libkcsoap.so +usr/lib/arm-linux-gnueabihf/libkcutil.so +usr/lib/arm-linux-gnueabihf/libmapi.so +usr/lib/arm-linux-gnueabihf/pkgconfig/kopano.pc +usr/share/gdb diff -Nru kopanocore-8.6.91/debian/kopano-gateway.install kopanocore-8.6.91/debian/kopano-gateway.install --- kopanocore-8.6.91/debian/kopano-gateway.install 2018-12-21 20:11:16.000000000 +0000 +++ kopanocore-8.6.91/debian/kopano-gateway.install 2018-12-30 00:45:52.000000000 +0000 @@ -1,5 +1,5 @@ etc/kopano/gateway.cfg -usr/lib/systemd/system/kopano-gateway.service lib/systemd/system/ +lib/systemd/system/kopano-gateway.service lib/systemd/system/ usr/sbin/kopano-gateway usr/share/doc/kopano-gateway/ usr/share/man/man5/kopano-gateway.cfg.5 diff -Nru kopanocore-8.6.91/debian/kopano-ical.install kopanocore-8.6.91/debian/kopano-ical.install --- kopanocore-8.6.91/debian/kopano-ical.install 2018-12-21 20:11:16.000000000 +0000 +++ kopanocore-8.6.91/debian/kopano-ical.install 2018-12-30 00:45:52.000000000 +0000 @@ -1,5 +1,5 @@ etc/kopano/ical.cfg -usr/lib/systemd/system/kopano-ical.service lib/systemd/system/ +lib/systemd/system/kopano-ical.service lib/systemd/system/ usr/sbin/kopano-ical usr/share/man/man5/kopano-ical.cfg.5 usr/share/man/man8/kopano-ical.8 diff -Nru kopanocore-8.6.91/debian/kopano-libs.install kopanocore-8.6.91/debian/kopano-libs.install --- kopanocore-8.6.91/debian/kopano-libs.install 1970-01-01 00:00:00.000000000 +0000 +++ kopanocore-8.6.91/debian/kopano-libs.install 2018-12-30 00:45:52.000000000 +0000 @@ -0,0 +1,15 @@ +usr/lib/arm-linux-gnueabihf/libkcarchiver.so.* +usr/lib/arm-linux-gnueabihf/libkcarchivercore.so.* +usr/lib/arm-linux-gnueabihf/libkcfreebusy.so.* +usr/lib/arm-linux-gnueabihf/libkcicalmapi.so.* +usr/lib/arm-linux-gnueabihf/libkcinetmapi.so.* +usr/lib/arm-linux-gnueabihf/libmapi.so.* +usr/lib/arm-linux-gnueabihf/libkcpyconv-3.*.so +usr/lib/arm-linux-gnueabihf/libkcpydirector-3.*.so +usr/lib/arm-linux-gnueabihf/libkcpyplug.so.* +usr/lib/arm-linux-gnueabihf/libkcserver.so.* +usr/lib/arm-linux-gnueabihf/libkcsoap.so.* +usr/lib/arm-linux-gnueabihf/libkcutil.so.* +# From libkopano-client +usr/lib/mapi.d/kopano.inf +usr/lib/arm-linux-gnueabihf/kopano/libkcclient.so diff -Nru kopanocore-8.6.91/debian/kopano-monitor.install kopanocore-8.6.91/debian/kopano-monitor.install --- kopanocore-8.6.91/debian/kopano-monitor.install 2018-12-21 20:11:16.000000000 +0000 +++ kopanocore-8.6.91/debian/kopano-monitor.install 2018-12-30 00:45:52.000000000 +0000 @@ -1,6 +1,6 @@ etc/kopano/monitor.cfg etc/kopano/quotamail/ -usr/lib/systemd/system/kopano-monitor.service lib/systemd/system/ +lib/systemd/system/kopano-monitor.service lib/systemd/system/ usr/sbin/kopano-monitor usr/share/man/man5/kopano-monitor.cfg.5 usr/share/man/man8/kopano-monitor.8 diff -Nru kopanocore-8.6.91/debian/kopano-presence.install kopanocore-8.6.91/debian/kopano-presence.install --- kopanocore-8.6.91/debian/kopano-presence.install 2018-12-21 20:11:16.000000000 +0000 +++ kopanocore-8.6.91/debian/kopano-presence.install 2018-12-30 00:45:52.000000000 +0000 @@ -1,5 +1,5 @@ etc/kopano/presence.cfg -#usr/lib/systemd/system/kopano-presence.service lib/systemd/system/ +#lib/systemd/system/kopano-presence.service lib/systemd/system/ usr/sbin/kopano-presence usr/lib/python3/dist-packages/kopano_presence-*.egg-info/* usr/lib/python3/dist-packages/kopano_presence/*.py diff -Nru kopanocore-8.6.91/debian/kopano-search.install kopanocore-8.6.91/debian/kopano-search.install --- kopanocore-8.6.91/debian/kopano-search.install 2018-12-21 20:11:16.000000000 +0000 +++ kopanocore-8.6.91/debian/kopano-search.install 2018-12-30 00:45:52.000000000 +0000 @@ -3,7 +3,7 @@ usr/lib/python3/dist-packages/kopano_search/*.py usr/lib/python3/dist-packages/kopano_search/xmltotext.xslt usr/lib/python3/dist-packages/kopano_search-*.egg-info/ -usr/lib/systemd/system/kopano-search.service lib/systemd/system/ +lib/systemd/system/kopano-search.service lib/systemd/system/ usr/sbin/kopano-search #usr/sbin/kopano-search-xapian-compact.py usr/share/man/man5/kopano-search.cfg.5 diff -Nru kopanocore-8.6.91/debian/kopano-server.install kopanocore-8.6.91/debian/kopano-server.install --- kopanocore-8.6.91/debian/kopano-server.install 1970-01-01 00:00:00.000000000 +0000 +++ kopanocore-8.6.91/debian/kopano-server.install 2018-12-30 00:45:52.000000000 +0000 @@ -0,0 +1,23 @@ +etc/kopano/server.cfg +etc/kopano/unix.cfg +usr/lib/kopano/userscripts +usr/lib/arm-linux-gnueabihf/kopano/libkcserver-db.so +usr/lib/arm-linux-gnueabihf/kopano/libkcserver-ldap.so +usr/lib/arm-linux-gnueabihf/kopano/libkcserver-unix.so +#lib/systemd/system/kopano-server.service lib/systemd/system/ +usr/sbin/kopano-server +usr/share/doc/kopano-server/ +usr/share/man/man5/kopano-ldap.cfg.5 +usr/share/man/man5/kopano-coredump.5 +usr/share/man/man5/kopano-server.cfg.5 +usr/share/man/man5/kopano-unix.cfg.5 +usr/share/man/man7/kopano.7 +usr/share/man/man7/mapi.7 +usr/share/man/man8/kopano-cfgchecker.8 +usr/share/man/man8/kopano-server.8 +usr/share/kopano/debian +usr/share/kopano/ldap.active-directory.cfg +usr/share/kopano/ldap.openldap.cfg +usr/share/kopano/ldap.propmap.cfg +debian/apparmor/usr.sbin.kopano-server etc/apparmor.d +usr/share/doc/kopano-server/example-config/apparmor.d diff -Nru kopanocore-8.6.91/debian/kopano-server.install.in kopanocore-8.6.91/debian/kopano-server.install.in --- kopanocore-8.6.91/debian/kopano-server.install.in 2018-12-21 20:11:16.000000000 +0000 +++ kopanocore-8.6.91/debian/kopano-server.install.in 2018-12-30 00:45:52.000000000 +0000 @@ -4,7 +4,7 @@ usr/lib/@DEB_HOST_MULTIARCH@/kopano/libkcserver-db.so usr/lib/@DEB_HOST_MULTIARCH@/kopano/libkcserver-ldap.so usr/lib/@DEB_HOST_MULTIARCH@/kopano/libkcserver-unix.so -#usr/lib/systemd/system/kopano-server.service lib/systemd/system/ +#lib/systemd/system/kopano-server.service lib/systemd/system/ usr/sbin/kopano-server usr/share/doc/kopano-server/ usr/share/man/man5/kopano-ldap.cfg.5 diff -Nru kopanocore-8.6.91/debian/kopano-spamd.install kopanocore-8.6.91/debian/kopano-spamd.install --- kopanocore-8.6.91/debian/kopano-spamd.install 2018-12-21 20:11:16.000000000 +0000 +++ kopanocore-8.6.91/debian/kopano-spamd.install 2018-12-30 00:45:52.000000000 +0000 @@ -1,6 +1,6 @@ etc/kopano/spamd.cfg usr/lib/python*/*/kopano_spamd* -usr/lib/systemd/system/kopano-spamd.service lib/systemd/system/ +lib/systemd/system/kopano-spamd.service lib/systemd/system/ usr/sbin/kopano-spamd usr/share/man/man5/kopano-spamd.cfg.5 usr/share/man/man8/kopano-spamd.8 diff -Nru kopanocore-8.6.91/debian/kopano-spooler.install kopanocore-8.6.91/debian/kopano-spooler.install --- kopanocore-8.6.91/debian/kopano-spooler.install 2018-12-21 20:11:16.000000000 +0000 +++ kopanocore-8.6.91/debian/kopano-spooler.install 2018-12-30 00:45:52.000000000 +0000 @@ -1,5 +1,5 @@ etc/kopano/spooler.cfg -usr/lib/systemd/system/kopano-spooler.service lib/systemd/system/ +lib/systemd/system/kopano-spooler.service lib/systemd/system/ usr/sbin/kopano-spooler usr/share/man/man5/kopano-spooler.cfg.5 usr/share/man/man8/kopano-spooler.8 diff -Nru kopanocore-8.6.91/debian/php-mapi.install kopanocore-8.6.91/debian/php-mapi.install --- kopanocore-8.6.91/debian/php-mapi.install 1970-01-01 00:00:00.000000000 +0000 +++ kopanocore-8.6.91/debian/php-mapi.install 2018-12-30 00:45:52.000000000 +0000 @@ -0,0 +1,3 @@ +etc/php/*/cli/conf.d/mapi.ini /etc/php/7.3/mods-available +usr/share/kopano/php/mapi/ +usr/lib/php diff -Nru kopanocore-8.6.91/debian/php-mapi.postrm kopanocore-8.6.91/debian/php-mapi.postrm --- kopanocore-8.6.91/debian/php-mapi.postrm 1970-01-01 00:00:00.000000000 +0000 +++ kopanocore-8.6.91/debian/php-mapi.postrm 2018-12-30 00:08:31.000000000 +0000 @@ -0,0 +1,50 @@ +#!/bin/sh +# postrm script for php-mapi +# +# see: dh_installdeb(1) + +set -e +#set -x # uncomment for verbose output + +# summary of how this script can be called: +# * `remove' +# * `purge' +# * `upgrade' +# * `failed-upgrade' +# * `abort-install' +# * `abort-install' +# * `abort-upgrade' +# * `disappear' +# +# for details, see http://www.debian.org/doc/debian-policy/ or +# the debian-policy package + +PHPVERSION="7.3" + +case "$1" in + purge) + if [ -e /usr/lib/php/php-maintscript-helper ]; then + . /usr/lib/php/php-maintscript-helper + + # calling php_invoke to disable 'mapi' for all PHP modules + php_invoke dismod ${PHPVERSION} ALL mapi + # clean up any remaining links + find /etc/php/${PHPVERSION}/*/conf.d -type l -name "*mapi.ini" -exec rm -f {} \; + fi + + ;; + + remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) + ;; + + *) + echo "postrm 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 diff -Nru kopanocore-8.6.91/debian/rules kopanocore-8.6.91/debian/rules --- kopanocore-8.6.91/debian/rules 2018-12-21 20:42:59.000000000 +0000 +++ kopanocore-8.6.91/debian/rules 2018-12-30 00:46:04.000000000 +0000 @@ -59,6 +59,8 @@ override_dh_auto_clean: [ ! -f Makefile ] || dh_auto_clean + rm -rf debian/build + rm -f revision override_dh_install: # Install docs