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

Merge branch 'debian_package_split' into plugin_support 

Conflicts:
	distros/debian8/patches/series
This commit is contained in:
Emmanuel Papin 2015-01-13 01:11:04 +01:00
parent 77138c48d2 47ef5c999f
commit ce90a37bb8
3 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
distros/debian8/control
View File

@ -71,7 +71,7 @@ Depends: libzoneminder-perl (= ${source:Version}),
libdbi-perl, libmodule-load-conditional-perl, libmime-lite-perl, libdbi-perl, libmodule-load-conditional-perl, libmime-lite-perl,
libmime-tools-perl, libnet-sftp-foreign-perl, libphp-serialization-perl, libmime-tools-perl, libnet-sftp-foreign-perl, libphp-serialization-perl,
debconf, ffmpeg | libav-tools, rsyslog | system-log-daemon, netpbm, zip, debconf, ffmpeg | libav-tools, rsyslog | system-log-daemon, netpbm, zip,
policykit-1 policykit-1, apache2
Description: Core binaries and perl scripts for ZoneMinder Description: Core binaries and perl scripts for ZoneMinder
ZoneMinder is a video camera security and surveillance solution. ZoneMinder is a video camera security and surveillance solution.
. .

0
distros/debian8/patches/02_service-file-name.diff → distros/debian8/patches/01_service-file-name.diff
View File

2
distros/debian8/patches/series
View File

@ -1 +1 @@
02_service-file-name.diff 01_service-file-name.diff