Commit Graph

298 Commits

Author SHA1 Message Date
Emmanuel Papin 236293b8a7 Add a rule to generate original source tarball from github 2014-11-26 18:37:22 +01:00
Emmanuel Papin 441fca34a6 Add more files to extend-diff-ignore 2014-11-26 18:34:07 +01:00
Emmanuel Papin ed5e42aedc Convert debian source package to version 3.0 (quilt) 2014-11-26 18:14:50 +01:00
Emmanuel Papin 4411024420 Remove unneeded build dependency to quilt (a dpkg feature is used) 2014-11-26 11:27:35 +01:00
Emmanuel Papin d790f94ff8 Use dh_systemd to manage service and tmpfile 2014-11-26 10:59:36 +01:00
Emmanuel Papin f048b5297d Update changelog 2014-11-26 00:34:51 +01:00
Emmanuel Papin da75cc4404 Fix file permissions for preinst file 2014-11-26 00:08:15 +01:00
Emmanuel Papin 68e5501004 Rename some debian files to allow building of multiple packages 2014-11-26 00:06:28 +01:00
Emmanuel Papin 6941a7df2e Remove the deprecated sysVinit script 2014-11-25 23:56:29 +01:00
Emmanuel Papin 441c22ed53 Configure systemd to create the /var/run/zm directory at boot time on debian jessie 2014-11-25 23:51:57 +01:00
Emmanuel Papin 997ab779ac Provide and install a zoneminder.service file to get zm running with systemd on debian jessie 2014-11-25 23:50:46 +01:00
Emmanuel Papin be420e65c4 Fix a reference to the build directory in debian package by using dh_install 2014-11-25 23:28:35 +01:00
Emmanuel Papin 319fef80cf Use dh_link instead of standard ln command 2014-11-25 23:01:06 +01:00
Emmanuel Papin faac3ebe48 Use dh_auto_configure instead of standard configure and some cosmetic 2014-11-25 22:58:26 +01:00
Emmanuel Papin c2ffe69533 Provide a patch to fix installation directory for man pages on debian 2014-11-25 22:55:01 +01:00
Emmanuel Papin d493f97e34 Replace deprecated dpatch by quilt 2014-11-25 22:48:11 +01:00
Emmanuel Papin 5a7851a76b Some cosmetic in debian/control 2014-11-25 22:37:04 +01:00
Emmanuel Papin e9ca774290 Upgrade Standards-Version in debian/control (fix a warning on debian tracker) 2014-11-25 22:34:26 +01:00
Emmanuel Papin 81a625eb23 Upgrade debhelper version in debian/control 2014-11-25 22:25:55 +01:00
Emmanuel Papin 76000bac78 Add runtime dependency to libgcrypt 2014-11-25 22:20:57 +01:00
Emmanuel Papin 6ea81bb783 Remove dependency to alternative packages not available in debian jessie 2014-11-25 22:18:29 +01:00
Emmanuel Papin 45c2eca87f Copy distros/debian folder to distros/debian8 2014-11-25 22:09:55 +01:00
Emmanuel Papin f901e73dfd libgcrypt20-dev added in Build-Depends 2014-11-25 11:10:12 +01:00
Emmanuel Papin c287f76511 Remove unneeded dependency 2014-11-25 10:45:04 +01:00
Emmanuel Papin 61118142b9 Merge branch 'master' of https://github.com/ZoneMinder/ZoneMinder into debian_dep 2014-11-25 10:29:28 +01:00
Andrew Bauer 4ac699c167 Merge pull request #594 from ndobbs/feature-ndobbs_selinux_rhel6_support
updated local_zoneminder type extension file
2014-11-24 17:46:55 -06:00
Nate Dobbs b81f87af69 updated local_zoneminder type extension file to support ZM running on CentOS/RHEL 6.x in SElinux ENFORCING mode 2014-11-24 17:36:47 -05:00
Andrew Bauer 4c353abecd Update zoneminder.cmake.el6.spec 2014-11-24 15:41:09 -06:00
Andrew Bauer 7c75867300 Update zoneminder.cmake.f20.spec 2014-11-24 15:40:45 -06:00
Emmanuel Papin fe5898c014 Deal with all libjpeg* libraries on debian 2014-11-24 22:22:57 +01:00
Isaac Connor c55c9a716c add libgnutls28-dev as an option to libgnutls-dev
add the other libjpeg*-dev options, any of which should do
2014-11-24 14:09:57 -05:00
Isaac Connor f954d4b034 add a changelog entry 2014-11-20 11:07:58 -05:00
Isaac Connor 4f9a2e1689 update Depends to match ubuntu. 2014-11-17 09:17:03 -05:00
Andrew Bauer 2dc73810db Update rpm specfiles to make use of zmeditconfigdata.sh 2014-11-15 12:55:33 -06:00
Cosme Domínguez Díaz 972dedd15a * distros/debian -> Autotools
* distros/debian_cmake -> CMake
2014-11-11 22:48:04 +01:00
Cosme Domínguez Díaz 96859e3b11 * Use CMake instead of Autotools.
* Some lintian love (minor fixes and cosmetic changes...)
* Don't remove database data if we are using a remote MySQL server.
2014-11-09 14:18:14 +01:00
Isaac Connor 60ea505139 add avdevice55 as a dependcy instead of 53, which we need for utopic 2014-10-31 14:11:34 -04:00
Isaac Connor 2f32c3895b Merge branch 'release-1.28'
Conflicts:
	web/skins/flat/js/skin.js
