ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #290 from dmak/debian 

Fix for few problems in Debian packaging
This commit is contained in:
Isaac Connor 2013-12-31 07:38:41 -08:00
parent 4854c495a2 b370f98004
commit 4f9492f766
3 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
db/zm_update-1.26.5.sql
View File

@ -5,5 +5,19 @@
-- --
-- Add AlarmRefBlendPerc field for controlling the reference image blend percent during alarm (see pull request #241) -- Add AlarmRefBlendPerc field for controlling the reference image blend percent during alarm (see pull request #241)
-- --
ALTER TABLE `Monitors` ADD `AlarmRefBlendPerc` TINYINT(3) UNSIGNED NOT NULL DEFAULT '3' AFTER `RefBlendPerc`;
SET @s = (SELECT IF(
(SELECT COUNT(*)
FROM INFORMATION_SCHEMA.COLUMNS
WHERE table_name = 'Monitors'
AND table_schema = DATABASE()
AND column_name = 'AlarmRefBlendPerc'
) > 0,
"SELECT 1",
"ALTER TABLE `Monitors` ADD `AlarmRefBlendPerc` TINYINT(3) UNSIGNED NOT NULL DEFAULT '3' AFTER `RefBlendPerc`"
));
PREPARE stmt FROM @s;
EXECUTE stmt;

2
distros/debian/postinst
View File

@ -2,7 +2,7 @@
set -e set -e
VERSION=1.26.4 VERSION=1.26.5
if [ "$1" = "configure" ]; then if [ "$1" = "configure" ]; then
# #

2
distros/debian/rules
View File

@ -43,7 +43,7 @@ override_dh_clean:
override_dh_install: override_dh_install:
# Add here commands to install the package into debian/zm. # 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 $(MAKE) install DESTDIR=$(CURDIR)/debian/zoneminder
install -D -m 0644 db/zm_create.sql $(CURDIR)/debian/zoneminder/usr/share/zoneminder/db 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 db/zm_update-*.sql $(CURDIR)/debian/zoneminder/usr/share/zoneminder/db
install -D -m 0644 debian/apache.conf $(CURDIR)/debian/zoneminder/etc/zm install -D -m 0644 debian/apache.conf $(CURDIR)/debian/zoneminder/etc/zm