Please merge nginx 1.6.2-4 (main) from Debian Unstable (main)
Affects | Status | Importance | Assigned to | Milestone | |
---|---|---|---|---|---|
nginx (Ubuntu) |
Fix Released
|
Wishlist
|
Unassigned |
Bug Description
Debian Unstable has nginx 1.6.2-4, which differs from the version in Vivid currently because some of the included modules have been updated, and configurations have been changed. As well, the nginx-naxsi packages have all been dropped from Debian and should be done here as well.
Attached is a debdiff for this merge, which hopefully will work. (I created it using the UDD method of merging, built the package, and ran a debdiff command to generate the diff.) Note that this is my first merge that I think will work, so please give me any pointers if you believe it is wrong.
Below are the debian changelog entries since 1.6.2-1ubuntu1.1. Note this does not include the changelog entry I added in the debdiff for the merge.
nginx (1.6.2-4) unstable; urgency=medium
[ Christos Trochalakis ]
* debian/
+ Upgrade v0.2.17-7-g24202b4 -> v0.2.19
* debian/
+ Upgrade v0.51 -> v0.56
* debian/
+ Upgrade v0.9.0-0-ga788dea -> 0.9.1
* debian/
+ Upgrade v0.3.3 -> v0.3.4
* debian/copyright:
+ Rewrite copyright file fixing various issues.
* debian/
+ Switch postrotate to the initscript's rotate command.
-- Christos Trochalakis <email address hidden> Sun, 19 Oct 2014 08:23:33 +0300
nginx (1.6.2-3) unstable; urgency=medium
[ Christos Trochalakis ]
* Change the default document root to /var/www/html according to debian
policy 3.9.6.0. (Closes: #730382)
* Provide a new, debian specific, default landing page.
* debian/
+ Graceful stopping of nginx was not handled correctly with systemd.
* debian/
+ Gracefully stop nginx by default, we are switcing to a configurable
STOP/
service file. (Closes: #762708)
* debian/conf:
+ Introduce a `snippets/
php configuration that can be included when needed. (Closes: #762491)
+ Introduce a `snippets/
using the certs installed by the ssl-cert package.
+ Suggest disabling SSLv3 in default site with a ref to POODLE.
* debian/control:
+ nginx-common now suggests ssl-cert.
-- Christos Trochalakis <email address hidden> Thu, 16 Oct 2014 13:34:29 +0300
nginx (1.6.2-2) unstable; urgency=medium
[ Christos Trochalakis ]
* Drop nginx-naxsi, nginx-naxsi-dbg, nginx-naxsi-ui packages.
(Closes: #746199, #737146, #712445)
* debian/
+ Remove relic passenger stanga.
-- Christos Trochalakis <email address hidden> Fri, 26 Sep 2014 11:06:47 +0300
Related branches
Changed in nginx (Ubuntu): | |
importance: | Undecided → Wishlist |
status: | New → Confirmed |
> * Provide a new, debian specific, default landing page.
Does this need making into an Ubuntu-specific page like in bug 1288690?