On 16 May 2013 06:19, Galen Charlton <gmc@esilibrary.com> wrote:
Hi,
Via the magic of git cherry-pick -X ignore-space-change, it turns out that at least some patches made on Koha's fork of SipServer (a.k.a. OpenNCIP) can be brought over mostly as is.
For example, consider Koha bug 3723 [1], SIPServer bug 1180479 [2], and the patch of Colin's I was able to cherry-pick as a proposed fix for SIPServer [3].
SIPServer is a GPL2+ project (though note that although the license change from GPL2 to GPL2+ has been agreed to by all significantly copyright holders, there's a patch pending to update the source files accordingly). Koha, of course, is GPL3+ and once was GPL2+.
Per my reading of the GPL compatibility matrix [4], I don't see any licensing bar to cherry-picking patches over from Koha to SIPServer, because future releases of SIPServer can be "conveyed" as GPL3.
Consequently, I intend to do some cherry-picking to help move us to the point where Koha can fold its fork into.
If anybody sees a technical or licensing problem with this, please let me know.
Sorry for the late reply, but no, I see no problem with this Chris