Comment 7 for bug 668849

Can anyone suggest a manual workaround to use multiple orig tarballs? I've tried to follow the workflow descibed in the upstream bug [1]. It seems to do the trick for keeping the sources and tarballs, but building fails ("dpkg-source aborting due to unexpected upstream changes").

So far is what I do:
# import the main orig tarball
git-import-dsc PKG.dsc --pristine-tar

# import the next orig tarball in a separate branch into a subdirectory named the same
cd PKG

git checkout --orphan upstream
git rm -rf .
git commit --allow-empty -m 'Initial upstream branch for PKG-ADD.'
git checkout -f master

tar xf PKG_VER-PKG-ADD.orig.tar.gz ../tmp
git-import-orig --upstream-version=VER --upstream-branch=upstream-PKG-ADD --upstream-tag=upstream-PKG-ADD/VER ../tmp

# add the tarball
pristine-tar checkout PKG_VER-PKG-ADD.orig.tar.gz

However it fails to build:
git-buildpackage --git-ignore-new -S
:
dpkg-source: info: local changes detected, the modified files are:
 comedilib/comedi-calibrate/configure
 comedilib/comedi-calibrate/man/comedi_calibrate.8
 comedilib/man/comedi_config.8
dpkg-source: error: aborting due to unexpected upstream changes, see /tmp/comedilib_0.10.0-3ubuntu1.diff.AtK0c1
dpkg-source: info: you can integrate the local changes with dpkg-source --commit
dpkg-buildpackage: error: dpkg-source -i -I -b comedilib gave error exit status 2

Is there some specific trick to do for building too? Could it be due to some weird trick in the package I'm trying to build? (It's comedilib-0.10.0 from Debian unstable)

[1] http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=561071#36