On 2023-01-09, at 08:51:54 -0500, Roberto C. Sánchez wrote: > On Sat, Jan 07, 2023 at 12:48:08PM +0100, Romain Francoise wrote: > > On Tue, Jan 3, 2023 at 11:54 PM Jeremy Sowden <jeremy@azazel.net> wrote: > > > I've imported my fork of Roberto's SF repo to Salsa: > > > > > > https://salsa.debian.org/azazel/shorewall > > > > > > I haven't touched it in 18 months, so I'll give it a polish when I > > > have some time, and perhaps we can use it as a starting point. > > > > Thanks. I created a Salsa team and repo here: > > https://salsa.debian.org/shorewall-team/shorewall and added you both > > as co-owners. > > > > I felt more comfortable using Roberto's original SF repo as a > > starting point, and merging in your changes after review. I can do > > that in the next few days, the freeze is coming up very soon and I > > would like to have the new upstream in bookworm. If you have further > > changes please push them to your repo. > > > > I'll also configure the CI on Salsa to have all the usual QA tools > > run automatically on each push. > > > > Did you find a practical way to do changes across all seven source > > packages at once? > > For a bit of historical context, the current multi-branch structure > from the SF repo is quite antiquiated. It is from a time before > debhelper supported multiple .orig.tar.gz components. It might make > sense to consider starting with a new repo, with a more sensible > branch structure (one that works more easily with tools like gbp), and > that makes use of the multi-tarball capabilities so that you have have > all the source packages in view at the same time. I've managed to coax gbp into importing 5.2.8 into one upstream branch with each upstream tar-ball as a subdirectory: [azazel@ulthar:/space/azazel/work/git/repos/salsa/azazel/shorewall (master>)] $ ls -1 debian/ shorewall/ shorewall6/ shorewall6-lite/ shorewall-core/ shorewall-docs-xml/ shorewall-init/ shorewall-lite/ I'm currently working on merging the debian/ directories. J.
Attachment:
signature.asc
Description: PGP signature