[iaxmodem REMOVED from testing]

[Joerg Dorchain]

On Sat, Apr 14, 2018 at 10:49:11PM +0200, Bernhard Schmidt wrote:
> > 
> > Unfortunately, for the proper upstream tar file content, I have
> > no direct idea and would appriciated some help to get this fixed,
> > too.
> 
> uscan (uupdate?) can feed Files-Excluded from a machine readable
> copyright file into mk-origtargz to repack and exclude these files. You

I added a line for this.

> You haven't uploaded yet, do you could make a 1.3.0+dfsg upstream
> version with a mk-origtargz script and import that as new upstream
> version. Please do this on a test repo (best a fork in your personal
> namespace on salsa), since it will probably be a bit messy at first
> (your new upstream release will drop files you already dropped on master).

after this, I forked the repo on salsa to
https://salsa.debian.org/dorchain-guest/iaxmodem
Then (from memory/history):
mk-origtargz ../iaxmodem-1.3.0.tar.gz  
to create ../iaxmodem_1.3.0~dfsg.orig.tar.gz

Then removed everything again. Tried to get a clean repo:
git clone https://salsa.debian.org/dorchain-guest/iaxmodem.git
cd iaxmodem
git checkout upstream
git checkout master
gbp import-orig ../iaxmodem_1.3.0~dfsg.orig.tar.gz 

At this point, the problematic files are gone and git status is
fine. So I tried a build with gbp buildpackage that went fine.

But after ./debian/rules clean, git status shows

        modified:   lib/libiax2/configure
        deleted:    lib/spandsp/INSTALL
        deleted:    lib/spandsp/Makefile.in
        deleted:    lib/spandsp/aclocal.m4
        deleted:    lib/spandsp/config-h.in
        deleted:    lib/spandsp/config/depcomp
        deleted:    lib/spandsp/config/install-sh
        deleted:    lib/spandsp/config/ltmain.sh
        deleted:    lib/spandsp/config/missing
        deleted:    lib/spandsp/configure
        deleted:    lib/spandsp/doc/Makefile.in
        deleted:    lib/spandsp/spandsp-sim/Makefile.in
        deleted:    lib/spandsp/src/Makefile.in
        deleted:    lib/spandsp/test-data/Makefile.in
        deleted:    lib/spandsp/test-data/etsi/Makefile.in
        deleted:    lib/spandsp/test-data/etsi/fax/Makefile.in
        deleted:    lib/spandsp/test-data/itu/Makefile.in
        deleted:    lib/spandsp/test-data/itu/fax/Makefile.in
        deleted:    lib/spandsp/test-data/local/Makefile.in
        deleted:    lib/spandsp/tests/Makefile.in

which are files handled by dh_autoreconf.
The next run of gbp buildpackage --git-ignore-new stops at
dpkg-source complaining error: aborting due to unexpected
upstream changes 

Would it make sense to have them in Files-Excluded, too?
> 
> In the end your only difference between the upstream branch and the
> master branch should be within debian/.

Well, I hope this is getting closer.

Bye,

Joerg
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 898 bytes
Desc: not available
URL: <http://alioth-lists.debian.net/pipermail/pkg-voip-maintainers/attachments/20180418/1f6a1e7e/attachment.sig>