Re-merge nginx for kinetic
Affects | Status | Importance | Assigned to | Milestone | |
---|---|---|---|---|---|
nginx (Ubuntu) |
Fix Committed
|
Medium
|
Bryce Harrington |
Bug Description
We've already merged nginx once this cycle, but Debian has packaged a new upstream, so this lets us pick that up. Note that since we drop lua, a number of the packaging changes in Debian don't apply for us.
nginx (1.22.0-1) unstable; urgency=medium
[ Thomas Ward ]
* New upstream release (1.22.0)
* Additional changes:
* d/conf/mime.types: Fix a typo in font/woff2 extension in
mime.types. (Closes: #1010798)
* d/upstream/
in upstream (Konstantin Pavlov <email address hidden>) during
upstream merge/import by Thomas Ward, additional signing key
was added to the keyring while keeping Maxim's key in signing
keys as well.
* d/copyright: Updated copyright for src/core/
and debian/
public-domain (Closes: #1011936)
* d/control: Use libluajit-5.1-dev for s390x.
Due to src:luajit2 landing in Unstable, superseding src:luajit,
and due to luajit2 having s390x support, we can use s390x now
with luajit instead of standard Lua.
Thanks to Paul Gevers for the heads up on luajit2 supporting s390x.
* d/control: Use liblua for ppc64el - src:luajit2 is still not ppc64el
stable and there seems to be nobody willing to support it. (Closes: 1013807)
[ Jan Mojžíš ]
* d/patches/
release
* d/copyright: bump nginx copyright years
* d/copyright: added copyright for src/stream/
* d/copyright: removed copyright for src/http/
* d/control: bump Standards-Version to 4.6.1, no changes
[ Bastian Germann ]
* d/copyright: Update copyright for d/debhelper/*
[ Miao Wang ]
* dh_nginx: support auto generating module config files
* adding a new nginx-dev package including necessary headers and debhelper
scripts to build and package a 3rd party module. (Closes: 985133)
* d/p/0002-
removed, because feature already implemented with --with-compat configure
option since 1.11.5
-- Thomas Ward <email address hidden> Tue, 10 May 2022 12:08:02 -0400
Related branches
- git-ubuntu bot: Approve
- Andreas Hasenack (community): Approve
- Canonical Server Reporter: Pending requested
- Canonical Server: Pending requested
-
Diff: 186598 lines (+1665/-76) (has conflicts)10 files modifieddebian/changelog (+1586/-0)
debian/control (+24/-33)
debian/copyright (+0/-5)
debian/modules/control (+0/-8)
debian/patches/series (+9/-0)
debian/patches/ubuntu-branding.patch (+28/-0)
debian/rules (+2/-4)
debian/tests/branding (+12/-0)
debian/tests/control (+4/-8)
dev/null (+0/-18)
Changed in nginx (Ubuntu): | |
assignee: | nobody → Bryce Harrington (bryce) |
importance: | Undecided → Medium |
status: | New → Fix Committed |
tags: | added: needs-merge |