Dear Narcis, I am an upstream maintaining a Debian package. Frankly, I think you're overcomplicating things. In particular, I strongly recommend ignoring git-buildpackage, simply because it was not designed with your situation in mind.
I suggest using a single branch, and building with dpkg-buildpackage.
For iterative testing, pass -b so you don't have to worry about
tarballs.
When you are ready to build for upload, you need an orig.tar. Make one
like this:
echo "debian/* export-ignore" >> .git/info/attributes
git archive --format=tar 1.0.0 | xz > ../foo_1.0.0.orig.tar.xz
(this assumes you have a tag '1.0.0').
Now you should be able to produce a source package, again with
dpkg-buildpackage. It would be advisable to ensure your tree is clean
before doing that:
git reset --hard HEAD
git clean -xdf
If you want to see my case: https://git.spwhitton.name/git-remote-gcrypt
--
Sean Whitton
signature.asc
Description: PGP signature

