On 2023-01-15, at 22:03:46 +0100, Romain Francoise wrote: > On Sun, Jan 15, 2023 at 10:38:43AM +0000, Jeremy Sowden wrote: > > I've managed to coax gbp into importing 5.2.8 into one upstream > > branch with each upstream tar-ball as a subdirectory. > > > > I'm currently working on merging the debian/ directories. > > Cool! Thanks for working on this. I created two new branches: debian/sid and upstream. The starting point for debian/sid was shorewall/debian/5.2.3.1-1; the upstream branch was empty. I updated debian/gbp.conf and debian/watch so that `gbp import-orig` would import all seven upstream tar-balls into the upstream branch, each unpacked into a separate subdirectory. I then copied the 5.2.3.1-1 packaging from the other six master branches into debian/sid, and applied all the 5.2.8 packaging updates. I've added a README.source and a paragraph in the change-log outlining the change of structure. At this point, I've got seven binary packages built from one source package. Everything's lintian-clean and the Salsa CI pipeline passes. I've pushed all the work to my repo on Salsa: https://salsa.debian.org/azazel/shorewall Do you want to review it before I push to the shorewall-team repo? The 5.2.8 source package closes the following bugs: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=932473 https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=956106 https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=960211 https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=971430 https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=971855 https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=986152 https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1002852 In addition, I think these are candidates for manual closure: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=588349 https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=719810 https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=928912 https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=947217 J.
Attachment:
signature.asc
Description: PGP signature