[geomoose-psc] Motion: expand existing license to cover all unspecified contents of geomoose SVN (documentation included)

[Jim Klassen]

I just did a dry run of this to verify how it should work.  Eli, why don't you give it a try.

# Make a temporary work space
mkdir temp-gm
cd temp-gm

# Checkout the branch
svn co https://svn.osgeo.org/geomoose/geomoose2/branches/geomoose-2.6/sphinx-docs
cd sphinx-docs

# Merge in the changes from trunk
svn merge https://svn.osgeo.org/geomoose/geomoose2/trunk/sphinx-docs

# Look at merge conflicts and resolve them as needed.  (tc blindly accepts the trunk version)
svn commit -m 'Merged in documentation changes from trunk'


On Oct 11, 2012, at 11:45 AM, Eli Adam wrote:

> On Thu, Oct 11, 2012 at 9:36 AM, Dan Little <danlittle at yahoo.com> wrote:
>> Should we add a "sphinx-docs/source/LICENSE.rst" page to clarify?
> 
> Sure.
> 
> Also as an FYI, only http://geomoose.org/trunk/ will show the r916
> update at the bottom until our next release when it will also be
> visible on http://geomoose.org
> 
> Eli
> 
>> 
>> ________________________________
>> From: Eli Adam <eadam at co.lincoln.or.us>
>> To: "geomoose-psc at lists.osgeo.org" <geomoose-psc at lists.osgeo.org>
>> Sent: Thursday, October 11, 2012 11:33 AM
>> Subject: Re: [geomoose-psc] Fwd: Motion: expand existing license to cover
>> all unspecified contents of geomoose SVN (documentation included)
>> 
>> With +1 from JimK, Bobb, Brent, Brian, Dan and me, the motion to
>> extend our existing license to all otherwise unspecified contents of
>> svn passes.  This includes the sphinx docs and excludes any external
>> libraries.
>> 
>> This is already largely implied with,
>> http://trac.osgeo.org/geomoose/browser/geomoose2/trunk/LICENSE
>> 
>> However, I've now updated the bottom line on our webpage, to directly
>> state that, http://trac.osgeo.org/geomoose/changeset/916/
>> 
>> Eli
>> 
>> On Thu, Oct 11, 2012 at 7:29 AM, Dan Little <danlittle at yahoo.com> wrote:
>>> Thought I was subscribed but looks like I created an account but never
>>> actually activated the account.  (I used the admin panel.)
>>> 
>>> I'm fine with +1'ing this.  The docs, IMO, are valuable to us and not
>>> others
>>> so I don't think a CC by SA or other such license will provide much
>>> benefit.
>>> Also, if something in our docs are valuable to others than adding to the
>>> global mind-share in a free (as in speech) is more inline with my thinking
>>> anyway.
>>> 
>>> ________________________________
>>> From: Eli Adam <eadam at co.lincoln.or.us>
>>> To: Brent Fraser <bfraser at geoanalytic.com>; Brian Fischer
>>> <bfischer at houstoneng.com>; danlittle at yahoo.com
>>> Sent: Wednesday, October 10, 2012 11:11 PM
>>> Subject: Fwd: [geomoose-psc] Motion: expand existing license to cover all
>>> unspecified contents of geomoose SVN (documentation included)
>>> 
>>> If you guys have not already signed up for the psc email list, please do
>>> so.
>>> 
>>> Thanks, Eli
>>> 
>>> 
>>> ---------- Forwarded message ----------
>>> From: Basques, Bob (CI-StPaul) <bob.basques at ci.stpaul.mn.us>
>>> Date: Wed, Oct 10, 2012 at 7:25 AM
>>> Subject: RE: [geomoose-psc] Motion: expand existing license to cover
>>> all unspecified contents of geomoose SVN (documentation included)
>>> To: "eadam at co.lincoln.or.us" <eadam at co.lincoln.or.us>,
>>> "geomoose-psc at osgeo.org" <geomoose-psc at osgeo.org>
>>> 
>>> 
>>> +1
>>> 
>>> Bobb
>>> 
>>> 
>>> 
>>>>> -----Original Message-----
>>>>> From: geomoose-psc-bounces at lists.osgeo.org [mailto:geomoose-psc-
>>>>> bounces at lists.osgeo.org] On Behalf Of Eli Adam
>>>>> Sent: Tuesday, October 09, 2012 5:57 PM
>>>>> To: geomoose-psc at osgeo.org
>>>>> Subject: [geomoose-psc] Motion: expand existing license to cover
>>>>> all unspecified contents of geomoose SVN (documentation included)
>>>>> 
>>>>> On the to-do list for incubation is to directly state a
>>>>> documentation license.  At the last PSC meeting, those present
>>>>> were in favor of extending our existing license to all svn
>>>>> contents (unless noted otherwise with their own included licenses
>>>>> like included libraries).
>>>>> 
>>>>> This does not apply to included libraries and other files that
>>>>> may already have a license header.
>>>>> This does cover all the sphinx documentation.
>>>>> The motion will be open for voting for two full business days.
>>>>> 
>>>>> 
>>>>> Motion to extend our existing license,
>>>>> http://www.geomoose.org/info/license.html, to cover all otherwise
>>>>> unspecified contents of GeoMOOSE svn.
>>>>> 
>>>>> I'll start voting:
>>>>> +1 Eli
>>>>> _______________________________________________
>>>>> geomoose-psc mailing list
>>>>> geomoose-psc at lists.osgeo.org
>>>>> http://lists.osgeo.org/cgi-bin/mailman/listinfo/geomoose-psc
>>> 
>>> 
>> _______________________________________________
>> geomoose-psc mailing list
>> geomoose-psc at lists.osgeo.org
>> http://lists.osgeo.org/cgi-bin/mailman/listinfo/geomoose-psc
>> 
>> 
> _______________________________________________
> geomoose-psc mailing list
> geomoose-psc at lists.osgeo.org
> http://lists.osgeo.org/cgi-bin/mailman/listinfo/geomoose-psc