2014-10-22 15:10:19 -04:00
Isaac Connor e23c756ca4 Revert "replace uri_encode with uri_escape"
This reverts commit ce5396f4ea.
2014-10-21 15:17:34 -04:00
Isaac Connor ce5396f4ea replace uri_encode with uri_escape 2014-10-21 09:47:31 -04:00
Isaac Connor 693c4b2e68 Merge branch 'release-1.28' 2014-10-20 16:45:59 -04:00
Isaac Connor c4394c3c92 add liburi-encode-perl to dependencies, we use it in M8640, will likely use it elsewhere 2014-10-20 16:45:15 -04:00
Andrew Bauer 408bbbd535 Merge branch 'release-1.28' 2014-10-19 07:44:27 -05:00
Andrew Bauer fcf39fc9fa Update zoneminder.cmake.f20.spec
Fix path to README file
2014-10-18 17:36:12 -05:00
Isaac Connor 4fd2230b1d add release 1.28.0 2014-10-17 09:27:54 -04:00
Isaac Connor 61ebb56424 add 1.28.0 release 2014-10-17 09:26:59 -04:00
Isaac Connor 525d4110da bump snapshot # 2014-10-15 13:14:36 -04:00
Andrew Bauer 7dbad45e30 Update README.Fedora 2014-10-12 15:54:54 -05:00
Andrew Bauer f8cf0401ce fedora specfile changes 2014-10-05 10:27:50 -05:00
Andrew Bauer 6aac41b06f Redhat and Fedora distro folder housekeeping 2014-10-05 09:54:29 -05:00
Andrew Bauer 56fd08d6e9 Change TMPDIR default to /var/tmp, Add ZM_SOCKDIR 2014-10-05 09:42:47 -05:00
Isaac Connor fa44376291 Todays snapshot 2014-09-26 14:45:23 -04:00
Isaac Connor af536624ce add libmime-tools-perl which provides MIME::Entity which is required for email sending 2014-09-26 09:10:26 -04:00
Andrew Bauer cccd1ee14f Update README.CentOS
Change README documentation to recommend disabling selinux
2014-09-11 10:53:11 -05:00
Isaac Connor b8acac5c32 add polkit stuff required by systemd patch 2014-09-07 17:16:35 -04:00
Isaac Connor 60d7f8285c requirements to build on debian 2014-09-05 12:23:38 -04:00
Isaac Connor b5c29f30f4 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2014-09-05 11:48:44 -04:00
Isaac Connor 576aca029e sync with ubuntu version 2014-09-05 11:47:20 -04:00
Kyle Johnson 4d579e239a Merge pull request #502 from knnniggett/systemd-2
Initial systemd support.
2014-09-03 15:59:42 -04:00
Andrew Bauer 19646bd004 Merge pull request #501 from PX03AFK/opensuse
Minor corrections to README.OpenSuse
2014-08-27 06:58:04 -05:00
Isaac Connor 5bc7242582 spaces vs tabs are important in rules, debian is more picky than ubuntu
fix placement of an if to prevent accessing unmapped mem_ptr
2014-08-19 09:11:49 -04:00
Andrew Bauer 1e8e710f5a full systemd support 2014-08-10 08:47:11 -05:00
David Wilcox bde7fc8476 Minor corrections to README.OpenSuse
A few typos and a correction to a web link
2014-08-07 15:31:13 +01:00
Cosme Domínguez Díaz 786f6518fa Allow use webservers other than apache. 2014-08-04 00:23:47 +02:00
Isaac Connor f0437c6ce4 sync to ubuntu version 2014-08-01 13:53:59 -04:00
Isaac Connor f48f2dbf30 update to same as ubuntu 2014-08-01 13:28:04 -04:00
Isaac Connor 2087780ec1 tweaks to make debian build with support for mariadb, update version and start using a fourth version digit set 2014-07-29 14:43:13 -04:00
Isaac Connor b2f1c2fe68 Merge branch 'v4l_to_monitor' 2014-07-24 14:35:23 -04:00
Isaac Connor 6d2be734d2 add mariadb as a dependency option 2014-07-24 11:24:57 -04:00
Isaac Connor 864f68197d change mysql-server to Recommends 2014-07-15 14:06:32 -04:00
Isaac Connor 9385471392 move v4l_multibuffer and v4l_captures_per_frame from Config to Monitor and Local Camera 2014-07-13 16:39:27 -04:00
Isaac Connor f33b127e7e add curl dependencies 2014-07-11 10:51:12 -04:00
whopperg 4a070f93bb Update rules
There was a missing tab-indent. So dpkg-buildpackage under debian didnt work:

