ACK o the debdiff in comment #7. I added a couple of small changes:
I added the following back to debian/changelog:
- debian/tests/control: add nginx-core test.
- debian/control: drop luajit from Build-Depends as it is in universe.
I also changed another reference to Debian in
** Branch linked: lp:ubuntu/vivid-proposed/nginx
--
You received this bug notification because you are a member of Ubuntu
Server Team, which is subscribed to nginx in Ubuntu.
https://bugs.launchpad.net/bugs/1388621
Title:
Please merge nginx 1.6.2-4 (main) from Debian Unstable (main)
To
This bug was fixed in the package nginx - 1.6.2-4ubuntu1
---
nginx (1.6.2-4ubuntu1) vivid; urgency=medium
* Merge from Debian. Remaining changes: (LP: #1388621)
- debian/patches/ubuntu-branding.patch: add Ubuntu branding
(refreshed).
- debian/rules: Drop from -O3 to
* Provide a new, debian specific, default landing page.
Does this need making into an Ubuntu-specific page like in bug 1288690?
--
You received this bug notification because you are a member of Ubuntu
Server Team, which is subscribed to nginx in Ubuntu.
Doh, missed that first time round, that's what I get for working while
tired.
We should probably change it so it's Ubuntu specific, yes, as we already
change the versioning to have Ubuntu branding.
I'll redo the debdiffs this afternoon with such a change.
--
You received this bug notification
** Patch added: Merge Debdiff for 1.6.4-4ubuntu1, against Debian Unstable
https://bugs.launchpad.net/ubuntu/+source/nginx/+bug/1388621/+attachment/4253901/+files/nginx_1.6.2-4_merge_debdiff_against_Debian_Unstable.debdiff
--
You received this bug notification because you are a member of
** Patch removed: Debdiff for the merge, against Debian 1.6.2-4.
https://bugs.launchpad.net/ubuntu/+source/nginx/+bug/1388621/+attachment/4251551/+files/nginx-1.6.2-4_merge_compared_to_debian.debdiff
** Patch removed: Debdiff for the merge, against Ubuntu 1.6.2-1ubuntu1.1
Debdiffs updated.
I also caught a lingering reference to nginx-naxsi in the debian/control
file and removed that reference. Apparently it didn't get caught by the
merge tool, and I didn't see it first time round.
--
You received this bug notification because you are a member of Ubuntu
Server
** Patch added: Debdiff for the merge, against Debian 1.6.2-4.
https://bugs.launchpad.net/ubuntu/+source/nginx/+bug/1388621/+attachment/4251551/+files/nginx-1.6.2-4_merge_compared_to_debian.debdiff
--
You received this bug notification because you are a member of Ubuntu
Server Team, which is
** Changed in: nginx (Ubuntu)
Status: New = Confirmed
--
You received this bug notification because you are a member of Ubuntu
Server Team, which is subscribed to nginx in Ubuntu.
https://bugs.launchpad.net/bugs/1388621
Title:
Please merge nginx 1.6.2-4 (main) from Debian Unstable
10 matches
Mail list logo
