-
Notifications
You must be signed in to change notification settings - Fork 683
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Please clean up the license. #9
Comments
@kou1okada you are referring to the header comments block in the code? That has never been altered and the LICENSE file does still state MIT. The original Google Code project is in fact still GPL v2 however I do not have control of that as I am only a committer. I'm happy to licence the header comments block as per the LICENSE file that Stephen Jungels created, however the Google Project will still state GPL v2 unless Stephen changes it. |
Hmm,,, Thanks. |
I understand your concern about the licensing, but if thats the case even the first commit is suspect, see How are we supposed to resolve that? Rebase the whole repo? |
Sorry, I couldn't understand the meaning about "first commit". The points of this license problem is below:
I'm sorry, that I have no idea to solve this problem without doing Thanks. |
This should now be fixed. I ran these commands git reset --hard 46fb5d3
git merge -X ours origin~21
git cherry master origin | awk '$0=$2' |
git cherry-pick --stdin --keep-redundant-commits -X theirs It ended up regressing the README somewhat, but that can be easily fixed. Let me |
I was originally trying to keep both the Google Code SVN project and this Git project in sync using git svn, that may help explain has this all came about in the first place. As to that is still possible going forward - I'm unsure as the repos are to be licensed differently. What do you think @svnpenn ? |
If MIT will help with collaboration I vote for that, but personally I dont care as long as the code works. |
Agreed. p.s. Thanks for helping out with the repo. |
I am innocent on that, it was even on first commit 2af0c86 |
Not trying to blame, just bringing up as it seemed relevant to this discussion is all. |
I appreciate you to clean up about license problem. Thanks. |
@kou1okada ok then, can we consider this issue closed? |
Yes, please. |
Welcome a new maintainer of the transcode-open/apt-cyg.
I'm happy to get a chance to merge our code to the trunk line.
But, ...
The original apt-cyg has been licensed under the GPLv2.
In this repository, the apt-cyg was re-published under the MIT license by Stephen Jungels who is the original author of the apt-cyg.
But why do you re-introduce the GPLv2 code into this repository from the original apt-cyg?
It produces serious conflicts of the license.
You can merge our code, but we can't merge your's.
I think that the initial revision to merge forks must be fc54d5c, not the clone from the original apt-cyg on the Google Code (45de191).
And it must be merged back to the original apt-cyg on the Google Code.
It's clean way for the MIT license.
Maybe, any other way remains the affect of the GPLv2.
I'll be happy, if you clean up the license problem.
Thank you.
The text was updated successfully, but these errors were encountered: