Backporting features from trunk to 1.6.x

Hello,

I'm new to the subversion users mailing list.

Due to a larger subversion server setup, I would like to backport the AuthzSVNReposRelativeAccessFile feature of the Apache authz module.
This backport patch is based on the revisions 1030536 and 1071781. Except one small change due to missing API calls.
So far, it doesn't seem to be a problem.

But then I've realized that the code license has been changed between the 1.6.x releases and the current trunk including the code mentioned above.
Is it allowed to use new change sets (from trunk, Apache License) in combination with the codebase of version 1.6.x (CollabNet License)?
Or, does it violate the licenses?

I want to host the backport as Debian/Ubuntu package at a Launchpad ppa (personal package archive).
Do I've to mention the license change somewhere in the package/patch, if I include change sets from trunk? Or does everything sticks on the old license?

Best regards

Björn
Received on 2011-06-21 13:30:43 CEST