Alrighty. Licenses and Copyright information are updated along with a few other minor things (drop unneeded files, update setup.py text, etc).
I also added a new JIRA component for obs4MIPs. I figured it would be beneficial to have a separate component until it is more fully integrated into the rest of the code base. At the very least we now have something useful to tag related issues with! Thanks! -- Joyce On Tue, Sep 17, 2013 at 10:57 PM, Chris Mattmann <[email protected]>wrote: > Denis, +1 this plan makes total sense to me. > > Cheers, > Chris > > > > -----Original Message----- > From: Denis Nadeau <[email protected]> > Date: Tuesday, September 17, 2013 10:07 PM > To: "[email protected]" <[email protected]> > Cc: jpluser <[email protected]>, "Carriere, Laura E. > (GSFC-606.2)[COMPUTER SCIENCE CORP]" <[email protected]> > Subject: Re: Adding headers to obs4MIPs > > >Mike, > > > >It seems from what I am reading that you can add the NOSA copyright at > >the end of the NOTICE file. At least this section needs to be in the > >NOTICE file: > > > >Copyright © 2012-2013 United States Government as represented by the > >Administrator of the National Aeronautics and Space Administration. All > >Other Rights Reserved > > > >You can delete the Header section from the source files and put the ASF > >copyright instead. As long as the copyright is in the NOTICE file, we > >should be fine. > > > >They also want a changelog file showing that it is a modification from > >the Original software. maybe in the CHANGES.txt file we could say: > > > >** New Feature > > * [CLIMATE-!!!] - Adding obs4MIPs 1.0 from NASA > > > >Does this make sense? > > > >Denis > > > >On 09/17/2013 11:00 AM, Michael Joyce wrote: > >> Hi Denis, > >> > >> I was perusing the ASF docs on source headers [1] and it seems like they > >> want us to move Copyright notifications out of the source code headers > >>and > >> into the NOTICE file. What does everyone think about this? I'm not very > >> familiar with this process so hopefully someone more versed in this > >>stuff > >> can comment. > >> > >> I'll take care of updating the licenses and dropping the setup file. > >> > >> [1] https://www.apache.org/legal/src-headers.html > >> > >> Cheers! > >> Mike > >> > >> > >> -- Joyce > >> > >> > >> On Mon, Sep 16, 2013 at 8:18 AM, denis.nadeau <[email protected]> > >>wrote: > >> > >>> Hi Joyce, > >>> > >>> I wanted to deleted that setup.sh and did not have time to do it. As > >>>for > >>> the copyright, I've read the lawyer document and it seems that section > >>>B, C > >>> and D applies here, in "OBLICATIONS OF RECIPIENT" section. So we can > >>> delete the license up to the copyright section. I followed GEOS5.org > >>> opensource software for the copyright... > >>> > >>> B. Each Recipient must ensure that the following copyright notice > >>>appears > >>> prominently in the Subject Software: > >>> Copyright © 2012-2013 United States Government as represented by the > >>> Administrator of the National Aeronautics and Space Administration. All > >>> Other Rights Reserved > >>> > >>> C. Each Contributor must characterize its alteration of the Subject > >>> Software as a Modification and must identify itself as the originator > >>>of > >>> its Modification in a manner that reasonably allows subsequent > >>>Recipients > >>> to identify the originator of the Modification. In fulfillment of these > >>> requirements, Contributor must include a file (e.g., a change log file) > >>> that describes the alterations made and the date of the alterations, > >>> identifies Contributor as originator of the alterations, and consents > >>>to > >>> characterization of the alterations as a Modification, for example, by > >>> including a statement that the Modification is derived, directly or > >>> indirectly, from Original Software provided by Government Agency. Once > >>> consent is granted, it may not thereafter be revoked. > >>> > >>> D. A Contributor may add its own copyright notice to the Subject > >>>Software. > >>> Once a copyright notice has been added to the Subject Software, a > >>>Recipient > >>> may not remove it without the express permission of the Contributor who > >>> added the notice. > >>> > >>> Denis > >>> > >>> On 9/16/13 10:34 AM, Michael Joyce wrote: > >>> > >>> Hi all, > >>> > >>> I was going to go through the obs4MIPs code to add any necessary > >>>headers > >>> but first I wanted to make sure we were all on the same page. Are we > >>> replacing all the NOSA headers with ASF headers or are we just adding > >>> headers to any files that aren't currently licensed? > >>> > >>> Also, I wanted to confirm that we could drop [1]. It seems to be > >>>machine > >>> dependent but I wasn't sure if we were keeping it in there as an > >>>example > >>> (in which case we should make it machine agnostic as well =) > >>> > >>> Cheers! > >>> > >>> > >>>[1] > https://svn.apache.org/repos/asf/incubator/climate/trunk/obs4MIPs/set > >>>up.sh > >>> > >>> -- Joyce > >>> > >>> > >>> > >>> > >>> -- > >>> ----------------------------------------------------- > >>> Denis Nadeau, (CSC) > >>> NCCS (NASA Center for Climate Simulation) > >>> NASA Goddard Space Flight Center > >>> Mailcode 606.2 > >>> 8800 Greenbelt Road > >>> Greenbelt, MD 20771 > >>> Email: [email protected] > >>> Phone: (301) 286-7286 Fax: 301.286.1634 > >>> ----------------------------------------------------- > >>> > >>> > > > > >
