[DRE-commits] [SCM] ohai.git branch, master, updated. upstream/0.6.10-10-ga48fa5b

[Praveen Arimbrathodiyil]

The following commit has been merged in the master branch:
commit ea69319d6636e0bc6454a8fa9a3447c5401375b5
Author: Praveen Arimbrathodiyil <pravi.a at gmail.com>
Date:   Wed Feb 1 23:29:01 2012 +0530

    update copyright file with terms for all files

diff --git a/debian/copyright b/debian/copyright
index a55174c..a13d975 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,33 +1,115 @@
 Format: http://dep.debian.net/deps/dep5
 Upstream-Name: ohai
-Source: FIXME <http://example.com/>
+Source: https://github.com/opscode/ohai
 
 Files: *
-Copyright: <years> <put author's name and email here>
-           <years> <likewise for another author>
-License: GPL-2+ (FIXME)
- This program is free software; you can redistribute it
- and/or modify it under the terms of the GNU General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later
- version.
+Copyright: 2008-2011 Opscode, Inc
+License: Apache-2.0
+
+Files: lib/ohai/mash.rb
+Copyright: 2009 Dan Kubb
+	2005-2008 David Heinemeier Hansson
+License: Expat
+
+Files: lib/ohai/application.rb
+Copyright: 2009 Mathieu Sauve-Frankel
+License: Apache-2.0
+
+Files: lib/ohai/plugins/freebsd/cpu.rb
+Copyright: 2008 Bryan McLellan
+License: Apache-2.0
+
+Files: lib/ohai/plugins/netbsd/* lib/ohai/plugins/openbsd/*
+ lib/ohai/plugins/freebsd/* lib/ohai/plugins/darwin/uptime.rb 
+ spec/ohai/plugins/dmi_spec.rb
+Copyright: 2009 Bryan McLellan
+License: Apache-2.0
+
+Files: lib/ohai/plugins/netbsd/cpu.rb
+Copyright:2009 Mathieu Sauve-Frankel
+License: Apache-2.0
+
+Files: lib/ohai/plugins/chef.rb lib/ohai/plugins/ohai.rb
+Copyright: 2010 Tollef Fog Heen
+License: Apache-2.0
+
+Files: spec/ohai/plugins/chef_spec.rb spec/ohai/plugins/ohai_spec.rb
+Copyright: 2008 Opscode, Inc 
+	2010 Tollef Fog Heen <tfheen at err.no>
+License: Apache-2.0
+
+Files: lib/ohai/plugins/network_listeners.rb lib/ohai/plugins/groovy.rb 
+ lib/ohai/plugins/mono.rb lib/ohai/plugins/lua.rb lib/ohai/plugins/c.rb
+ lib/ohai/plugins/php.rb spec/ohai/plugins/mono_spec.rb 
+ spec/ohai/plugins/lua_spec.rb spec/ohai/plugins/php_spec.rb
+ spec/ohai/plugins/groovy_spec.rb
+Copyright: 2009 VMware, Inc
+License: Apache-2.0
+
+Files: lib/ohai/plugins/windows/cpu.rb lib/ohai/plugins/hpux/* 
+ lib/ohai/plugins/sigar/* lib/ohai/plugins/aix/* spec/ohai/plugins/c_spec.rb
+Copyright: 2010 VMware, Inc
+License: Apache-2.0
+
+Files: lib/ohai/plugins/ip_scopes.rb
+Copyright: 2010 Sociable Limited
+License: Apache-2.0
+
+Files: lib/ohai/plugins/dmi_common.rb lib/ohai/plugins/solaris2/dmi.rb
+ lib/ohai/plugins/dmi.rb 
+Copyright: 2010 Kurt Yoder
+License: Apache-2.0
+
+Files: lib/ohai/plugins/solaris2/*
+Copyright: 2008 Opscode, Inc
+	2009 Daniel DeLeo
+License: Apache-2.0
+
+Files: lib/ohai/plugins/sigar/network.rb
+Copyright: 2009 Matthew Kent
+License: Apache-2.0
+
+Files: spec/ohai/mixin/command_spec.rb
+Copyright: 2009 Matthew Kent
+License: Apache-2.0
+
+Files: debian/*
+Copyright: 2009 Bryan McLellan <btm at loftninjas.org>
+					 2011-2012 Praveen Arimbrathodiyil <pravi.a at gmail.com>
+License: Apache-2.0
+
+License: Apache-2.0
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
  .
- This program is distributed in the hope that it will be
- useful, but WITHOUT ANY WARRANTY; without even the implied
- warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE.  See the GNU General Public License for more
- details.
+     http://www.apache.org/licenses/LICENSE-2.0
  .
- You should have received a copy of the GNU General Public
- License along with this package; if not, write to the Free
- Software Foundation, Inc., 51 Franklin St, Fifth Floor,
- Boston, MA  02110-1301 USA
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
  .
- On Debian systems, the full text of the GNU General Public
- License version 2 can be found in the file
- `/usr/share/common-licenses/GPL-2'.
+ On Debian systems, the full text of the Apache License version 2.0 can be
+ found in the file `/usr/share/common-licenses/Apache-2.0'.
 
-Files: debian/*
-Copyright: 2012  <>
-License:
- [LICENSE TEXT]
+License: Expat
+ Permission is hereby granted, free of charge, to any person obtaining
+ a copy of this software and associated documentation files (the
+ 'Software'), to deal in the Software without restriction, including
+ without limitation the rights to use, copy, modify, merge, publish,
+ distribute, sublicense, and/or sell copies of the Software, and to
+ permit persons to whom the Software is furnished to do so, subject to
+ the following conditions:
+ .
+ The above copyright notice and this permission notice shall be
+ included in all copies or substantial portions of the Software.
+ .
+ THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+ CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

-- 
ohai.git