Hi Samo, On Sat, Feb 15, 2025 at 09:01:06PM +0100, Samo Pogačnik wrote:
Hi Bo,
[...]
Hope this helps.Yes, this helps and fits perfectly, as both bugs were solved exactly that way. I prepared the change currently in my repo[0] and i'll push it also to d/git- subrepo, if the change is ok?
Okay, I think it is in a good shape now, thanks for your work. Some comments see below.
``` --- a/debian/changelog +++ b/debian/changelog @@ -1,18 +1,14 @@ -git-subrepo (0.4.9-3) unstable; urgency=medium +git-subrepo (0.4.9-2) UNRELEASED; urgency=medium + * Reordered and rewritten existing patches (Closes: #1078960) + * Added patches to fix upstream PR checks + * Fixing git-subrepo, when ff=only is set in git * d/control: update Standards-Version to 4.7.0 * d/control: bump debhelper compat level to 13 * d/control: added Multi-Arch: same + * Acknowledge the previous upload (Closes: #1081945) - -- Samo Pogačnik <samo_pogacnik@t-2.net> Sat, 11 Jan 2025 17:41:16 +0000 - -git-subrepo (0.4.9-2) unstable; urgency=medium - - * Reordered and rewritten existing patches - * Added patches to fix upstream PR checks - * Fixing git-subrepo, when ff=only is set in git - - -- Samo Pogačnik <samo_pogacnik@t-2.net> Fri, 10 Jan 2025 17:57:19 +0000 + -- Samo Pogačnik <samo_pogacnik@t-2.net> Sat, 15 Feb 2025 12:50:19 +0000 git-subrepo (0.4.9-1) unstable; urgency=medium ``` And one more question. Is it a ok that git history now contains previous commit messages 'Release 0.4.9-2' and 'Release 0.4.9-3', as they will/might repeat in future commits? I tried to address this through the commit message of this change:
No, it is not needed. In fact this hint should not be in the commit also. this will give hint to other developers, so this is up to you.:)
If I were you, maybe I will use Update changelog for 0.4.9-2 again instead of your commit. There are lots argue about Debian packaging workflow with git repo, but git repo is just to help packaging maintenance, in other words, packaging should not be subjected to git. But good git history or maintenance will help you to get maintainer permission even to become a DD later. Back to git-subrepo itself, there are some improvements I think:
+git-subrepo (0.4.9-2) UNRELEASED; urgency=medium + * Reordered and rewritten existing patches (Closes: #1078960) + * Added patches to fix upstream PR checks
Added xx.patch for the uploading, like * Added xx.patches to fix upstream PR checks
+ * Fixing git-subrepo, when ff=only is set in git
I think there is one patch to fix this, right?
* d/control: update Standards-Version to 4.7.0 * d/control: bump debhelper compat level to 13 * d/control: added Multi-Arch: same + * Acknowledge the previous upload (Closes: #1081945) - -- Samo Pogačnik <samo_pogacnik@t-2.net> Sat, 11 Jan 2025 17:41:16 +0000
basiclly, you should let others know what you have modified without comparing line by line of code. Because you are one maintainer withuot uploading permission, so we would be to avoid to use these words as the commit before get sponsorship otherwise you will be a dilemma position if your sponsor to ask some updates, just like your current confusion.:)
Update changelog for 0.4.9-2 release
We can use UNRELEASED or unstable as the review/sponsor singal or just one actual commit id that is okay. Let's go ahead.
Attachment:
signature.asc
Description: PGP signature