Commit Graph

791 Commits

Author SHA1 Message Date
Isaac Connor 8fad889c82 Don't delete the docs anymore 2017-04-27 12:15:39 -04:00
Isaac Connor 48d9167c5d Don't apply patches. 2017-04-27 12:05:47 -04:00
Isaac Connor 2b0561b481 delete the old merge files 2017-04-27 12:05:13 -04:00
Isaac Connor 6a3531c2ef use the mootools shipped with zm 2017-04-27 12:01:55 -04:00
Isaac Connor 6e94e57f57 don't default the cgi-bin path to /zm 2017-04-27 11:56:46 -04:00
Isaac Connor ce00047175 try out quilt format again 2017-04-27 11:46:36 -04:00
Isaac Connor eac1ebfb5a bump up standards version 2017-04-27 11:46:07 -04:00
Isaac Connor 20345df3eb Merge branch 'icon' into storageareas 2017-04-26 15:58:26 -04:00
Isaac Connor dce39bb2a9 Merge branch 'master' into storageareas 2017-04-26 15:58:17 -04:00
Isaac Connor dae4689b9c remove .rej and .orig 2017-04-26 15:51:54 -04:00
Isaac Connor da8a8f390e remove .rej and .orig 2017-04-26 15:51:49 -04:00
Isaac Connor 4a0d2ec123 This should add a menu entry 2017-04-26 15:51:21 -04:00
Isaac Connor 681be621b1 add /usr/share/zoneminder/icons to install list 2017-04-26 15:51:04 -04:00
Isaac Connor 882a2095b8 I believe this will cause the .deb to include a menu entry... not sure though 2017-04-26 15:46:19 -04:00
Isaac Connor b71d021ae1 Merge branch 'fix_1849' into storageareas 2017-04-18 12:43:04 -04:00
Andrew Bauer cea31f205a Update zoneminder.tmpfiles.in
remove cake cache folders from tmpfiles.d since we changed the cake cache engine to apc
2017-04-16 20:44:41 -05:00
Isaac Connor 273229858f Merge branch 'master' into storageareas 2017-04-16 11:26:18 -04:00
Isaac Connor 3b2d708a16 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2017-04-16 11:24:51 -04:00
Andy Bauer 3b1ef579d5 Merge branch 'master' of https://github.com/ZoneMinder/ZoneMinder 2017-04-15 09:24:45 -05:00
Andy Bauer 4240f03f4e rpm readmefile changes 2017-04-15 09:23:28 -05:00
Isaac Connor 432a38720a Merge pull request #1788 from knnniggett/travis_test1
packpack nightly builds
2017-04-15 10:21:42 -04:00
Andrew Bauer 7e9b9944ae rpmspecfile changes to reflect recent commits 2017-04-15 08:51:59 -05:00
Isaac Connor 0bbe5d19a6 add libavresample to build depends 2017-04-13 09:59:35 -04:00
Isaac Connor b03d0d09da fix typo 2017-04-13 09:08:15 -04:00
Isaac Connor d039227f79 Merge branch 'master' into storageareas 2017-04-12 13:51:10 -04:00
Isaac Connor e28be26978 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2017-04-12 13:41:16 -04:00
Isaac Connor 6e7bd9311d add the api tmp cache folders to the tmpfiles 2017-04-12 13:41:02 -04:00
Isaac Connor a58259c60e include other libjpeg alternatives. Include a libpcre dependency 2017-04-10 21:55:52 -04:00
Andrew Bauer cd1b09d977 Update zoneminder.spec
use rpm macros
2017-03-31 20:35:24 -05:00
Andrew Bauer 716a25fc1f rpmspecfile - ensure cache folders are created during install 2017-03-31 20:17:05 -05:00
Isaac Connor 58d119d9ed Merge branch 'fix_1762' into storageareas 2017-03-31 13:38:59 -04:00
Andrew Bauer 7068efd581 rpmspecfile - modify tarball handling 2017-03-30 18:31:58 -05:00
Andrew Bauer 9a2c31d2c0 bump rpmspecfile to 1.30.2 release 2017-03-30 18:20:41 -05:00
Andrew Bauer e46f64125e Update zoneminder.tmpfiles.in
With cakephp debug mode off, we must ensure cake's tmp folders are created
2017-03-29 13:28:15 -05:00
Isaac Connor 8c2e8defab Merge branch 'storageareas' of github.com:/ConnorTechnology/ZoneMinder into storageareas 2017-03-28 20:52:36 -04:00
Isaac Connor 74eed2ac29 Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas 2017-03-28 20:06:12 -04:00
Isaac Connor 769af661e9 Merge branch 'fix_x10' into storageareas 2017-03-28 20:05:52 -04:00
Isaac Connor 6f26a9585a add libswscale3 for jessie 2017-03-27 15:43:18 -04:00
Isaac Connor 113f4b2bfe add libx264-142 for jessie 2017-03-24 18:00:18 -04:00
Isaac Connor 7c86bcdfce add the link from /usr/share/zoneminder/www/api/app/tmp to /var/tmp 2017-03-24 11:52:55 -04:00
Isaac Connor f082183fd6 add the cache directories used by cake php under /var/tmp 2017-03-24 11:52:29 -04:00
Isaac Connor feb9d55613 fix syntax 2017-03-20 13:52:10 -04:00
Isaac Connor d5312ce21f fix libswscale for 1604 2017-03-13 15:37:55 -04:00
Isaac Connor 1cbcd3612f add libswscale4 2017-03-13 14:28:13 -04:00
Isaac Connor adbb5f431d fix version of x264 2017-03-11 11:00:46 -05:00
Isaac Connor e04cc1be05 add mp4 and x264 to ubuntu1204 and remove duplicated mp4.x264 lines from ubuntu1604. 2017-03-11 10:41:39 -05:00
Isaac Connor fdcb93eacc Merge branch 'master' into storageareas 2017-03-06 16:22:28 -05:00
Andy Bauer 5ea9f695de Merge branch 'master' into travis_test1 2017-03-05 13:02:59 -06:00
Andy Bauer ca71ee8e71 remove rules.new 2017-03-05 12:40:27 -06:00
Andy Bauer 4fe70f0e7d recreate patch 2017-03-05 12:39:03 -06:00