[scribus-dev] Scribus CTL

Khaled Hosny khaledhosny at eglug.org
Sun Feb 21 15:00:03 UTC 2016


On Tue, Feb 16, 2016 at 10:44:12AM +0100, ale rimoldi wrote:
> hey dawood
> 
> >
> >I am trying to apply the attached patches on updated Scribus SVN but I
> >face a lot of merge conflicts.
> >
> 
> could you find a way to manage the conflicts?

We managed to finally rebase the work, it can now be found at:
https://github.com/HOST-Oman/scribus/tree/boxes

It builds and runs, but some regressions were introduced during the
(complex) rebase, we are now tracking them down then back to completing
the work. We really appreciate if people can poke around and tell us if
we are moving on the right direction.

Regards,
Khaled

P.S. Since Andreas is not responding again and the more we work on the
code the harder it is to rebase, we had to abandon work on the old pull
request to his GitHub repository in order to be able to rebase the code. 



More information about the scribus-dev mailing list