Each upstream release contains a separate tar-ball for each Shorewall component.
Seven of these have been packaged in Debian:

  * shorewall
  * shorewall6
  * shorewall6-lite
  * shorewall-core
  * shorewall-docs-xml (as shorewall-doc)
  * shorewall-init
  * shorewall-lite

Historically, each of these tar-balls has been the basis for a separate source
package, which has in turn been the basis for one binary package.  Each source
package has been held in git in separate Debian and upstream branches, with a
shared pristine-tar branch:

  * pristine-tar
  * shorewall/master
  * shorewall/upstream
  * shorewall6/master
  * shorewall6/upstream
  * shorewall6-lite/master
  * shorewall6-lite/upstream
  * shorewall-core/master
  * shorewall-core/upstream
  * shorewall-doc/master
  * shorewall-doc/upstream
  * shorewall-init/master
  * shorewall-init/upstream
  * shorewall-lite/master
  * shorewall-lite/upstream

Packaging a new upstream release and updating packaging for an exisiting
upstream release has been repetitive and thus prone to inconsistency.

Recent versions of uscan and git-buildpackage have made it much easier to create
a single source package from multiple upstream tar-balls.  The structure of the
Shorewall source package for 5.2.8, therefore, has been updated to take
advantage of these capabilities.  There is one Debian branch and one upstream
branch:

     * debian/sid
     * upstream

In the debian/sid branch, debian/watch has been updated to track all seven
upstream tar-balls, and debian/gbp.conf has been updated to configure `gbp
import-orig` to import them all and unpack them into separate subdirectories:

  $ git ls-tree upstream
  040000 tree 630e967ce4059af4f6b19453aa91d2e3713bb6f7    shorewall-core
  040000 tree c8da0eeeef1adbafa2da3b6c69757255fb1a4aca    shorewall-docs-xml
  040000 tree beeee1af8e7a0cf6a7172b72ab34ceac5848050e    shorewall-init
  040000 tree 30ca65490b5d424edb498728cbcdc53c4ee8ef7b    shorewall-lite
  040000 tree 63bc4819bc48c8ed11291ba82730b6a7f7beba7e    shorewall
  040000 tree 7bc734cc20638c0bde59566f58d1a67a9a7b9c21    shorewall6-lite
  040000 tree 712f48c16787e095fedac0ddc0e16aef2c393c38    shorewall6

debian/control now lists one source package and seven binary packages, and the
packaging from the seven historical Debian branches has been merged:

  * debian/build-htmldocs
  * debian/changelog
  * debian/control
  * debian/copyright
  * debian/gbp.conf
  * debian/.gitignore
  * debian/old_changelogs/shorewall6.changelog
  * debian/old_changelogs/shorewall6-lite.changelog
  * debian/old_changelogs/shorewall-common.changelog
  * debian/old_changelogs/shorewall-core.changelog
  * debian/old_changelogs/shorewall-doc.changelog
  * debian/old_changelogs/shorewall-init.changelog
  * debian/old_changelogs/shorewall-lite.changelog
  * debian/old_changelogs/shorewall-perl.changelog
  * debian/old_changelogs/shorewall-shell.changelog
  * debian/patches/01_debian_configuration.patch
  * debian/patches/02_remove_deprecated_service_config.patch
  * debian/patches/03_init_script_fix.patch
  * debian/patches/04_service_file_documentation.patch
  * debian/patches/series
  * debian/README.Debian
  * debian/rules
  * debian/salsa-ci.yml
  * debian/shorewall6.docs
  * debian/shorewall6.examples
  * debian/shorewall6.lintian-overrides
  * debian/shorewall6-lite.docs
  * debian/shorewall6-lite.lintian-overrides
  * debian/shorewall6-lite.logrotate
  * debian/shorewall6-lite.postrm
  * debian/shorewall6.logrotate
  * debian/shorewall6.postinst
  * debian/shorewall6.postrm
  * debian/shorewall-core.docs
  * debian/shorewall-core.lintian-overrides
  * debian/shorewall-doc.doc-base
  * debian/shorewall-doc.links
  * debian/shorewall.docs
  * debian/shorewall.examples
  * debian/shorewall-init.docs
  * debian/shorewall-init.lintian-overrides
  * debian/shorewall.lintian-overrides
  * debian/shorewall-lite.docs
  * debian/shorewall-lite.lintian-overrides
  * debian/shorewall-lite.logrotate
  * debian/shorewall-lite.postrm
  * debian/shorewall.logrotate
  * debian/shorewall.postinst
  * debian/shorewall.postrm
  * debian/shorewallrc
  * debian/source/format
  * debian/source/lintian-overrides
  * debian/source/local-options
  * debian/source/options
  * debian/upstream/signing-key.asc
  * debian/watch
