Problem

Upstream includes non-dfsg compliant files in their tarball / upstream git branch. The cleanup work should also be represented in the packaging git repo.

Environment

• git-buildpackage
• packaging for Debian

Solution

Use 3 branches:

• upstream - This is upstream's git branch (if available).
• dfsg-clean - This branch contains the exact content of the dfsg-clean orig tarball that is to be uploaded to Debian.
• master - This is the debian packaging branch, containing the debian/ folder.

upstream merges into dfsg-clean. dfsg-clean merges into master.

The uscan man page contains information on how to use the 'Files-Excluded' stanza to exclude files when creating an orig tarball.