Hi Bo,
On Sat, 2025-02-15 at 03:11 +0800, Bo YU wrote:
> Hi Samo,
>
> On Sat, Feb 15, 2025 at 1:54 AM Samo Pogačnik <samo_pogac...@t-2.net> wrote:
> >
> > I suppose it is not allowed to append (Closes: #xxxxxx) to a changelog line
> > of
> > an older already uploaded release? May i just add two more lines to your
> > proposed changelog change like this:
> > ---
> > * Improved test coverage (Closes: #1078960)
> > * New upstream release (Closes: #1081945)
> > ---
> I think it should be like:
>
> ```
>
> > > -git-subrepo (0.4.9-2) 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_pogac...@t-2.net> Fri, 10 Jan 2025 17:57:19
> > > +0000
> ```
> But here, you must make sure:
> 1. Which entries to fix the #1078960, if not mention in d/chanelog
> please record it then to close the bug. But if #1078960 is not fixed
> in fact, please open it until it is fixed.I just suppose "Reordered
> and rewritten existing patches" will fix the bug, but maybe this is
> wrong.
> 2. For #1081945, you can close it like this, or send the bts cmd to close it.
>
> 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?
```
--- 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_pogac...@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_pogac...@t-2.net> Fri, 10 Jan 2025 17:57:19 +0000
+ -- Samo Pogačnik <samo_pogac...@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:
```
Update changelog for 0.4.9-2 release
Please ignore previous commits:
* Release 0.4.9-2
* Release 0.4.9-3
```
[0]: https://salsa.debian.org/spog/git-subrepo
best regards, Samo