Error:
debian/rules:77: *** missing separator.  Stop.
2014-07-06 11:48:41 +02:00
Isaac Connor e2987067f4 add avtools instead of ffmpg 2014-06-26 13:09:52 -04:00
Isaac Connor 0f4e9eb3e4 add these dependencies, apparently they are required for sftp upload 2014-06-17 10:54:42 -04:00
Isaac Connor a73e367d5e add libav-tools as an option instead of ffmpeg 2014-06-04 11:21:43 -04:00
Kfir Itzhak 7aef6e9389 Merge pull request #387 from PX03AFK/patch-4
Update zoneminder.cmake.OS13.spec - minor corrections
2014-04-25 11:06:35 +03:00
Kfir Itzhak c64b1318db Merge pull request #389 from PX03AFK/patch-6
Update README.OpenSuse
2014-04-25 11:05:37 +03:00
David Wilcox ca2b6f36f5 Update README.OpenSuse
Additional info on amending database if using version which has /tmp as work space
2014-04-17 15:44:44 -04:00
David Wilcox 103dc0c00d Update CMakeLists.txt
Adds named variables to ease change in the future
2014-04-17 15:42:37 -04:00
David Wilcox ee7fe5bfaa Update zoneminder.cmake.OS13.spec
Correct requires for cpanm and make as they should be post
change cpanm call to be full path name
correct permissions on events, images and temp
2014-04-17 15:41:04 -04:00
David Wilcox 5cd165e9d5 Update zoneminder.tmpfiles
Incorrect directory
2014-04-03 22:16:38 -04:00
Isaac Connor 3212974bdf Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2014-03-28 10:12:39 -04:00
Andrew Bauer dda1034927 Merge pull request #362 from PX03AFK/patch-2
Update zoneminder.cmake.OS13.spec
2014-03-27 17:58:27 -05:00
David Wilcox c4645de0e6 Update zoneminder.cmake.OS13.spec 2014-03-26 23:06:42 -04:00
David Wilcox a7a5f5d543 Update README.OpenSuse 2014-03-26 23:05:20 -04:00
Isaac Connor ffa952419c Merge branch 'mysql2PDO'
Conflicts:
	distros/ubuntu1204/changelog
	scripts/ZoneMinder/lib/ZoneMinder/ConfigAdmin.pm
	web/includes/actions.php
