Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.debian.bugs.dist > #1171308 > unrolled thread

Bug#1041293: elpa-boxquote: New upstream release 2.3

Back to article view | Back to linux.debian.bugs.dist

This discussion starts older than the indexed window; earlier articles aren't shown. The article labeled Started by below is the oldest one visible, not the original post.

Contents

  Bug#1041293: elpa-boxquote: New upstream release 2.3 Amin Bandali <bandali@gnu.org> - 2023-10-10 04:40 +0200
    Bug#1041293: elpa-boxquote: New upstream release 2.3 Xiyue Deng <manphiz@gmail.com> - 2023-10-10 07:10 +0200
      Bug#1041293: elpa-boxquote: New upstream release 2.3 Amin Bandali <bandali@gnu.org> - 2023-10-11 06:40 +0200
        Bug#1041293: elpa-boxquote: New upstream release 2.3 Xiyue Deng <manphiz@gmail.com> - 2023-10-11 10:40 +0200
        Bug#1041293: elpa-boxquote: New upstream release 2.3 Tobias Frost <tobi@debian.org> - 2023-10-14 10:30 +0200
          Bug#1041293: elpa-boxquote: New upstream release 2.3 Xiyue Deng <manphiz@gmail.com> - 2023-10-14 11:10 +0200

#1171308 — Bug#1041293: elpa-boxquote: New upstream release 2.3

Hey Manphiz,

Thanks for the patch!

However, looking at https://salsa.debian.org/emacsen-team/boxquote-el
I see we have an 'upstream' branch in the repo, for tracking latest
upstream commits.  But it appears that for your MR you essentially
cherry-picked the commits from the upstream repo, resulting in
different commit hashes.

But we'd like to preserve the original upstream commits, including
in the 'master' branch where we have the 'debian' packaging directory.
So, you'd want to add to your local clone of the boxquote-el repo a
new remote pointing to the upstream repo residing on GitHub, fetch the
remote, pull from its 'main' branch into our 'upstream', then merge
the 'v2.3' tag (now the tip of 'upstream') into our 'master' branch:

cd boxquote-el
git checkout upstream
git remote add upstreamvcs https://github.com/davep/boxquote.el.git
git fetch upstreamvcs
git pull upstreamvcs main
git checkout master
git merge v2.3
# followed by the rest of your changes (to the debian/ dir)

You may be able to use tooling to automate this (e.g. using 'gbp' from
the 'git-buildpackage' package), or do it manually as shown above.

It's a bit inconvenient since you're not [yet] a member of the Emacsen
team or the repository itself, so you won't be able to do this in the
emacsen-team/boxquote-el repo itself just yet.  Please do this in your
own fork - push your updated 'master' and 'upstream' branches and the
new 'v2.3' tag - and let me know.  I'll then pull your changes from
your fork into emacsen-team/boxquote-el.

