[iaxmodem REMOVED from testing]

[Joerg Dorchain]

On Sun, May 06, 2018 at 11:16:09PM +0200, Bernhard Schmidt wrote:
> 
> Sorry for the delay.

No problem.

> 
> 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

After reading man pagges of uscan and uuupdate it is my understanding that
this would be the result.
> 
> > 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?

Fine with me. I started thinking of removing the 1.3.0 branch, or at least
going back to that point.
> 
> 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

I would not swear on the commit uids, but essentially this is my idea, too.
> 
> 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.

Well, the important things are in the head my the forked repo, so there is
always a way back.
Basically the procedure is what I would so.

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/20180507/326a39f8/attachment.sig>