[iaxmodem REMOVED from testing]

[Bernhard Schmidt]

Hi Jörg,

> On Tue, Apr 10, 2018 at 10:14:04PM +0200, Bernhard Schmidt wrote:
>>
>> Repo looks good at first glance, but I think you forgot to push the
>> upstream branch and the tags. gbp-buildpackage needs this in order to
>> properly reconstruct the orig tarball on building.
> 
> This might indeed been the case ;-)
> 
> did a git push --all and git push --tags now
> 
> [...]
>> I suggest to go for debhelper compat level 11 (only depend on debhelper
>> (>= 11~), put 11 into debian/compat), that runs dh-autoreconf automatically.
> 
> That makes sense.
> 
> Would you mind checking the results again?

Looks better, but there is a problem in your upstream sources handling.

You have imported the full sources into the upstream branch, gbp has
tagged this upstream/1.3.0. It has then been merged into master and a
couple of files dropped in master
https://salsa.debian.org/pkg-voip-team/iaxmodem/commit/2b9d324de05b993efdba69af38c0ed82ca722d08.
I assume these are not DFSG-clean and must not be distributed by Debian?

Anyway, the git-buildpackage workflow, when you do not have the orig
tarball (as it is the case with my git checkout) is to make a tarball
out of the upstream/<upstreamversion> tarball, then put the debian/
content in master in the debian tarball. At build those are merged together.

Your upstream version (changelog) is 1.3.0~dfsg. There is no tag
upstream/1.3.0_dfsg, so gbp buildpackage bails out.

When I manually tag the upstream/1.3.0 commit as upstream/1.3.0_dfsg the
orig.tar.bz2 is recreated from the upstream branch, but your deletions
outside debian/ cannot be represented in the Debian tarball. I get

dpkg-source: warning: ignoring deletion of file lib/spandsp/Makefile.in,
use --include-removal to override
dpkg-source: warning: ignoring deletion of file lib/spandsp/aclocal.m4,
use --include-removal to override
dpkg-source: warning: ignoring deletion of file lib/spandsp/config-h.in,
use --include-removal to override

etc and the build fails.

make[1]: Entering directory '/<<PKGBUILDDIR>>'
# Check that problematic files have been removed prior to packaging
( [ ! -e lib/spandsp/src/spandsp/mmx.h ] && \
        [ ! -d lib/spandsp/src/msvc ] && [ ! -f
lib/spandsp/libspandsp.vcproj ] \
#               && [ ! -d lib/spandsp/autom4te.cache ] && [ ! -d
lib/libiax2/autom4te.cache ] \
        ) || (echo "WARNING: sources are not clean!"; false)
WARNING: sources are not clean!
make[1]: *** [debian/rules:50: override_dh_auto_configure] Error 1
make[1]: Leaving directory '/<<PKGBUILDDIR>>'
make: *** [debian/rules:46: build] Error 2
dpkg-buildpackage: error: debian/rules build subprocess returned exit
status 2

Apparently you have a ~dfsg.orig.tar.*, so you must have generated it
somehow?

If you need to repack, you usually do not import the original original
tarball from upstream, but the filtered one. uscan can do this for you
automatically if you have a machine-readable copyright file. So you
never have the problematic content in any branch in your git repo.

Other than that it looks good to me.

Bernhard