[warzone2100-dev] Debian and warzone2100 2.3.0 issues (Dydo-AI etc)
Hi all, [Please CC me on reply, I'm not subscribed] I just started reviewing the changes between 2.2.4 and 2.3.0 so I could upload warzone2100 2.3.0 to Debian. Unfortunately I noted that the new mod Dydo-AI is CC-NC-SA licensed according to the readme.txt[1]. Unfortunately CC-NC-SA conflicts with the DFSG so I can't upload until this is fixed. I'd suggest it be re-licensed under either GPLv2+ (standard wz license), CC-BY 3.0 or CC-BY-SA 3.0. In addition the COPYING.NONGPL file needs to be updated. Also the embedded miniupnpc and iniparser copies are missing their LICENSE files. For iniparser, this is a license violation. For miniupnpc it is less of an issue because some of the files contain a copy of the license. In future, I'd really really prefer that you add stuff to devpkg instead of adding embedded code copies like iniparser, miniupnpc, GLee, sqlite and parts of others like BFD, SDL_framerate. autoconf macros are usually OK as long as you don't store them in SVN but get them by running autoreconf. 1. http://warzone2100.svn.sf.net/viewvc/warzone2100/tags/2.3.0/data/mods/multiplay/dydo-ai/multiplay/skirmish/readme.txt -- bye, pabs http://wiki.debian.org/PaulWise signature.asc Description: This is a digitally signed message part ___ Warzone-dev mailing list Warzone-dev@gna.org https://mail.gna.org/listinfo/warzone-dev
Re: [warzone2100-dev] Debian and warzone2100 2.3.0 issues (Dydo-AI etc)
On Sun, Apr 25, 2010 at 8:58 AM, Paul Wise p...@debian.org wrote: [Please CC me on reply, I'm not subscribed] I just started reviewing the changes between 2.2.4 and 2.3.0 so I could upload warzone2100 2.3.0 to Debian. Unfortunately I noted that the new mod Dydo-AI is CC-NC-SA licensed I suggest you drop it until this has been resolved. Also the embedded miniupnpc and iniparser copies are missing their LICENSE files. For iniparser, this is a license violation. Can you fix this by including the LICENSE file in your distribution copy? Then we will fix this for 2.3.1. In future, I'd really really prefer that you add stuff to devpkg instead of adding embedded code copies like iniparser, miniupnpc, GLee, sqlite and parts of others like BFD, SDL_framerate. Our iniparser is a heavily modified fork and needs to be included. GLee is a single file and meant to be included; it also has some local modifications. We no longer use or include sqlite, if you still have it as a dependency that would be an error on your part. SDL_framerate is not a library, it is a (to be heavily modified in Qt branch) ripped out code from some SDL aux library, so it cannot be externalized. I do not know what BFD is. - Per ___ Warzone-dev mailing list Warzone-dev@gna.org https://mail.gna.org/listinfo/warzone-dev
Re: [warzone2100-dev] Debian and warzone2100 2.3.0 issues (Dydo-AI etc)
On Sunday, 25 April 2010 at 14:58, Paul Wise wrote: Also the embedded miniupnpc and iniparser copies are missing their LICENSE files. For iniparser, this is a license violation. For miniupnpc it is less of an issue because some of the files contain a copy of the license. For miniupnpc, I've included what was in the tarball, seems like the author didn't include a separate license file. In future, I'd really really prefer that you add stuff to devpkg instead of adding embedded code copies like iniparser, miniupnpc, GLee, sqlite and parts of others like BFD, SDL_framerate. autoconf macros are usually OK as long as you don't store them in SVN but get them by running autoreconf. I think sqlite when it was used was needed some specific version, so that was included. miniupnpc wasn't in Debian at least, and since we don't use Linux devpackages I included that (and the alternative upnp libraries sucked for various reasons), glee was the same I think. Generally I also prefer external libs, but then we need someone to update all our buildsystems/devpackages. I can do the autoconf stuff, maybe the Windows cross-build, that leaves at least three other systems (Mac, MSVC, the mingw32 makefiles), which all need to be apapted to the new stuff (with new devpackages etc.). ___ Warzone-dev mailing list Warzone-dev@gna.org https://mail.gna.org/listinfo/warzone-dev
Re: [warzone2100-dev] Debian and warzone2100 2.3.0 issues (Dydo-AI etc)
On Sun, 2010-04-25 at 10:47 +0200, Per Inge Mathisen wrote: On Sun, Apr 25, 2010 at 8:58 AM, Paul Wise p...@debian.org wrote: [Please CC me on reply, I'm not subscribed] I just started reviewing the changes between 2.2.4 and 2.3.0 so I could upload warzone2100 2.3.0 to Debian. Unfortunately I noted that the new mod Dydo-AI is CC-NC-SA licensed I suggest you drop it until this has been resolved. Folks on IRC suggested that would be easy to resolve so I was going to wait for 2.3.1 to be released. Also the embedded miniupnpc and iniparser copies are missing their LICENSE files. For iniparser, this is a license violation. Can you fix this by including the LICENSE file in your distribution copy? Then we will fix this for 2.3.1. I'll include them in debian/copyright. Our iniparser is a heavily modified fork and needs to be included. Any plans to get the relevant changes merged upstream? GLee is a single file and meant to be included; it also has some local modifications. Those modifications look like just s/void// in GLee.h and no changes in GLee.c so dropping the embed should be fine? We no longer use or include sqlite, if you still have it as a dependency that would be an error on your part. I don't, that was just one of the embeds I remembered. SDL_framerate is not a library, it is a (to be heavily modified in Qt branch) ripped out code from some SDL aux library, so it cannot be externalized. OK. I do not know what BFD is. Binary File Descriptor library. It is part of binutils (ld, as, strip, ranlib etc). For some reason wz 2.3.0 includes 3 headers from it (2 private). -- bye, pabs http://wiki.debian.org/PaulWise signature.asc Description: This is a digitally signed message part ___ Warzone-dev mailing list Warzone-dev@gna.org https://mail.gna.org/listinfo/warzone-dev
Re: [warzone2100-dev] Debian and warzone2100 2.3.0 issues (Dydo-AI etc)
On Sun, 2010-04-25 at 14:03 +0200, Christian Ohm wrote: For miniupnpc, I've included what was in the tarball, seems like the author didn't include a separate license file. The latest version (1.4) does include one. Which version did you include? I think sqlite when it was used was needed some specific version, so that was included. It would have be better to check in configure.ac for the right version and refuse to build without it, like it does for flex. miniupnpc wasn't in Debian at least, and since we don't use Linux devpackages I included that (and the alternative upnp libraries sucked for various reasons), glee was the same I think. miniupnpc is still out of Debian, because iptables upstream doesn't bless iptables.h as public API and the Debian iptables maintainer doesn't want to deviate from upstream. See the ITP bug for more info: http://bugs.debian.org/444392 GLee is now in Debian, the wz copy has some minor modifications. Generally I also prefer external libs, but then we need someone to update all our buildsystems/devpackages. I can do the autoconf stuff, maybe the Windows cross-build, that leaves at least three other systems (Mac, MSVC, the mingw32 makefiles), which all need to be apapted to the new stuff (with new devpackages etc.). Yep, maintaining a distribution takes quite a bit of work, even a miniature one for platforms without dependencies and repositories. -- bye, pabs http://wiki.debian.org/PaulWise signature.asc Description: This is a digitally signed message part ___ Warzone-dev mailing list Warzone-dev@gna.org https://mail.gna.org/listinfo/warzone-dev
Re: [warzone2100-dev] Debian and warzone2100 2.3.0 issues (Dydo-AI etc)
On Sunday, 25 April 2010 at 21:52, Paul Wise wrote: The latest version (1.4) does include one. Which version did you include? http://developer.wz2100.net/browser/tags/2.3.0/lib/netplay/miniupnpc says the license file is included, but maybe it's missing from the tarball. ___ Warzone-dev mailing list Warzone-dev@gna.org https://mail.gna.org/listinfo/warzone-dev
Re: [warzone2100-dev] Debian and warzone2100 2.3.0 issues (Dydo-AI etc)
On Sun, 2010-04-25 at 16:16 +0200, Christian Ohm wrote: http://developer.wz2100.net/browser/tags/2.3.0/lib/netplay/miniupnpc says the license file is included, but maybe it's missing from the tarball. Aha, so Makefile.am just needs an EXTRA_DIST line. -- bye, pabs http://wiki.debian.org/PaulWise signature.asc Description: This is a digitally signed message part ___ Warzone-dev mailing list Warzone-dev@gna.org https://mail.gna.org/listinfo/warzone-dev
Re: [warzone2100-dev] Debian and warzone2100 2.3.0 issues (Dydo-AI etc)
On Sun, Apr 25, 2010 at 3:49 PM, Paul Wise p...@debian.org wrote: Folks on IRC suggested that would be easy to resolve so I was going to wait for 2.3.1 to be released. There is no plan for when that is supposed to happen yet. Our iniparser is a heavily modified fork and needs to be included. Any plans to get the relevant changes merged upstream? No, because it is an adaptation to use it with the physicsfs library, and the upstream maintainer has not shown much willingness to integrate such things. (Or much of anything. Upstream has been idle for two years now.) - Per ___ Warzone-dev mailing list Warzone-dev@gna.org https://mail.gna.org/listinfo/warzone-dev
Re: [warzone2100-dev] Debian and warzone2100 2.3.0 issues (Dydo-AI etc)
On Sun, Apr 25, 2010 at 4:20 PM, Paul Wise p...@debian.org wrote: On Sun, 2010-04-25 at 16:16 +0200, Christian Ohm wrote: http://developer.wz2100.net/browser/tags/2.3.0/lib/netplay/miniupnpc says the license file is included, but maybe it's missing from the tarball. Aha, so Makefile.am just needs an EXTRA_DIST line. I see the same thing also applies to iniparser. The AUTHORS, README and LICENSE files are there in the repo, but missing mention in the Makefile.am - Per ___ Warzone-dev mailing list Warzone-dev@gna.org https://mail.gna.org/listinfo/warzone-dev
Re: [warzone2100-dev] Debian and warzone2100 2.3.0 issues (Dydo-AI etc)
On Sun, Apr 25, 2010 at 9:20 AM, Per Inge Mathisen per.mathi...@gmail.com wrote: On Sun, Apr 25, 2010 at 3:49 PM, Paul Wise p...@debian.org wrote: Folks on IRC suggested that would be easy to resolve so I was going to wait for 2.3.1 to be released. There is no plan for when that is supposed to happen yet. I mentioned it in IRC, but I suppose I'll mention it again now. I remember that relicensing DyDo-AI as CC-BY-SA-3.0 was one of the terms I got DylanDog to agree to so that we could accept his AI into our repository. The only reason why I'm not advocating outright editing the file with the new license is because I may have remembered incorrectly and we should wait for DylanDog to confirm. -Zarel ___ Warzone-dev mailing list Warzone-dev@gna.org https://mail.gna.org/listinfo/warzone-dev
Re: [warzone2100-dev] Debian and warzone2100 2.3.0 issues (Dydo-AI etc)
First of all: I am sorry I had really NO TIME to play with my laptops recently, no email, internet, games, Dydo...really nothing...apologies for this. Second: I really do not care that much about licence, on the website I had releasd it under GPLV3 http://www.obooma.net/dydo/?p=201 and I forgot to update the .txt file in the DyDo package. I wanted to do it now but again I have to turn off my pc in 2 minutes...I just had the time to see you have released 2.3. Well done guys. Zarel, feel free to do whatever you want with the DyDo files, I formally allow you to remove and modify them as you like. DylanDog 2010/4/25 Guangcong Luo za...@wz2100.net On Sun, Apr 25, 2010 at 9:20 AM, Per Inge Mathisen per.mathi...@gmail.com wrote: On Sun, Apr 25, 2010 at 3:49 PM, Paul Wise p...@debian.org wrote: Folks on IRC suggested that would be easy to resolve so I was going to wait for 2.3.1 to be released. There is no plan for when that is supposed to happen yet. I mentioned it in IRC, but I suppose I'll mention it again now. I remember that relicensing DyDo-AI as CC-BY-SA-3.0 was one of the terms I got DylanDog to agree to so that we could accept his AI into our repository. The only reason why I'm not advocating outright editing the file with the new license is because I may have remembered incorrectly and we should wait for DylanDog to confirm. -Zarel ___ Warzone-dev mailing list Warzone-dev@gna.org https://mail.gna.org/listinfo/warzone-dev ___ Warzone-dev mailing list Warzone-dev@gna.org https://mail.gna.org/listinfo/warzone-dev