2014-03-20 16:48:03 -04:00
Andrew Bauer e0f8583110 Merge pull request #348 from PX03AFK/opensuse
Initial upload for opensuse rpm
2014-03-19 12:09:53 -05:00
root 43b259c5cd Initial upload for opensuse rpm 2014-03-18 23:31:58 -04:00
Kyle Johnson 75d390d70a Merge branch 'release-1.27' 2014-03-15 00:51:13 -04:00
Andrew Bauer f8f0ec57dc further refinement of build requirements 2014-03-14 06:56:05 -05:00
Andrew Bauer 9f616c0d2b Make httpd both an install and build requirement 2014-03-12 06:58:53 -05:00
Andrew Bauer f9fab8d487 Need to make httpd a build requirement for cmake builds so the apache user can be properly auto-detected 2014-03-11 20:38:51 -05:00
Andrew Bauer a5d1f2afb7 Create a hardened build per Fedora packaging guidelines 2014-03-11 19:01:32 -05:00
Andrew Bauer 16c59f7cb0 Update README.Fedora
typo
2014-03-08 14:04:40 -06:00
Andrew Bauer bc4630fddc Update local_zoneminder.te
Changes based on forum feedback
2014-02-22 15:39:10 -06:00
Andrew Bauer 4f2b09a36d remove noreplace flag on zm.conf in spec file 2014-02-01 19:30:23 -06:00
Andrew Bauer d87682e5aa Edit vlc requirements in spec files 2014-02-01 17:49:04 -06:00
Andrew Bauer 647cf5b180 update Fedora & CentOS README's 2014-02-01 16:39:33 -06:00
Andrew Bauer 4088f9bc00 Add libcurl requirement to rpm spec files 2014-02-01 15:01:36 -06:00
Andrew Bauer 22b54dd046 Bump spec files revision to 1.27 2014-02-01 12:24:30 -06:00
Andrew Bauer 23144606dc Merge pull request #318 from ZoneMinder/zmcamtool
zmcamtool.pl - import and export ptz camera controls & camera presets
2014-01-29 07:34:40 -08:00
Andrew Bauer 52794e4dad Add vlc-devel to rpm build requirements 2014-01-26 14:02:06 -06:00
Andrew Bauer f00e72be1e Initial commit for new zmcamtool.pl script 2014-01-21 16:22:30 -06:00
Kyle Johnson 6534aa546c Fixed readme.debian fstab bind examples
After receiving a bug report that the examples did not work, I tried them myself.  They did not work, so I updated them to something that does work.
2014-01-02 08:24:58 -05:00
Andrew Bauer ab06878b7b Update zoneminder.cmake.f19.spec
Add BuildRequires perl(Sys::Syslog) to successfully build with mock
2014-01-01 15:03:12 -06:00
Dmitry Katsubo e745bbf14e No need to redefine RUNDIR and ZM_RUNDIR, as they already depend on DESTDIR. 2013-12-30 15:32:06 +01:00
Dmitry Katsubo 7bf0bcf4ef Updated package version (otherwise build process stops). 2013-12-30 15:31:50 +01:00
Andrew Bauer dbd2ee348e define variables to toggle x10 & ffmpeg support 2013-12-23 19:41:00 -06:00
Andrew Bauer c4d22672ac Specfile changes related to zmfix 2013-12-23 17:06:31 -06:00
nkwood f4d6d99ab2 Update zoneminder.f19.spec 2013-12-23 15:09:12 -06:00
nkwood 4a89c8d5e9 Update zoneminder.el6.spec 2013-12-23 15:08:19 -06:00
nkwood f12dd88e5d Update zoneminder.cmake.f19.spec 2013-12-23 15:06:38 -06:00
nkwood 8e7d89024f Update zoneminder.cmake.el6.spec 2013-12-23 15:05:11 -06:00
nkwood 942b9c65da Update init.d 2013-12-23 15:01:21 -06:00
nkwood 922385d761 Update init.d 2013-12-23 14:55:56 -06:00
Andrew Bauer 45385526d7 Update README.CentOS
Future versions of zmupdate will requite the Lock Tables permission.  Documentation updated accordingly.
2013-12-21 09:45:40 -06:00
Andrew Bauer db2398d1ba Update README.Fedora
Future versions of zmupdate will requite the Lock Tables permission.  Documentation updated accordingly.
2013-12-21 09:45:21 -06:00
Isaac Connor 7064141161 check for mysql existence first. 2013-12-17 13:13:45 -05:00
Andrew Bauer 43b8990d73 Update zoneminder.el6.spec
Bump revision and changelog
2013-12-16 14:46:28 -06:00
Andrew Bauer 2ca23bf07a Update zoneminder.cmake.el6.spec
Bump revision and changelog
2013-12-16 14:45:50 -06:00
Andrew Bauer 0f14db811d Update zoneminder.f19.spec
Bump revision and changelog
2013-12-16 14:45:11 -06:00
Andrew Bauer 3ce3df8645 Update zoneminder.cmake.f19.spec
Bump revision and changelog
2013-12-16 14:44:22 -06:00
Andrew Bauer 570606f01f Update zoneminder.cmake.f19.spec
Bugfix. Perl path had x86_64 hardcoded.  Use macro instead.
2013-12-16 14:43:33 -06:00
Andrew Bauer 49e4d1089a Update zoneminder.cmake.el6.spec
Bugfix. Perl path was hardcoded to x86_64. Use macro instead.
2013-12-16 14:42:22 -06:00
Andrew Bauer 8d2dac67b3 Update zoneminder.in 2013-12-14 09:14:44 -06:00
Isaac Connor 73dbe81064 update to 1.26.5 2013-12-13 13:45:55 -05:00
Andrew Bauer d0debfa450 Update zoneminder.in
The freshen database feature does not appear to be necessary and may even corrupt the dB under certain conditions. Commenting out.
2013-11-26 15:21:28 -06:00
Isaac Connor 4555a8bf92 Merge pull request #240 from ZoneMinder/postinstcleanup
remove extra stuff that I don't think we need because we are the source.
2013-11-19 08:29:51 -08:00
Isaac Connor c840f1b622 suggest mysql-server 2013-11-08 12:08:06 -05:00
Isaac Connor 6d6503c006 suggest mysql-server 2013-11-08 12:07:45 -05:00
Isaac Connor 2cd0d0b405 repeat the dbh package lines for debian as well 2013-11-08 11:25:06 -05:00
Isaac Connor 463d8a136f Merge branch 'master' into mysql2PDO
Conflicts:
	zm.conf.in
