Thanks for the review. I find it convenient to use empty commits for the dropped changes (just not when I forget to use --keep-empty when rebasing ;).
I added one more "added change" on top of 1b9f272ef961a00a82024b0d144a166e3a5e63e8 after a discussion with infinity yesterday, where he noted that the NEWS file wasn't being included in the packages because its name was incorrect:
commit 1190dd579521af635443445f2d2b09b0a35fd957 (tag: before-merge-finish)
Author: Andreas Hasenack <email address hidden>
Date: Thu Oct 4 09:43:47 2018 -0300
- Rename d/NEWS.debian to d/NEWS, so that it can be handled by dh_installchangelogs.
commit 1b9f272ef961a00a82024b0d144a166e3a5e63e8
Author: Andreas Hasenack <email address hidden>
Date: Tue Oct 2 20:02:13 2018 -0300
I then regenerated the changelog after that, so all the way up to 1b9f272ef961a00a82024b0d144a166e3a5e63e8 it's like you reviewed, and after that it's the NEWS change plus metadata/changelog.
Thanks for the review. I find it convenient to use empty commits for the dropped changes (just not when I forget to use --keep-empty when rebasing ;).
I added one more "added change" on top of 1b9f272ef961a00 a82024b0d144a16 6e3a5e63e8 after a discussion with infinity yesterday, where he noted that the NEWS file wasn't being included in the packages because its name was incorrect:
commit 1190dd579521af6 35443445f2d2b09 b0a35fd957 (tag: before- merge-finish)
Author: Andreas Hasenack <email address hidden>
Date: Thu Oct 4 09:43:47 2018 -0300
- Rename d/NEWS.debian to d/NEWS, so that it can be handled by
dh_installch angelogs.
commit 1b9f272ef961a00 a82024b0d144a16 6e3a5e63e8
Author: Andreas Hasenack <email address hidden>
Date: Tue Oct 2 20:02:13 2018 -0300
* Added: /salsa. debian. org/squid- team/squid/ merge_requests/ 6 and see also /bugs.debian. org/cgi- bin/bugreport. cgi?bug= 907106# 5)
- d/rules: only use -latomic with the intended architectures, instead
of all of them
(https:/
https:/
I then regenerated the changelog after that, so all the way up to 1b9f272ef961a00 a82024b0d144a16 6e3a5e63e8 it's like you reviewed, and after that it's the NEWS change plus metadata/changelog.
I submitted this to debian at https:/ /salsa. debian. org/squid- team/squid/ merge_requests/ 7