lp://staging/ubuntu/trusty-proposed/nginx

Branch merges

Propose for merging

No branches dependent on this one.

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

77. By Thomas Ward on 2015-07-29

debian/nginx-common.nginx.init: Fix pidfile extraction, due to multiple
failure cases, using Debian's solution. (LP: #1314740)

76. By Thomas Ward on 2015-02-09

* d/modules/nginx-http-push: Apply upstream bugfix. (LP: #1216817)
  * src/ngx_http_push_module_setup.c: Modify push module code with
    upstream changes to fix an issue with initialization when using
    `fastcgi_cache` or `proxy_cache`.
  * tests/nginx-cachemanager.conf: (new file) Include upstream change
    of adding an nginx-cachemanager.conf file to the tests.

75. By Thomas Ward on 2014-03-10

* Add new binary package for main, nginx-core, which contains only
  source-tarball-included modules and no third-party modules.
* Changes to debian/ directory:
  - control:
    + Add entry for nginx-core and nginx-core-dbg.
  - rules:
    + Add nginx-core flavor to the build rules.
  - nginx-core.*: Add new packaging files for nginx-core based on
    the packaging files for nginx-full.
* The above changes satisfy the requirements for main (LP: #1262710)

74. By Adam Conrad on 2014-03-09

debian/rules: Drop from -O3 to -O2 to work around a build failure.

73. By Adam Conrad on 2014-03-09

* Merge from Debian unstable. Remaining changes:
  - debian/patches/ubuntu-branding.patch: Add Ubuntu branding.

72. By Colin Watson on 2014-02-15

* Resynchronise with Debian (LP: #1280511). Remaining changes:
  - debian/patches/ubuntu-branding.patch:
    + Add Ubuntu branding to server_tokens.

71. By Colin Watson on 2014-01-08

* Resynchronise with Debian. Remaining changes:
  - debian/patches/ubuntu-branding.patch:
    + Add Ubuntu branding to server_tokens.

70. By Colin Watson on 2013-12-28

* Resynchronise with Debian. Remaining changes:
  - debian/patches/ubuntu-branding.patch:
    + Add Ubuntu branding to server_tokens.

69. By Colin Watson on 2013-11-22

* Resynchronise with Debian (LP: #1253691). Remaining changes:
  - debian/patches/ubuntu-branding.patch:
    + Add Ubuntu branding to server_tokens.

68. By Colin Watson on 2013-10-21

* Resynchronise with Debian. Remaining changes:
  - debian/patches/ubuntu-branding.patch:
    + Add Ubuntu branding to server_tokens.