Hi Charles, On Wed, 2026-09-09 at 08:49 +0900, Charles Plessy wrote: > > On Fri, 2026-08-21 at 12:19 +0900, Charles Plessy wrote: > > > > > By the way, I would be keen on using dgit to update and upload the > > > package, > > > would that be fine for you? > > > > > > https://manpages.debian.org/trixie/dgit/dgit-maint-merge.7.en.html > > Le Fri, Aug 21, 2026 at 06:06:20PM +0200, Benjamin Drung a écrit : > > > > Yes. That will be the reason for me to have a deeper look at dgit and > > learn how to use it. Does it support using upstream tarballs plus their > > signatures? I create upstream tarballs that match the exact git content. > > Hi Benjamin, > > I think that the philosophy of dgit is to prefer git merges over tarball > imports. I started to look more in details at the dgit-maint-merge workflow > and it seems to fit our needs, since your system is designed so that > deviations > to the upstream repository do not need to be represented as patches. > > The main difficulty seems to be to stitch the histories of the two > repositories, but it does not seem to be too hard. > > How about we go ahead with dgit-maint-merge?
I read the dgit-maint-merge man page and that workflow sounds good to me. I still have one open question how to handle tarball signatures. Before we do the dgit merge, I recommend to do one more media-types upload with fixes to bring both closer together. I created some merge requests for that. Can you review those: https://salsa.debian.org/debian/media-types/-/merge_requests -- Benjamin Drung Debian & Ubuntu Developer
