Merge ~mitchdz/ubuntu/+source/apache2:mitch/mantic-add-ubuntu-logo into ubuntu/+source/apache2:ubuntu/mantic-devel

[Mitchell Dzurick]

PPA - https://launchpad.net/~mitchdz/+archive/ubuntu/apache2-lp1947459-missing-ubuntu-logo

[Sergio Durigan Junior (sergiodj)]

Thanks, Mitchell.

As we've discussed, this LGTM. However, because it's a low priority bug, I will stage the SRU.

Uploaded:

$ dput ssh-ubuntu apache2_2.4.57-2ubuntu2.23.10.1_source.changes
D: Setting host argument.
Checking signature on .changes
gpg: /home/sergio/work/apache2/apache2_2.4.57-2ubuntu2.23.10.1_source.changes: Valid signature from 106DA1C8C3CBBF14
Checking signature on .dsc
gpg: /home/sergio/work/apache2/apache2_2.4.57-2ubuntu2.23.10.1.dsc: Valid signature from 106DA1C8C3CBBF14
Uploading to ssh-ubuntu (via sftp to upload.ubuntu.com):
  Uploading apache2_2.4.57-2ubuntu2.23.10.1.dsc: done.
  Uploading apache2_2.4.57-2ubuntu2.23.10.1.debian.tar.xz: done.
  Uploading apache2_2.4.57-2ubuntu2.23.10.1_source.buildinfo: done.
  Uploading apache2_2.4.57-2ubuntu2.23.10.1_source.changes: done.
Successfully uploaded packages.

review: Approve

[Andreas Hasenack (ahasenack)]

This upload was rejected[1] on 2023-11-23

Rejected on 2023-11-23 by Andreas Hasenack
You have to rebase on top of the latest update, which is currently 2.4.57-2ubuntu2.1

Marking this MP as "needs fixing" due to the need to rebase.

1. https://launchpad.net/ubuntu/mantic/+queue?queue_state=4&queue_text=apache2

review: Needs Fixing

[Mitchell Dzurick (mitchdz)]

Whoops this slipped past me while I was on break. Thanks for the update Andreas, I'll rebase it soon.

[Mitchell Dzurick (mitchdz)]

This MP is no longer valid. Keeping it for posterity. The new active MP is https://code.launchpad.net/~mitchdz/ubuntu/+source/apache2/+git/apache2/+merge/458256

Unmerged commits

9acdebe... by Mitchell Dzurick on 2023-11-13

changelog

dceebee... by Mitchell Dzurick on 2023-11-13

d/icons/ubuntu-logo.png: add Ubuntu image

diff --git a/debian/changelog b/debian/changelog
index 118f242..279ef0c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+apache2 (2.4.57-2ubuntu2.23.10.1) mantic; urgency=medium
+
+  * d/icons/ubuntu-logo.png: add Ubuntu image for welcome page (LP: #1947459).
+
+ -- Mitchell Dzurick <[e-mail]>  Mon, 13 Nov 2023 07:43:48 -0700
+
 apache2 (2.4.57-2ubuntu2) mantic; urgency=medium
 
   * d/control: Upgrade lua build dependency to 5.4
diff --git a/debian/icons/ubuntu-logo.png b/debian/icons/ubuntu-logo.png
new file mode 100644
index 0000000..eee686c
Binary files /dev/null and b/debian/icons/ubuntu-logo.png differ