terminology git repo

Andreas Metzler ametzler at bebt.de
Tue May 1 11:57:58 BST 2018

On 2018-05-01 Ross Vandegrift <ross at kallisti.us> wrote:
> On Sun, Apr 29, 2018 at 01:39:42PM +0200, Andreas Metzler wrote:
>> I have just played a little bit around in terminology's git repo, trying
>> to import 1.2.0. 

> Cool, thanks - I had some work in progress for 1.2.0 as well, but didn't get
> through the lz4 patch.  I applied that on my updated debian/sid branch and
> pushed to salsa.  I haven't had a chance to test yet.


I have pushed an update for the lz4 patch. I had wondered why
terminology ended up not being linked against libz4. Upstream has
disabled to the code (#if 0) and -Wl,--as-needed dropped the unnecessary
library. Now the patch does not explicitely request lz4 linkage anymore
(I think this part should have gone into toplevel meson.build, anyway.)

>> debian/README.source has some instructions but critical pieces seem to
>> be missing:

> Yes, those instructions are not so good.  gbp has automation to
> replace it but I failed to update the README.source in terminology.
> d/gbp.conf now uses merge-mode=replace, and importing a new version is
> just:

> $ git fetch --tags upstream
> $ gbp import-orig --uscan

> README.source in efl & e17 have more info, but those could be improved too.
> Sorry for causing a waste of some time.

That seems to work for me, thanks. So the whole thing could be shortened
as attached?

> > I am also wondering whether it is worth the effort. Sure it sounds nice
> > to have a git repo that contains but upstream and Debian git history.
> > But is it worth the effort? Is there real benefit over just importing
> > the tarballs? (Personally I usually even go for a debian/-only repo.)

> With the better gbp workflow, I think the effort is pretty small.
> It's been useful to have everything in one repo when we needed to
> cherry-pick unreleased fixes.  Upstreaming patches has also been easy.
> But both are fairly rare, so if you think it's too much burden I'm
> open to simplifying.

With gbp doing the tricky work it is not bothersome. Let's keep it while it
is useful at least for one of us.

I just wanted to make sure that I also would be able to upgrade, that it
is not to complicated and documented, and that it served a purpose. ;-)

cu Andreas

`What a good friend you are to him, Dr. Maturin. His other friends are
so grateful to you.'
`I sew his ears on from time to time, sure'
-------------- next part --------------
A non-text attachment was scrubbed...
Name: stripdownREADME.source.diff
Type: text/x-diff
Size: 2884 bytes
Desc: not available
URL: <http://alioth-lists.debian.net/pipermail/pkg-e-devel/attachments/20180501/02a05dc0/attachment.diff>

More information about the Pkg-e-devel mailing list