From d790f94ff861515211445a6558834d742cd1cb7a Mon Sep 17 00:00:00 2001 From: Emmanuel Papin Date: Wed, 26 Nov 2014 10:59:36 +0100 Subject: [PATCH] Use dh_systemd to manage service and tmpfile --- distros/debian8/control | 2 +- distros/debian8/rules | 5 ++++- distros/debian8/zoneminder.install | 2 -- distros/debian8/{zoneminder.conf => zoneminder.tmpfile} | 0 4 files changed, 5 insertions(+), 4 deletions(-) rename distros/debian8/{zoneminder.conf => zoneminder.tmpfile} (100%) diff --git a/distros/debian8/control b/distros/debian8/control index 8e77ac04a..3f2834ddb 100644 --- a/distros/debian8/control +++ b/distros/debian8/control @@ -2,7 +2,7 @@ Source: zoneminder Section: net Priority: optional Maintainer: Isaac Connor -Build-Depends: debhelper (>= 9), autoconf, automake, quilt, libphp-serialization-perl, libgnutls28-dev, libmysqlclient-dev | libmariadbclient-dev, libdbd-mysql-perl, libdate-manip-perl, libwww-perl, libjpeg8-dev|libjpeg9-dev|libjpeg62-turbo-dev, libpcre3-dev, libavcodec-dev, libavformat-dev (>= 3:0.svn20090204), libswscale-dev (>= 3:0.svn20090204), libavutil-dev, libv4l-dev (>= 0.8.3), libbz2-dev, libtool, libsys-mmap-perl, ffmpeg | libav-tools, libnetpbm10-dev, libavdevice-dev, libdevice-serialport-perl, libarchive-zip-perl, libmime-lite-perl, dh-autoreconf, libvlccore-dev, libvlc-dev, libcurl4-gnutls-dev | libcurl4-nss-dev | libcurl4-openssl-dev, libgcrypt11-dev|libgcrypt20-dev, libpolkit-gobject-1-dev +Build-Depends: debhelper (>= 9), dh-systemd (>= 1.5), autoconf, automake, quilt, libphp-serialization-perl, libgnutls28-dev, libmysqlclient-dev | libmariadbclient-dev, libdbd-mysql-perl, libdate-manip-perl, libwww-perl, libjpeg8-dev|libjpeg9-dev|libjpeg62-turbo-dev, libpcre3-dev, libavcodec-dev, libavformat-dev (>= 3:0.svn20090204), libswscale-dev (>= 3:0.svn20090204), libavutil-dev, libv4l-dev (>= 0.8.3), libbz2-dev, libtool, libsys-mmap-perl, ffmpeg | libav-tools, libnetpbm10-dev, libavdevice-dev, libdevice-serialport-perl, libarchive-zip-perl, libmime-lite-perl, dh-autoreconf, libvlccore-dev, libvlc-dev, libcurl4-gnutls-dev | libcurl4-nss-dev | libcurl4-openssl-dev, libgcrypt11-dev|libgcrypt20-dev, libpolkit-gobject-1-dev Standards-Version: 3.9.6 Package: zoneminder diff --git a/distros/debian8/rules b/distros/debian8/rules index 3ddb8c19c..47a49d0ab 100755 --- a/distros/debian8/rules +++ b/distros/debian8/rules @@ -25,7 +25,7 @@ else endif %: - dh $@ --with quilt,autoreconf + dh $@ --with quilt,autoreconf,systemd override_dh_auto_configure: CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" dh_auto_configure -- \ @@ -70,6 +70,9 @@ override_dh_fixperms: override_dh_auto_test: # do not run tests... +override_dh_systemd_start: + dh_systemd_start --restart-after-upgrade + .PHONY: override_dh_strip override_dh_strip: dh_strip --dbg-package=zoneminder-dbg diff --git a/distros/debian8/zoneminder.install b/distros/debian8/zoneminder.install index 7e8d8d87a..86fe0a0a6 100644 --- a/distros/debian8/zoneminder.install +++ b/distros/debian8/zoneminder.install @@ -20,5 +20,3 @@ etc/zm db/zm_create.sql usr/share/zoneminder/db db/zm_update-*.sql usr/share/zoneminder/db debian/apache.conf etc/zm -debian/zoneminder.service lib/systemd/system -debian/zoneminder.conf etc/tmpfiles.d diff --git a/distros/debian8/zoneminder.conf b/distros/debian8/zoneminder.tmpfile similarity index 100% rename from distros/debian8/zoneminder.conf rename to distros/debian8/zoneminder.tmpfile