[iaxmodem REMOVED from testing]

[Bernhard Schmidt]

On 25.04.2018 17:53, Joerg Dorchain wrote:

Hi Jörg,

>> 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?
> 
> I have added them to excludes and make a few other changes
> related to that.

Sorry for the delay.

> There is now a repository at
> https://salsa.debian.org/dorchain-guest/iaxmodem where you can
> 
> git clone https://salsa.debian.org/dorchain-guest/iaxmodem.git
> cd iaxmodem
> mk-origtargz ../iaxmodem-1.3.0.tar.gz
> git checkout upstream
> git checkout master
> gbp import-orig ../iaxmodem_1.3.0~dfsg.orig.tar.gz

I was about to suggest uscan for this, since it usually does the right
thing and makes a lot of things easier. But not in this case, because
the embedded libspandsp also has a debian/watch file.

$ find | grep debian/watch
./lib/spandsp/debian/watch
./debian/watch

and of course uscan tries to update both. *sigh* This is a bit similar
to https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=895982 .

Okay, let's do it that way (sourceforge is really getting worse every day)

wget
https://netix.dl.sourceforge.net/project/iaxmodem/iaxmodem/iaxmodem-1.3.0.tar.gz
gbp clone https://salsa.debian.org/dorchain-guest/iaxmodem.git
cd iaxmodem
mk-origtargz ../iaxmodem-1.3.0.tar.gz
gbp import-orig ../iaxmodem_1.3.0~dfsg.orig.tar.gz

> Question: Is this the proper commit to push? 

The resulting packages looks good.

I'm not happy about the repository though, and this is my only complaint
at this point. The base already in
https://salsa.debian.org/pkg-voip-team/iaxmodem/ has the full upstream
version 1.3.0 imported, including the files we don't want to be
distributed within Debian. Also there is a 1.3.0 and a 1.3.0_dfsg
upstream version in there, with multiple merges and deleting files
outside debian/ . I think this is messy and will confuse everyone trying
to make sense of this repository. If iaxmodem development were still
active this would have been forgotten at some point, but in the current
state everyone having a cursory glance at the repository in the next
years will think "wtf?!".

I'm seriously thinking that rolling it back to before 1.3.0 and doing a
force-push of a fixed up repo would be the better option in the long run.

Jonas/Tzafrir/all, what do you think?

This worked with my local fork

gbp clone https://salsa.debian.org/pkg-voip-team/iaxmodem
cd iaxmodem
git reset --hard 182a2ccda660172ab28cb16e5f7783488d6e5842
git checkout upstream
git reset --hard 4baf60113a7d05133bfb2a8caae9161271aff38f
git remote set-url origin git at salsa.debian.org:berni/iaxmodem.git
[ unprotect master branch in Gitlab ]
git push --force --all

Then I'd copy in the machine-readable d/copyright and restart with the
mk-origtargz / gbp import-orig part from above. Then add all your
changes (tidied/grouped together nicely, since we're already changing
history) and done.

Bernhard