Re: upstreaming some fedora distro patches for simon
Peter Grasch <[email protected]>
| Newsgroups | gmane.comp.kde.devel.accessibility |
|---|---|
| Message-ID | <[email protected]> |
Hi, On 08/10/2013 09:00 PM, Rex Dieter wrote: > Hi, just checked out simon from git, saw branches: > master > remotes/origin/0.5 > remotes/origin/0.4 > > So, first off, if I were to make reviewboard requests, should I make them > against master? 0.5? Master, please. > For obvious/simple fixes, what's the prefered workflow? commit to some > stable branch and merge forward, or commit+cherry-pick ? Merging forward is preferred. > Here's what I'm looking to get upstream first, > > http://pkgs.fedoraproject.org/cgit/simon.git/tree/simon-0.4.0-LIB_SUFFIX.patch > http://pkgs.fedoraproject.org/cgit/simon.git/tree/simon-0.4.0-libeventsimulation_soname.patch > http://pkgs.fedoraproject.org/cgit/simon.git/tree/simon-0.4.0-speechmodelcompilation-kconfig.patch Great! > and to get simond/default.jconf fixed (or removed). The commented headers > of this file says "All rights reserved", so is not compliant with kde > licensing policy and not redistributable. Ah, right. It's based on a copy of the default config file. The configuration options itself are definitely not copyrighted, but you can just remove the comments from the file as they technically could be. Honestly, that shouldn't be a problem - this is meant to be only changed by power users who know what they want (the defaults are fine except for very, very specialized cases). Thanks, btw! Best regards, Peter