2013-11-08 11:22:09 -05:00
Isaac Connor e9c0509399 add rules for a dbg package 2013-11-08 11:09:23 -05:00
Will Scales 82a3f4622f Update zoneminder.service
Added "After=" rule to [unit] section to prevent Zoneminder from starting before mysqld.
2013-11-06 06:30:43 -06:00
Isaac Connor a1cb1e6de2 bump version # for snapshot 2013-11-04 09:56:20 -05:00
Isaac Connor 6c6da67427 Merge branch 'master' into mysql2PDO 2013-11-03 15:57:45 -05:00
Isaac Connor 7b585d182a remove extra stuff that I don't think we need because we are the source.
Also unconditionally call zmupdate.pl since it should do all the checking of versions to see if anything needs doing.
We don't need to be doing that work in a postinst bash script.
2013-11-03 15:49:37 -05:00
Kfir Itzhak a341778ca2 Merge branch 'cmakefixes'
Conflicts:
	distros/fedora/zoneminder.cmake.f19.spec
	distros/redhat/zoneminder.cmake.el6.spec
2013-10-21 16:58:04 +03:00
Andrew Bauer c25a7ffc99 Update zoneminder.cmake.f19.spec
We need to strip the prefix from perl_vendorlib before passing it to cmake
2013-10-20 12:59:31 -05:00
Andrew Bauer 183ce4b422 Update zoneminder.cmake.el6.spec
We need to strip the prefix from perl_vendorlib macro before passing it to cmake.
2013-10-20 12:44:09 -05:00
Kfir Itzhak cdd2920767 Merge pull request #217 from knnniggett/cmake_redhat
cmake support files for redhat/centos distros
2013-10-19 13:03:16 -07:00
Andrew Bauer d544a92ccb change chkconfig default 2013-10-19 13:54:25 -05:00
Andrew Bauer 60962566a5 cmake support files for redhat/centos distros 2013-10-19 13:50:59 -05:00
Andrew Bauer 72973ff7e7 Add new zoneminder cmake specfile 2013-10-19 12:14:43 -05:00
Andy Bauer b1c76ad0b6 Cmake support files for fedora distro 2013-10-19 08:49:47 -05:00
Isaac Connor 92d22b5202 Merge branch 'master' into mysql2PDO 2013-10-16 16:58:33 -04:00
Isaac Connor 9e2d7cfd24 initial convert to PDO with no testing 2013-10-16 16:07:58 -04:00
Andrew Bauer 62dbb6e5fb Update README.Fedora
typo
2013-10-14 06:47:29 -05:00
Andy Bauer 32cf3663f3 Update README.Fedora
add "sudo"
2013-10-13 08:22:16 -05:00