From 1918b9b576023a594123da8b45bb039fb22084db Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Mon, 4 Jan 2016 14:44:36 -0500 Subject: [PATCH 1/3] bump --- distros/ubuntu1410/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/distros/ubuntu1410/changelog b/distros/ubuntu1410/changelog index 21e381efd..a4b5302e7 100644 --- a/distros/ubuntu1410/changelog +++ b/distros/ubuntu1410/changelog @@ -1,3 +1,9 @@ +zoneminder (1.29.111-trusty-2016010401) trusty; urgency=medium + + * include fix to rotate image dimensions when applying a rotation + + -- Isaac Connor Mon, 04 Jan 2016 13:24:42 -0500 + zoneminder (1.29.111-trusty-2016010101) trusty; urgency=medium * fix logging with multi-server From f04ba9c87e9a8414829a83e53439bc7fa4df457c Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Mon, 4 Jan 2016 15:05:49 -0500 Subject: [PATCH 2/3] linefeed when saying that a db monitor doesn't exist in fs --- scripts/zmaudit.pl.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/zmaudit.pl.in b/scripts/zmaudit.pl.in index e2781457a..adcba9748 100644 --- a/scripts/zmaudit.pl.in +++ b/scripts/zmaudit.pl.in @@ -364,7 +364,7 @@ MAIN: while( $loop ) { } else { - aud_print( "Database monitor '$db_monitor' does not exist in filesystem" ); + aud_print( "Database monitor '$db_monitor' does not exist in filesystem\n" ); #if ( confirm() ) #{ # We don't actually do this in case it's new From 6e685ec8c84d2df7ae013816ca09ce0e601ae99e Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Mon, 4 Jan 2016 15:13:01 -0500 Subject: [PATCH 3/3] add Monitor object class and use it in zmaudit.pl to print out path where monitor should have been --- scripts/zmaudit.pl.in | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/scripts/zmaudit.pl.in b/scripts/zmaudit.pl.in index adcba9748..bed7b13fe 100644 --- a/scripts/zmaudit.pl.in +++ b/scripts/zmaudit.pl.in @@ -114,6 +114,7 @@ if ( ($report + $interactive + $continuous) > 1 ) my $dbh = zmDbConnect(); +require ZoneMinder::Monitor; require ZoneMinder::Storage; require ZoneMinder::Event; @@ -364,7 +365,9 @@ MAIN: while( $loop ) { } else { - aud_print( "Database monitor '$db_monitor' does not exist in filesystem\n" ); + my $Monitor = new ZoneMinder::Monitor( $db_monitor ); + my $Storage = $Monitor->Storage(); + aud_print( "Database monitor '$db_monitor' does not exist in filesystem, should have been at ".$Storage->Path()."\n" ); #if ( confirm() ) #{ # We don't actually do this in case it's new