From be420e65c40b480c6d120307653f290fd4e90e9d Mon Sep 17 00:00:00 2001 From: Emmanuel Papin Date: Tue, 25 Nov 2014 23:28:35 +0100 Subject: [PATCH] Fix a reference to the build directory in debian package by using dh_install --- distros/debian8/install | 17 ++++++++++++++++- distros/debian8/rules | 7 ++----- 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/distros/debian8/install b/distros/debian8/install index 9e8953409..86fe0a0a6 100644 --- a/distros/debian8/install +++ b/distros/debian8/install @@ -3,5 +3,20 @@ usr/lib/cgi-bin usr/share/man usr/share/perl5/ZoneMinder usr/share/perl5/ZoneMinder.pm -usr/share/zoneminder +usr/share/polkit-1/actions +usr/share/polkit-1/rules.d +usr/share/zoneminder/ajax +usr/share/zoneminder/css +usr/share/zoneminder/db +usr/share/zoneminder/graphics +usr/share/zoneminder/includes +usr/share/zoneminder/index.php +usr/share/zoneminder/js +usr/share/zoneminder/lang +usr/share/zoneminder/skins +usr/share/zoneminder/tools +usr/share/zoneminder/views etc/zm +db/zm_create.sql usr/share/zoneminder/db +db/zm_update-*.sql usr/share/zoneminder/db +debian/apache.conf etc/zm diff --git a/distros/debian8/rules b/distros/debian8/rules index 9b2503da6..3ddb8c19c 100755 --- a/distros/debian8/rules +++ b/distros/debian8/rules @@ -43,11 +43,6 @@ override_dh_clean: dh_clean override_dh_install: - # Add here commands to install the package into debian/zm. - $(MAKE) install DESTDIR=$(CURDIR)/debian/zoneminder RUNDIR=$(CURDIR)/debian/zoneminder/var/run ZM_RUNDIR=$(CURDIR)/debian/zoneminder/var/run - install -D -m 0644 db/zm_create.sql $(CURDIR)/debian/zoneminder/usr/share/zoneminder/db - install -D -m 0644 db/zm_update-*.sql $(CURDIR)/debian/zoneminder/usr/share/zoneminder/db - install -D -m 0644 debian/apache.conf $(CURDIR)/debian/zoneminder/etc/zm # # NOTE: This is a short-term kludge; hopefully changes in the next # upstream version will render this unnecessary. @@ -66,6 +61,8 @@ override_dh_install: # dh_link usr/lib/cgi-bin usr/share/zoneminder/cgi-bin + dh_install --fail-missing + override_dh_fixperms: dh_fixperms chown root:root debian/zoneminder/etc/zm/zm.conf