diff options
| author | James Meyer <james.meyer@operamail.com> | 2009-08-01 03:14:54 (GMT) |
|---|---|---|
| committer | James Meyer <james.meyer@operamail.com> | 2009-08-01 03:14:54 (GMT) |
| commit | 7b35632e80f168d8c5f2220bf610ee7e24b81270 (patch) | |
| tree | 8facf3fa565911f056a08e38f6a5eed0f756f9c6 /abs/core-testing/lighttpd | |
| parent | 7e10f51870aa10be3b35d7912a7b54e30f608bb8 (diff) | |
| parent | 7accc0f042acdfdca9f067b1d4011d6ac01b1a74 (diff) | |
| download | linhes_pkgbuild-7b35632e80f168d8c5f2220bf610ee7e24b81270.zip linhes_pkgbuild-7b35632e80f168d8c5f2220bf610ee7e24b81270.tar.gz linhes_pkgbuild-7b35632e80f168d8c5f2220bf610ee7e24b81270.tar.bz2 | |
Merge branch 'HEAD' of ssh://jams@knoppmyth.net/mount/repository/LinHES-PKGBUILD
Conflicts:
abs/core-testing/LinHES-config/PKGBUILD
Diffstat (limited to 'abs/core-testing/lighttpd')
| -rw-r--r-- | abs/core-testing/lighttpd/PKGBUILD | 5 | ||||
| -rw-r--r-- | abs/core-testing/lighttpd/lighttpd.conf | 1 |
2 files changed, 3 insertions, 3 deletions
diff --git a/abs/core-testing/lighttpd/PKGBUILD b/abs/core-testing/lighttpd/PKGBUILD index ae192bb..d0811ae 100644 --- a/abs/core-testing/lighttpd/PKGBUILD +++ b/abs/core-testing/lighttpd/PKGBUILD @@ -3,16 +3,15 @@ pkgname=lighttpd pkgver=1.4.20 -pkgrel=33 +pkgrel=35 pkgdesc='a secure, fast, compliant and very flexible web-server' license=('custom') arch=('i686' 'x86_64') url="http://www.lighttpd.net/" -depends=('pcre' 'openssl' 'zlib' 'bzip2' 'attr' 'libldap') +depends=('pcre' 'openssl' 'zlib' 'bzip2' 'attr' 'libldap' 'lua') makedepends=('fcgi' 'libmysqlclient' 'lua' 'libxml2' 'e2fsprogs' 'sqlite3' 'gdbm' 'pkgconfig') optdepends=('libxml2: mod_webdav' \ 'e2fsprogs: mod_webdav' \ - 'lua: mod_cml/mod_magnet' \ 'libmysqlclient: mod_mysql_vhost' \ 'sqlite3: mod_webdav' \ 'gdbm: mod_trigger_b4_dl' \ diff --git a/abs/core-testing/lighttpd/lighttpd.conf b/abs/core-testing/lighttpd/lighttpd.conf index e2c60da..7305133 100644 --- a/abs/core-testing/lighttpd/lighttpd.conf +++ b/abs/core-testing/lighttpd/lighttpd.conf @@ -94,6 +94,7 @@ mimetype.assign = ( ".xml" => "text/xml", ".mpeg" => "video/mpeg", ".mpg" => "video/mpeg", + ".mp4" => "video/quicktime", ".mov" => "video/quicktime", ".qt" => "video/quicktime", ".avi" => "video/x-msvideo", |