[iaxmodem REMOVED from testing]

[Bernhard Schmidt]

Am 20.03.2018 um 14:32 schrieb Joerg Dorchain:
> On Mon, Mar 19, 2018 at 10:11:42PM +0100, Bernhard Schmidt wrote:
>>
>> I've taken a look at your package.
> 
> Thanks!
>>
>> First of all (probably caused by you not wanting to pollute the standard
>> branches, which is a good thing) the repo does not really adhere to the
>> normal git-buildpackage standards. Your have directly imported the new
>> upstream version into the master/1.3.0 branch. You should import it in
>> the upstream branch and then merge the upstream branch into your target
>> branch.
>>
>> gbp import-orig
>>
>> should do the right thing.
> 
> I did not know that tool. Naively using it in my default branach I
> probably messed up my repos. Can you maybe help me a bit with
> proper use?
> 
> - Cechkout current master anew.
> - Then do the gbp import-orig
> - Then adapt the debian directory
> 
> Is this correct?

Best would be

gbp clone <salsaurl>
gbp import-orig <tarball>
- this would checkout the upstream branch, import your tarball, tag it,
then merge it back into master
edit debian/ ...

Since you need to dfsg-repack you need to specify the tarball manually.
You could also convert d/copyright into the machine readable format and
then add Files-Excluded, which would allow gbp import-orig --uscan to do
the repacking automatically.

I'm ambiguous about --pristine-tar. If you use it, please add it to
d/gbp.conf .

If you are unsure you can first clone the salsa repo into your personal
namespace and work there.

Bernhard