ubuntu/+source/nginx:ubuntu/xenial

Last commit made on 2016-04-20
Get this branch:
git clone -b ubuntu/xenial https://git.launchpad.net/ubuntu/+source/nginx
Members of Ubuntu Server Dev import team can upload to this branch. Log in for directions.

Branch merges

Branch information

Name:
ubuntu/xenial
Repository:
lp:ubuntu/+source/nginx

Recent commits

b100a2e... by Thomas Ward on 2016-04-18

Import patches-unapplied version 1.9.15-0ubuntu1 to ubuntu/xenial-proposed

Imported using git-ubuntu import.

Changelog parent: 305f0eaded9556098a8259dea8c55d17951adc5f

New changelog entries:
  * New upstream release (1.9.15) - full changelog available at upstream
    website - http://nginx.org/en/CHANGES (LP: #1572223)
  * All Ubuntu specific changes from 1.1.14-0ubuntu1, except noted below,
    remain included in this upload.
  * Remaining changes:
    * debian/control: Re-add libluajit-5.1-dev build-dependency, as it will
      only affect nginx-extras which is in Universe. This reduces the merge
      delta between Ubuntu and Debian slightly, as well. (LP: #1571444)
    * debian/patches/ubuntu-branding.patch: Refresh Ubuntu Branding patch.

305f0ea... by Thomas Ward on 2016-04-01

Import patches-unapplied version 1.9.14-0ubuntu1 to ubuntu/xenial-proposed

Imported using git-ubuntu import.

Changelog parent: 65b6f3e0006bd3a47c38c9675e46d24a11de9b96

New changelog entries:
  * New upstream release (1.9.14) - full changelog available at upstream
    website - htp://nginx.org/en/CHANGES (LP: #1566392)
  * All Ubuntu specific changes from 1.9.13-0ubuntu1, except noted below,
    remain included in this upload.
  * Remaining changes:
    * Enable HTTP/2 module for nginx-full, nginx-extras, and nginx-core
      (LP: #1565043)
      - debian/rules: Enable HTTP/2 module building in flavor rules
      - debian/control: Add HTTP/2 module to package descriptions.
    * debian/patches/ubuntu-branding.patch: Refresh Ubuntu Branding patch.

65b6f3e... by Thomas Ward on 2016-03-29

Import patches-unapplied version 1.9.13-0ubuntu1 to ubuntu/xenial-proposed

Imported using git-ubuntu import.

Changelog parent: db73e5de28439198354f767e312f29f05b61442e

New changelog entries:
  * New upstream release (1.9.13) - full changelog available at upstream
    website - http://nginx.org/en/CHANGES (LP: #1563393)
  * All Ubuntu specific changes from 1.9.12-0ubuntu1 remain included in
    this upload.
  * debian/patches/ubuntu-branding.patch: Refresh Ubuntu Branding patch.

db73e5d... by Thomas Ward on 2016-02-24

Import patches-unapplied version 1.9.12-0ubuntu1 to ubuntu/xenial-proposed

Imported using git-ubuntu import.

Changelog parent: 1705dc8ee5fc413d15553125e0772c3931d4a7bb

New changelog entries:
  * New upstream release (1.9.12) - full changelog available at upstream
    website - http://nginx.org/en/CHANGES (LP: #1549347)
  * All Ubuntu specific changes from 1.9.11-0ubuntu1 and -0ubuntu2 remain
    included in this upload.

1705dc8... by Thomas Ward on 2016-02-19

Import patches-unapplied version 1.9.11-0ubuntu2 to ubuntu/xenial-proposed

Imported using git-ubuntu import.

Changelog parent: 2cddb0a9f26926a18bb319a333451e9ff6b064bd

New changelog entries:
  * This is a bug-fix only upload and does not include any new changes to
    features.
  * debian/conf/sites-available/default: Modify PHP 'default example' settings
    to account for php5 being replaced with php7.0 in Xenial. Also adapt the
    UNIX socket path for php7.0-fpm to be the one used by default in Xenial.
    (LP: #1547642)

2cddb0a... by Thomas Ward on 2016-02-09

Import patches-unapplied version 1.9.11-0ubuntu1 to ubuntu/xenial-proposed

Imported using git-ubuntu import.

Changelog parent: 926ec583ed3bfabc5aa00ec9b5f309b34af0cee9

New changelog entries:
  * New upstream release (1.9.11) - see http://nginx.org/en/CHANGES for
    full changelog.
  * Ubuntu-specific changes from the 1.9.10 merge remain included here.
  * Additional changes:
    - debian/modules/nginx-lua: Apply upstream patch to fix FTBFS issue

926ec58... by Thomas Ward on 2016-01-27

Import patches-unapplied version 1.9.10-1ubuntu1 to ubuntu/xenial-proposed

Imported using git-ubuntu import.

Changelog parent: be0d50b187517c8eb3a5dd31b6baa3358f38e3c1

New changelog entries:
  * Merge from Debian unstable. Remaining changes: (LP: #1538677)
    - debian/patches/ubuntu-branding.patch: add Ubuntu branding (refreshed)
    - 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.
      - Remove HTTP/2 references in package descriptions, per Ubuntu
        Security Team mandate to disable HTTP/2 support.
    - debian/rules:
      - Disable HTTP/2 module support in all flavors, per Ubuntu Security
        Team mandate.
    - debian/apport/source_nginx.py: Add apport hooks for additional bug
      information gathering.
    - debian/nginx-common.install: Add install rule for apport hooks.
  * Additional bugs fixed by this merge:
    - nginx-common should not depend on python (LP: #1480513)

be0d50b... by ctrochalakis on 2016-01-26

Import patches-unapplied version 1.9.10-1 to debian/sid

Imported using git-ubuntu import.

Changelog parent: 5ab0e9b1096c23c6d97a8dccd1a64347da7a1d65

New changelog entries:
  [ Christos Trochalakis ]
  * New upstream release (1.9.10) (Closes: #812806)
  * debian/control:
    + Drop python dependency from nginx-common. (Closes: #808699)

5ab0e9b... by ctrochalakis on 2016-01-14

Import patches-unapplied version 1.9.9-1 to debian/sid

Imported using git-ubuntu import.

Changelog parent: 71f538cd83c2ce68ff7c4dfe6d0ddd705cf93b2e

New changelog entries:
  [ Michael Lustfield ]
  * debian/nginx-common.nginx.logrotate:
    + Switching logrotate to 14 days. (Closes: #805322)
  [ Christos Trochalakis ]
  * New upstream release (1.9.9).
  * debian/modules/nginx-lua:
    + Update nginx-lua to v0.10.0.

71f538c... by ctrochalakis on 2015-11-13

Import patches-unapplied version 1.9.6-2 to debian/sid

Imported using git-ubuntu import.

Changelog parent: 9a4be2fbec1fcb8b2e1706a66e0862bda72a8d77

New changelog entries:
  [ Christos Trochalakis]
  * debian/modules/nginx-lua:
    + Update nginx-lua to v0.9.19 fixing HTTP/2 compatibility.