add mp4 and x264 to ubuntu1204 and remove duplicated mp4.x264 lines from ubuntu1604.

pull/3038/head
Isaac Connor 2017-03-11 10:41:39 -05:00
parent 14c4a156c6
commit e04cc1be05
2 changed files with 4 additions and 3 deletions

View File

@ -5,6 +5,7 @@ Maintainer: Dmitry Smirnov <onlyjob@debian.org>
Uploaders: Vagrant Cascadian <vagrant@debian.org>
Build-Depends: debhelper (>= 9), python-sphinx | python3-sphinx, apache2-dev, dh-linktree
,cmake
,libx264-dev, libmp4v2-dev
,libavcodec-dev, libavformat-dev (>= 3:0.svn20090204), libswscale-dev (>= 3:0.svn20090204), libavutil-dev, libavdevice-dev
,libboost1.55-dev
,libbz2-dev
@ -35,6 +36,7 @@ Package: zoneminder
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}
,javascript-common
,libmp4v2-2, libx264-148
,libav-tools|ffmpeg
,libdate-manip-perl
,libdbd-mysql-perl

View File

@ -7,7 +7,7 @@ Build-Depends: debhelper (>= 9), dh-systemd, python-sphinx | python3-sphinx, apa
,cmake
,libx264-dev, libmp4v2-dev
,libavcodec-dev, libavformat-dev, libswscale-dev
, libavutil-dev, libavdevice-dev
,libavutil-dev, libavdevice-dev
,libboost-dev
,libbz2-dev
,libgcrypt-dev
@ -25,8 +25,6 @@ Build-Depends: debhelper (>= 9), dh-systemd, python-sphinx | python3-sphinx, apa
,libsys-mmap-perl [!hurd-any]
,libwww-perl
,libdata-uuid-perl
,libx264-dev
,libmp4v2-dev
# Unbundled (dh_linktree):
,libjs-jquery
,libjs-mootools
@ -39,6 +37,7 @@ Package: zoneminder
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}
,javascript-common
,libmp4v2-2, libx264-148
,ffmpeg | libav-tools
,libdate-manip-perl, libmime-lite-perl, libmime-tools-perl
,libdbd-mysql-perl