[DRE-commits] r4505 - trunk/ohai/debian

[Bryan McLellan]

Author: btm-guest
Date: 2010-01-07 22:21:52 +0000 (Thu, 07 Jan 2010)
New Revision: 4505

Added:
   trunk/ohai/debian/ohai-doc.doc-base
Modified:
   trunk/ohai/debian/changelog
   trunk/ohai/debian/copyright
Log:
ohai: add doc-base, fix changelog date format, update copyright


Modified: trunk/ohai/debian/changelog
===================================================================
--- trunk/ohai/debian/changelog	2010-01-07 21:50:47 UTC (rev 4504)
+++ trunk/ohai/debian/changelog	2010-01-07 22:21:52 UTC (rev 4505)
@@ -8,7 +8,7 @@
   * New upstream release
   * Add Joshua Timberman to uploaders
 
- -- Bryan McLellan <btm at loftninjas.org> Thu, 07 Jan 2010 12:51:20 -0800
+ -- Bryan McLellan <btm at loftninjas.org>  Thu, 07 Jan 2010 12:51:20 -0800
 
 ohai (0.3.2-1) unstable; urgency=low
 

Modified: trunk/ohai/debian/copyright
===================================================================
--- trunk/ohai/debian/copyright	2010-01-07 21:50:47 UTC (rev 4504)
+++ trunk/ohai/debian/copyright	2010-01-07 22:21:52 UTC (rev 4505)
@@ -9,8 +9,13 @@
     Copyright 2008-2009, Adam Jacob <adam at opscode.com>
     Copyright 2008-2009, Ben Black <nostromo at gmail.com>
     Copyright 2008-2009, Ezra Zygmuntowicz <ezra at engineyard.com>
+    Copyright 2008-2009, Bryan McLellan <btm at loftninjas.org>
     Copyright 2009, Joe Williams <joe at joetify.com>
     Copyright 2009, Paul Nasrat <pnasrat at googlemail.com>
+    Copyright 2008, Arjuna Christensen <aj at hjksolutions.com>
+    Copyright 2009, Daniel DeLeo <dan at kallistec.com>
+    Copyright 2009, Diego Algorta <diego at oboxodo.com>
+    Copyright 2009, Mathieu Sauve-Frankel <msf at kisoku.net>
 
 License:
 
@@ -29,5 +34,36 @@
     On Debian systems, the complete text of the Apache License, version 2.0,
     can be found in /usr/share/common-licenses/Apache-2.0
 
-The Debian packaging is © 2009, Bryan McLellan <btm at loftninjas.org> and
-is licensed under the GPL version 2, see `/usr/share/common-licenses/GPL-2'.
+lib/ohai/mixin/command.rb:
+
+    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 3 of the License, or
+    (at your option) any later version.
+    
+    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.
+    
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+    On Debian GNU/Linux systems, the complete text of version 3 of the GNU
+    General Public License can be found in `/usr/share/common-licenses/GPL-3'
+
+The Debian packaging is © 2010, Bryan McLellan <btm at loftninjas.org> and
+is licensed under the Apache License version 2.0. On Debian and derived
+systems, see `/usr/share/common-licenses/Apache-2.0' for the complete text.
+
+    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
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    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.

Added: trunk/ohai/debian/ohai-doc.doc-base
===================================================================
--- trunk/ohai/debian/ohai-doc.doc-base	                        (rev 0)
+++ trunk/ohai/debian/ohai-doc.doc-base	2010-01-07 22:21:52 UTC (rev 4505)
@@ -0,0 +1,9 @@
+Document: ohai
+Title: ohai API documentation
+Abstract: Rdoc-generated API documentation.
+Section: Programming/Ruby
+
+Format: HTML
+Index: /usr/share/doc/ohai-doc/rdoc/index.html
+Files: /usr/share/doc/ohai-doc/rdoc/*
+