Merge branch 'debian_package_split' into plugin_support
Conflicts: distros/debian8/patches/series
This commit is contained in:
commit
ce90a37bb8
|
@ -71,7 +71,7 @@ Depends: libzoneminder-perl (= ${source:Version}),
|
|||
libdbi-perl, libmodule-load-conditional-perl, libmime-lite-perl,
|
||||
libmime-tools-perl, libnet-sftp-foreign-perl, libphp-serialization-perl,
|
||||
debconf, ffmpeg | libav-tools, rsyslog | system-log-daemon, netpbm, zip,
|
||||
policykit-1
|
||||
policykit-1, apache2
|
||||
Description: Core binaries and perl scripts for ZoneMinder
|
||||
ZoneMinder is a video camera security and surveillance solution.
|
||||
.
|
||||
|
|
|
@ -1 +1 @@
|
|||
02_service-file-name.diff
|
||||
01_service-file-name.diff
|
||||
|
|
Loading…
Reference in New Issue