« back to all changes in this revision
Viewing changes to debian/conf/nginx.conf
- Committer: Package Import Robot
- Date: 2014-12-06 13:06:55 UTC
- mfrom: (4.3.22 sid)
- Revision ID: package-import@ubuntu.com-20141206130655-kr9fuq8st85n3zrk
* Merge from Debian. Remaining changes: (LP: #1399967)
- debian/patches/ubuntu-branding.patch: add Ubuntu branding (refreshed)
- debian/rules: Drop from -O3 to -O2 to work around a build failure.
- d/{control,rules,nginx-core.*}: add new binary package for main,
nginx-core, which contains only source-tarball-included modules
and no third-party modules.
- debian/tests/control: add nginx-core test.
- debian/control: drop luajit from Build-Depends as it is in universe.
- debian/patches/ubuntu-branding.patch: add Ubuntu branding (refreshed)
- debian/rules: Drop from -O3 to -O2 to work around a build failure.
- d/{control,rules,nginx-core.*}: add new binary package for main,
nginx-core, which contains only source-tarball-included modules
and no third-party modules.
- debian/tests/control: add nginx-core test.
- debian/control: drop luajit from Build-Depends as it is in universe.
- files added:
- debian/nginx-common.README.Debian
- files removed:
- debian/README.Debian
- files modified:
- debian/changelog
added
removed
debian/conf/nginx.conf
