ubuntu/+source/nginx:applied/ubuntu/wily-proposed

Last commit made on 2015-07-22
Get this branch:
git clone -b applied/ubuntu/wily-proposed 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:
applied/ubuntu/wily-proposed
Repository:
lp:ubuntu/+source/nginx

Recent commits

237395e... by Thomas Ward on 2015-07-22

Import patches-applied version 1.9.3-1ubuntu1 to applied/ubuntu/wily-proposed

Imported using git-ubuntu import.

Changelog parent: 92f4e7baefa9dbe7b14727847a12e98e1d225601
Unapplied parent: 4ad9003ac2ea6b66fe934db1c22ee63b934b651f

New changelog entries:
  * Merge from Debian. Remaining changes: (LP: #1476811)
    - 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.
    - debian/apport/source_nginx.py: Add apport hooks for additional bug
      information gathering.
    - debian/nginx-common.install: Add install rule for apport hooks.

4ad9003... by Thomas Ward on 2015-07-22

Add Ubuntu token to NGINX_VER

Gbp-Pq: ubuntu-branding.patch.

39c31dc... by Thomas Ward on 2015-07-22

Use linker flags from environment for perl (dpkg-buildflags).

Gbp-Pq: perl-use-dpkg-buildflags.patch.

92ee203... by Thomas Ward on 2015-07-22

Import patches-unapplied version 1.9.3-1ubuntu1 to ubuntu/wily-proposed

Imported using git-ubuntu import.

Changelog parent: 3556730aa419a7ac8455a93cf16c99746a55fafc

New changelog entries:
  * Merge from Debian. Remaining changes: (LP: #1476811)
    - 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.
    - debian/apport/source_nginx.py: Add apport hooks for additional bug
      information gathering.
    - debian/nginx-common.install: Add install rule for apport hooks.

92f4e7b... by ctrochalakis on 2015-07-14

Import patches-applied version 1.9.3-1 to applied/debian/sid

Imported using git-ubuntu import.

Changelog parent: a55273b0f7f7a64e133e66a5165e513e121c5819
Unapplied parent: c7f152501a84c82e6b512475cb65e966eed8cc1a

New changelog entries:
  [ Christos Trochalakis]
  * New upstream Release. (Closes: #789924)
  * debian/control:
    + Remove XS-Testsuite header, it is now automatically added when
      `debian/tests/control` is present.
  * debian/modules/nginx-lua:
    + Update nginx-lua to v0.9.16 and drop our backported patches.
  * debian/conf/*:
    + Add REQUEST_SCHEME to fcgi, wsgi and scgi configs (sync with upstream).

3556730... by ctrochalakis on 2015-07-14

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

Imported using git-ubuntu import.

Changelog parent: b640c24540634ab74e91242fef01bb1f1e4f12bc

New changelog entries:
  [ Christos Trochalakis]
  * New upstream Release. (Closes: #789924)
  * debian/control:
    + Remove XS-Testsuite header, it is now automatically added when
      `debian/tests/control` is present.
  * debian/modules/nginx-lua:
    + Update nginx-lua to v0.9.16 and drop our backported patches.
  * debian/conf/*:
    + Add REQUEST_SCHEME to fcgi, wsgi and scgi configs (sync with upstream).

c7f1525... by ctrochalakis on 2015-07-14

Use linker flags from environment for perl (dpkg-buildflags).

Gbp-Pq: perl-use-dpkg-buildflags.patch.

a55273b... by ctrochalakis on 2015-06-22

Import patches-applied version 1.9.2-1 to applied/debian/sid

Imported using git-ubuntu import.

Changelog parent: fae90cd6d93fd549a4aac31849326234888aeac1
Unapplied parent: db2bd4498ad96ebeda05b281da6e4fcd3e5ed3dc

New changelog entries:
  [ Michael Lustfield ]
  * debian/nginx-common.nginx.init:
    + Init script now returns the proper exit status. (Closes: #788573)
    + Cleaned up the init script to have consistent naming/structure.
  [ Christos Trochalakis ]
  * New upstream Release.
  * debian/rules:
    + Add stream module to nginx-full & nginx-extras.
    + Add thread pool support to nginx-full & nginx-extras.
  * debian/modules/nginx-lua:
    + Backport upstream's 9531e5e7 fixing build failure when thread pool
      support is enabled.

b640c24... by ctrochalakis on 2015-06-22

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

Imported using git-ubuntu import.

Changelog parent: 9db1698ec3d60e85fc69413ac2170c0f14316e9c

New changelog entries:
  [ Michael Lustfield ]
  * debian/nginx-common.nginx.init:
    + Init script now returns the proper exit status. (Closes: #788573)
    + Cleaned up the init script to have consistent naming/structure.
  [ Christos Trochalakis ]
  * New upstream Release.
  * debian/rules:
    + Add stream module to nginx-full & nginx-extras.
    + Add thread pool support to nginx-full & nginx-extras.
  * debian/modules/nginx-lua:
    + Backport upstream's 9531e5e7 fixing build failure when thread pool
      support is enabled.

db2bd44... by ctrochalakis on 2015-06-22

Use linker flags from environment for perl (dpkg-buildflags).

Gbp-Pq: perl-use-dpkg-buildflags.patch.