~ubuntu-branches/ubuntu/vivid/nginx/vivid-proposed

Viewing all changes in revision 80.

  • Committer: Package Import Robot
  • Author(s): Thomas Ward
  • Date: 2014-11-05 10:05:07 UTC
  • mfrom: (4.3.21 sid)
  • Revision ID: package-import@ubuntu.com-20141105100507-gpxwcq9bdn2g606u
Tags: 1.6.2-4ubuntu1
* Merge from Debian. Remaining changes: (LP: #1388621)
  - 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/control:
  * Remove nginx-naxsi* from nginx-core and related
    package stanzas, as the naxsi packages have all been dropped.
  * Remove reference to nginx-naxsi from nginx metapackage description
* debian/index.html: Modify included index.html file to have Ubuntu
  branding, Ubuntu bug reporting tool references, and a link to the
  Launchpad bugs page for the nginx package.

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: