Merge branch 'master' of github.com:ZoneMinder/ZoneMinder

pull/195/merge
Isaac Connor 2013-10-04 11:56:46 -04:00
commit 4b1ee3cae7
2 changed files with 4 additions and 4 deletions

View File

@ -11,11 +11,11 @@ ZoneMinder is an integrated set of applications which provide a complete surveil
## Requirements
If you are installing from a package, that package should provide all of the needed core components.
If you are installing ZoneMinder from a package, that package should provide all of the needed core components.
### Packages
If you are compiling from source, the below list contains the packages needed to get ZoneMinder built:
If you are compiling ZoneMinder from source, the below list contains the packages needed to get ZoneMinder built:
#### Debian / Ubuntu

View File

@ -30,7 +30,7 @@ Patch1: zoneminder-1.26.3-dbinstall.patch
Patch2: zoneminder-1.24.3-runlevel.patch
#Patch3: zoneminder-1.26.3-noffmpeg.patch
Patch10: zoneminder-1.24.4-installfix.patch
Patch11: zoneminder-1.26.3-gcc48.patch
#Patch11: zoneminder-1.26.3-gcc48.patch
#Patch12: zoneminder-1.25.0-gcrypt.patch
#Patch13: zoneminder-1.25.0-kernel35.patch
#Patch14: zoneminder-1.26.3-ffmpeg.patch
@ -87,7 +87,7 @@ popd
%patch2 -p0 -b .runlevel
#%patch3 -p0 -b .noffmpeg
%patch10 -p0 -b .installfix
%patch11 -p0 -b .gcc47
#%patch11 -p0 -b .gcc47
#%patch12 -p0 -b .gcrypt
#%patch13 -p0 -b .kernel35
#%patch14 -p0 -b .ffmpeg