Skip to content

Sync back upstream 2017.05.20+nmu1 from downstream Debian #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from

Conversation

ottok
Copy link
Contributor

@ottok ottok commented Jan 26, 2024

Sandro Tosi uploaded 2017.05.20+nmu1 in
https://tracker.debian.org/news/1086699/accepted-check-all-the-things-20170520nmu1-source-into-unstable/

However, it was never submitted upstream and thus the debian/changelog in Debian diverged. Sync back to upstream so that debian/changelog is consistent when next upload to Debian happens. stays consistent.

Latest upstream source was downloaded with dgit to make the upstream version is latest possible. Temporary branches https://github.com/ottok/check-all-the-things/tree/check-all-the-things-2017.05.20%2Bnmu1 and https://github.com/ottok/check-all-the-things/tree/check-all-the-things-2017.05.20%2Bnmu1-merge. I am confident that indeed debian/changelog is the only change that has not been superseded by any upstream commit, and needs to be merged back upstream.

Screenshot from 2024-01-25 21-24-34

@ottok ottok force-pushed the check-all-the-things-2017.05.20+nmu1-to-upstream branch 2 times, most recently from 3137320 to a1fdefc Compare January 26, 2024 06:24
@ottok ottok force-pushed the check-all-the-things-2017.05.20+nmu1-to-upstream branch from a1fdefc to d844574 Compare January 27, 2024 04:46
Sandro Tosi uploaded 2017.05.20+nmu1 in
https://tracker.debian.org/news/1086699/accepted-check-all-the-things-20170520nmu1-source-into-unstable/

However, it was never submitted upstream and thus the debian/changelog
in Debian diverged. Sync back to upstream so that debian/changelog is
consistent when next upload to Debian happens. stays consistent.

Signed-off-by: Otto Kekäläinen <otto@debian.org>
@ottok ottok force-pushed the check-all-the-things-2017.05.20+nmu1-to-upstream branch from d844574 to bacc6e9 Compare January 27, 2024 05:38
@ottok
Copy link
Contributor Author

ottok commented Jan 7, 2025

@pabs3 Can you please review this? Thanks

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants