I've already merged the khalifate. If you're considering a new major version, you may also want to consider semantic versioning. [1] While it's mainly meant for libraries and such, our WML could definitely be called a "public API", which would leave us with the following versioning system: 2.0.0 = next incompatible version (new stable branch) 2.1.0 = next version with new features 2.1.1 = next version with only bugfixes
The main issue would be development releases, for which semantic versioning provides only 'pre-release labels'. This would work like this: 2.0.0-beta.1 = possibly the next dev version we release 2.0.0-rc.2 = a release candidate 3.0.0-alpha.1 = first dev release after the next stable The pre-release label can contain an arbitrary number of dot-separated identifiers, so you can also do this: 3.0.0-alpha.1.1 = hotfix for previous build [1] http://semver.org On Sun, Dec 22, 2013 at 2:31 PM, Nils Kneuper <[email protected]>wrote: > -----BEGIN PGP SIGNED MESSAGE----- > Hash: SHA1 > > Am 21.12.2013 23:10, schrieb George Birthisel: > > > > So what is needed? > > > > 1. unit descriptions updates - noy thinks this can be finished in the > next > > few days 2. files from umc-dev to be merged into trunk - I tried to do > this > > last time and created a number of problems. I will need help or someone > > who is better at this sort of thing to just do it. 3. double checking of > > missing parts/glaring errors 4. post merge testing to be sure everything > > works. > > > > Others? I don't know, I am fading fast and my mind is not very clear. I > > expect to be able to put in a lot of time toward this next week, but #2 > is > > what needs to happen the soonest and it will be slow if I do it. > > > > So that leaves me asking for help. If the khalifate are going to make it > > in into mainline for this release then some delay will be needed, > otherwise > > we punt...and maybe it happens "down the road". Apologies if this is > > rambling, I think I better just stop now. > > Yes, I will wait a little if you can get the Khalifate included in say the > next week. > > Cheers, > Nils Kneuper aka Ivanovic > -----BEGIN PGP SIGNATURE----- > Version: GnuPG v2.0.22 (GNU/Linux) > > iEYEARECAAYFAlK26asACgkQfFda9thizwUFsACdFvIhb8yDwL8hNRwTkhq3ZnMW > 9XQAoIWKPn8tOO2mhAdPUn1p3F49IbW3 > =N998 > -----END PGP SIGNATURE----- > > _______________________________________________ > Wesnoth-dev mailing list > [email protected] > https://mail.gna.org/listinfo/wesnoth-dev >
_______________________________________________ Wesnoth-dev mailing list [email protected] https://mail.gna.org/listinfo/wesnoth-dev