Lastly, once ready, would you like to try uploading your changes to
mentors.debian.net and open an RFS (Request for Sponsorship) bug for
this?  It might be a useful exercise for your future contributions
as well. :-)  (ref: https://mentors.debian.net/sponsors/rfs-howto/)

Please let me know if anything's unclear or if you have any questions
or comments.

Thanks,
-a

[toc] | [next] | [standalone]

#1171316

Hi Amin,

Amin Bandali <bandali@gnu.org> writes:

> Hey Manphiz,
>
> Thanks for the patch!
>
> However, looking at https://salsa.debian.org/emacsen-team/boxquote-el
> I see we have an 'upstream' branch in the repo, for tracking latest
> upstream commits.  But it appears that for your MR you essentially
> cherry-picked the commits from the upstream repo, resulting in
> different commit hashes.
>
> But we'd like to preserve the original upstream commits, including
> in the 'master' branch where we have the 'debian' packaging directory.
> So, you'd want to add to your local clone of the boxquote-el repo a
> new remote pointing to the upstream repo residing on GitHub, fetch the
> remote, pull from its 'main' branch into our 'upstream', then merge
> the 'v2.3' tag (now the tip of 'upstream') into our 'master' branch:
>
> cd boxquote-el
> git checkout upstream
> git remote add upstreamvcs https://github.com/davep/boxquote.el.git
> git fetch upstreamvcs
> git pull upstreamvcs main
> git checkout master
> git merge v2.3
> # followed by the rest of your changes (to the debian/ dir)
>
> You may be able to use tooling to automate this (e.g. using 'gbp' from
> the 'git-buildpackage' package), or do it manually as shown above.
>
> It's a bit inconvenient since you're not [yet] a member of the Emacsen
> team or the repository itself, so you won't be able to do this in the
> emacsen-team/boxquote-el repo itself just yet.  Please do this in your
> own fork - push your updated 'master' and 'upstream' branches and the
> new 'v2.3' tag - and let me know.  I'll then pull your changes from
> your fork into emacsen-team/boxquote-el.
>
> Lastly, once ready, would you like to try uploading your changes to
> mentors.debian.net and open an RFS (Request for Sponsorship) bug for
> this?  It might be a useful exercise for your future contributions
> as well. :-)  (ref: https://mentors.debian.net/sponsors/rfs-howto/)
>
> Please let me know if anything's unclear or if you have any questions
> or comments.
>
> Thanks,
> -a
>

Thanks for the detailed instructions!  This was one of the early
packaging works and I didn't really understand the workflow back then.
Glad to have your help!  I've now reworked the merge request[1] and sync
an upstream branch in my repo, also opened another merge request[2] for
updating the upstream branch in the team repo.  I've also built the
package using gbp and uploaded to mentors[3].  I didn't create a tag as
I don't think gitlab support merge requests for tags.  Also I didn't
file a separate RFS bug yet as I may have to update the changelog to
close that bug again, or maybe I can just manually close that later.
Anyway, would be great to have your suggestions again.

Thanks again, and PTAL.

[1] https://salsa.debian.org/emacsen-team/boxquote-el/-/merge_requests/3
[2] https://salsa.debian.org/emacsen-team/boxquote-el/-/merge_requests/4
[3] https://mentors.debian.net/package/boxquote-el/
-- 
Xiyue Deng

[toc] | [prev] | [next] | [standalone]

#1171374

Control: tags -1 pending
X-Debbugs-CC: Tobias Frost <tobi@debian.org>

Hi Xiyue,

Xiyue Deng writes:

> Hi Amin,
>
> Amin Bandali <bandali@gnu.org> writes:
>
>> Hey Manphiz,
>>
>> Thanks for the patch!
>>
>> However, looking at https://salsa.debian.org/emacsen-team/boxquote-el
>> I see we have an 'upstream' branch in the repo, for tracking latest
>> upstream commits.  But it appears that for your MR you essentially
>> cherry-picked the commits from the upstream repo, resulting in
>> different commit hashes.
>>
>> But we'd like to preserve the original upstream commits, including
>> in the 'master' branch where we have the 'debian' packaging directory.
>> So, you'd want to add to your local clone of the boxquote-el repo a
>> new remote pointing to the upstream repo residing on GitHub, fetch the
>> remote, pull from its 'main' branch into our 'upstream', then merge
>> the 'v2.3' tag (now the tip of 'upstream') into our 'master' branch:
>>
>> cd boxquote-el
>> git checkout upstream
>> git remote add upstreamvcs https://github.com/davep/boxquote.el.git
>> git fetch upstreamvcs
>> git pull upstreamvcs main
>> git checkout master
>> git merge v2.3
>> # followed by the rest of your changes (to the debian/ dir)
>>
>> You may be able to use tooling to automate this (e.g. using 'gbp' from
>> the 'git-buildpackage' package), or do it manually as shown above.
>>
>> It's a bit inconvenient since you're not [yet] a member of the Emacsen
>> team or the repository itself, so you won't be able to do this in the
>> emacsen-team/boxquote-el repo itself just yet.  Please do this in your
>> own fork - push your updated 'master' and 'upstream' branches and the
>> new 'v2.3' tag - and let me know.  I'll then pull your changes from
>> your fork into emacsen-team/boxquote-el.
>>
>> Lastly, once ready, would you like to try uploading your changes to
>> mentors.debian.net and open an RFS (Request for Sponsorship) bug for
>> this?  It might be a useful exercise for your future contributions
>> as well. :-)  (ref: https://mentors.debian.net/sponsors/rfs-howto/)
>>
>> Please let me know if anything's unclear or if you have any questions
>> or comments.
>>
>> Thanks,
>> -a
>>
>
> Thanks for the detailed instructions!  This was one of the early
> packaging works and I didn't really understand the workflow back then.
> Glad to have your help!  I've now reworked the merge request[1] and sync
> an upstream branch in my repo, also opened another merge request[2] for
> updating the upstream branch in the team repo.  I've also built the
> package using gbp and uploaded to mentors[3].  I didn't create a tag as
> I don't think gitlab support merge requests for tags.  Also I didn't
> file a separate RFS bug yet as I may have to update the changelog to
> close that bug again, or maybe I can just manually close that later.
> Anyway, would be great to have your suggestions again.
>
> Thanks again, and PTAL.
>
> [1] https://salsa.debian.org/emacsen-team/boxquote-el/-/merge_requests/3
> [2] https://salsa.debian.org/emacsen-team/boxquote-el/-/merge_requests/4
> [3] https://mentors.debian.net/package/boxquote-el/

Cheers, and thanks for the quick update.  Looks good to me.

I've merged both your MRs, though I did so directly, by pulling from
your fork and pushing to the corresponding branch of the main repo
under emacsen-team, to avoid merge commits (particularly important for
the 'upstream' branch where we want our history to exactly match that
of upstream repo's main branch).  I also added an annotated, signed
'debian/2.3-1' tag pointing to the latest commit, since like you said
you couldn't do that at the moment.

And yeah we don't really *need* an RFS bug here, since I'm asking Tobi
to sponsor the upload for us.

Tobi, would you please sponsor the upload from mentors to unstable?
https://mentors.debian.net/package/boxquote-el/

Thanks,
-a

[toc] | [prev] | [next] | [standalone]

#1171389

[Multipart message — attachments visible in raw view] — view raw

Amin Bandali <bandali@gnu.org> writes:

> Control: tags -1 pending
> X-Debbugs-CC: Tobias Frost <tobi@debian.org>
>
> Hi Xiyue,
>
> Xiyue Deng writes:
>
>> Hi Amin,
>>
>> Amin Bandali <bandali@gnu.org> writes:
>>
>>> Hey Manphiz,
>>>
>>> Thanks for the patch!
>>>
>>> However, looking at https://salsa.debian.org/emacsen-team/boxquote-el
>>> I see we have an 'upstream' branch in the repo, for tracking latest
>>> upstream commits.  But it appears that for your MR you essentially
>>> cherry-picked the commits from the upstream repo, resulting in
>>> different commit hashes.
>>>
>>> But we'd like to preserve the original upstream commits, including
>>> in the 'master' branch where we have the 'debian' packaging directory.
>>> So, you'd want to add to your local clone of the boxquote-el repo a
>>> new remote pointing to the upstream repo residing on GitHub, fetch the
>>> remote, pull from its 'main' branch into our 'upstream', then merge
>>> the 'v2.3' tag (now the tip of 'upstream') into our 'master' branch:
>>>
>>> cd boxquote-el
>>> git checkout upstream
>>> git remote add upstreamvcs https://github.com/davep/boxquote.el.git
>>> git fetch upstreamvcs
>>> git pull upstreamvcs main
>>> git checkout master
>>> git merge v2.3
>>> # followed by the rest of your changes (to the debian/ dir)
>>>
>>> You may be able to use tooling to automate this (e.g. using 'gbp' from
>>> the 'git-buildpackage' package), or do it manually as shown above.
>>>
>>> It's a bit inconvenient since you're not [yet] a member of the Emacsen
>>> team or the repository itself, so you won't be able to do this in the
>>> emacsen-team/boxquote-el repo itself just yet.  Please do this in your
>>> own fork - push your updated 'master' and 'upstream' branches and the
>>> new 'v2.3' tag - and let me know.  I'll then pull your changes from
>>> your fork into emacsen-team/boxquote-el.
>>>
>>> Lastly, once ready, would you like to try uploading your changes to
>>> mentors.debian.net and open an RFS (Request for Sponsorship) bug for
>>> this?  It might be a useful exercise for your future contributions
>>> as well. :-)  (ref: https://mentors.debian.net/sponsors/rfs-howto/)
>>>
>>> Please let me know if anything's unclear or if you have any questions
>>> or comments.
>>>
>>> Thanks,
>>> -a
>>>
>>
>> Thanks for the detailed instructions!  This was one of the early
>> packaging works and I didn't really understand the workflow back then.
>> Glad to have your help!  I've now reworked the merge request[1] and sync
>> an upstream branch in my repo, also opened another merge request[2] for
>> updating the upstream branch in the team repo.  I've also built the
>> package using gbp and uploaded to mentors[3].  I didn't create a tag as
>> I don't think gitlab support merge requests for tags.  Also I didn't
>> file a separate RFS bug yet as I may have to update the changelog to
>> close that bug again, or maybe I can just manually close that later.
>> Anyway, would be great to have your suggestions again.
>>
>> Thanks again, and PTAL.
>>
>> [1] https://salsa.debian.org/emacsen-team/boxquote-el/-/merge_requests/3
>> [2] https://salsa.debian.org/emacsen-team/boxquote-el/-/merge_requests/4
>> [3] https://mentors.debian.net/package/boxquote-el/
>
> Cheers, and thanks for the quick update.  Looks good to me.
>
> I've merged both your MRs, though I did so directly, by pulling from
> your fork and pushing to the corresponding branch of the main repo
> under emacsen-team, to avoid merge commits (particularly important for
> the 'upstream' branch where we want our history to exactly match that
> of upstream repo's main branch).  I also added an annotated, signed
> 'debian/2.3-1' tag pointing to the latest commit, since like you said
> you couldn't do that at the moment.
>

Makes sense.  The git merge vs rebase workflows have served different
purposes well.

> And yeah we don't really *need* an RFS bug here, since I'm asking Tobi
> to sponsor the upload for us.
>

Sounds good.

> Tobi, would you please sponsor the upload from mentors to unstable?
> https://mentors.debian.net/package/boxquote-el/
>

Thanks in advance, Tobi!

> Thanks,
> -a

-- 
Xiyue Deng

[toc] | [prev] | [next] | [standalone]

#1171672

[Multipart message — attachments visible in raw view] — view raw

Hi,

I'm going to upload the package soon, but I will change d/copyrigt:

This concerns this part of the patch:
 Files: debian/*
-Copyright: (C) 2018-2020 David Bremner <bremner@debian.org>
-License: GPL-2+
+Copyright: (C) 2018-2023 David Bremner <bremner@debian.org>
+License: GPL-3+

Even if GPL2+ includes GPL3+, and makes the package effecitvly
GPL3+, you cannot reclicense David's contribution, without an
ACK from David; (Such an ACK would need documentation somewhere,
e.g in d/changelog)

-- 
Cheers,
tobi


On Wed, Oct 11, 2023 at 12:28:25AM -0400, Amin Bandali wrote:
> Control: tags -1 pending
> X-Debbugs-CC: Tobias Frost <tobi@debian.org>
> 
> Hi Xiyue,
> 
> Xiyue Deng writes:
> 
> > Hi Amin,
> >
> > Amin Bandali <bandali@gnu.org> writes:
> >
> >> Hey Manphiz,
> >>
> >> Thanks for the patch!
> >>
> >> However, looking at https://salsa.debian.org/emacsen-team/boxquote-el
> >> I see we have an 'upstream' branch in the repo, for tracking latest
> >> upstream commits.  But it appears that for your MR you essentially
> >> cherry-picked the commits from the upstream repo, resulting in
> >> different commit hashes.
> >>
> >> But we'd like to preserve the original upstream commits, including
> >> in the 'master' branch where we have the 'debian' packaging directory.
> >> So, you'd want to add to your local clone of the boxquote-el repo a
> >> new remote pointing to the upstream repo residing on GitHub, fetch the
> >> remote, pull from its 'main' branch into our 'upstream', then merge
> >> the 'v2.3' tag (now the tip of 'upstream') into our 'master' branch:
> >>
> >> cd boxquote-el
> >> git checkout upstream
> >> git remote add upstreamvcs https://github.com/davep/boxquote.el.git
> >> git fetch upstreamvcs
> >> git pull upstreamvcs main
> >> git checkout master
> >> git merge v2.3
> >> # followed by the rest of your changes (to the debian/ dir)
> >>
> >> You may be able to use tooling to automate this (e.g. using 'gbp' from
> >> the 'git-buildpackage' package), or do it manually as shown above.
> >>
> >> It's a bit inconvenient since you're not [yet] a member of the Emacsen
> >> team or the repository itself, so you won't be able to do this in the
> >> emacsen-team/boxquote-el repo itself just yet.  Please do this in your
> >> own fork - push your updated 'master' and 'upstream' branches and the
> >> new 'v2.3' tag - and let me know.  I'll then pull your changes from
> >> your fork into emacsen-team/boxquote-el.
> >>
> >> Lastly, once ready, would you like to try uploading your changes to
> >> mentors.debian.net and open an RFS (Request for Sponsorship) bug for
> >> this?  It might be a useful exercise for your future contributions
> >> as well. :-)  (ref: https://mentors.debian.net/sponsors/rfs-howto/)
> >>
> >> Please let me know if anything's unclear or if you have any questions
> >> or comments.
> >>
> >> Thanks,
> >> -a
> >>
> >
> > Thanks for the detailed instructions!  This was one of the early
> > packaging works and I didn't really understand the workflow back then.
> > Glad to have your help!  I've now reworked the merge request[1] and sync
> > an upstream branch in my repo, also opened another merge request[2] for
> > updating the upstream branch in the team repo.  I've also built the
> > package using gbp and uploaded to mentors[3].  I didn't create a tag as
> > I don't think gitlab support merge requests for tags.  Also I didn't
> > file a separate RFS bug yet as I may have to update the changelog to
> > close that bug again, or maybe I can just manually close that later.
> > Anyway, would be great to have your suggestions again.
> >
> > Thanks again, and PTAL.
> >
> > [1] https://salsa.debian.org/emacsen-team/boxquote-el/-/merge_requests/3
> > [2] https://salsa.debian.org/emacsen-team/boxquote-el/-/merge_requests/4
> > [3] https://mentors.debian.net/package/boxquote-el/
> 
> Cheers, and thanks for the quick update.  Looks good to me.
> 
> I've merged both your MRs, though I did so directly, by pulling from
> your fork and pushing to the corresponding branch of the main repo
> under emacsen-team, to avoid merge commits (particularly important for
> the 'upstream' branch where we want our history to exactly match that
> of upstream repo's main branch).  I also added an annotated, signed
> 'debian/2.3-1' tag pointing to the latest commit, since like you said
> you couldn't do that at the moment.
> 
> And yeah we don't really *need* an RFS bug here, since I'm asking Tobi
> to sponsor the upload for us.
> 
> Tobi, would you please sponsor the upload from mentors to unstable?
> https://mentors.debian.net/package/boxquote-el/
> 
> Thanks,
> -a

[toc] | [prev] | [next] | [standalone]

#1171677

[Multipart message — attachments visible in raw view] — view raw

Tobias Frost <tobi@debian.org> writes:

> Hi,
>
> I'm going to upload the package soon, but I will change d/copyrigt:
>
> This concerns this part of the patch:
>  Files: debian/*
> -Copyright: (C) 2018-2020 David Bremner <bremner@debian.org>
> -License: GPL-2+
> +Copyright: (C) 2018-2023 David Bremner <bremner@debian.org>
> +License: GPL-3+
>
> Even if GPL2+ includes GPL3+, and makes the package effecitvly
> GPL3+, you cannot reclicense David's contribution, without an
> ACK from David; (Such an ACK would need documentation somewhere,
> e.g in d/changelog)

Acknowledged.  Thanks for taking a close look and the suggestions!

-- 
Xiyue Deng

[toc] | [prev] | [standalone]

Back to top | Article view | linux.debian.bugs.dist

csiph-web