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

Thu Mar 25 19:13:19 UTC 2010

Author: jtimberman-guest
Date: 2010-03-25 19:13:13 +0000 (Thu, 25 Mar 2010)
New Revision: 5017

Modified:
   trunk/ohai/debian/changelog
   trunk/ohai/debian/control
   trunk/ohai/debian/copyright
Log:
correcting discrepencies after updating from opscode's packaging git repo

Modified: trunk/ohai/debian/changelog
===================================================================

--- trunk/ohai/debian/changelog	2010-03-25 16:42:54 UTC (rev 5016)
+++ trunk/ohai/debian/changelog	2010-03-25 19:13:13 UTC (rev 5017)
@@ -1,13 +1,11 @@
 ohai (0.5.0-2) unstable; urgency=low
 
-  [Joshua Timberman]
-  * New maintainer.
-  * Fix remove_rubygems patch that missed bin/ohai. 
+  * Remove rubygems patch missed bin/ohai. 
   * ohai needs to depend on 'ruby' or it fails to process plugins.
 
  -- Joshua Timberman <joshua at opscode.com>  Tue, 09 Mar 2010 19:21:06 -0700
 
-ohai (0.5.0-1) unstable; urgency=low
+ohai (0.5.0-1) lucid; urgency=low
 
   * New upstream release (0.5.0).
     * [OHAI-155] - Chef summons army of dmidecode Zombies
@@ -18,16 +16,48 @@
 
 ohai (0.4.0-1) unstable; urgency=low
 
+  * New upstream release (0.4.0).
+    * [OHAI-119] - don't 'require rubygems' explicitly
+    * [OHAI-139] - ohai no longer requires json in gemspec, fails to
+      run if user doesn't install a json library
+    * [OHAI-140] - require rubygems in bin/ohai
+    * [OHAI-143] - ohai, running in chef-client, triggers a MRI segfault
+      probably related to garbage collection
+    * [OHAI-147] - exception on pretty_generate when specifying
+      an attribute with json 1.2.0
+    * [OHAI-150] - ohai network fails without default gateway
+    * [OHAI-84] - Extend Ohai to support more of the information found in
+      sys and proc, want to cover things found in dstat scope.
+    * [OHAI-7] - Command line should be sorted alphabetically, for the first keys
+    * [OHAI-151] - Support to include data from /etc/passwd and /etc/group
+    * [OHAI-137] - command.rb should be Apache 2.0 License
+
+ -- Joshua Timberman <joshua at opscode.com>  Sun, 28 Feb 2010 17:15:49 -0700
+
+ohai (0.3.6-2) unstable; urgency=low
+
   [Joshua Timberman]
-  * Libraries explicitly depend on own source version
+  * New maintainer.
+  * Fixing changelog entries missing between maintainers.
+  * Remove graphviz from build dep
+  * Bump standards version to 3.8.3
+  * Now requires libmixlib-{config,cli,log}-ruby
+  * Noting changes from upstream release (0.3.4)
+    * [OHAI-107] - EC2 spec tests fails when not connected to network
+    * [OHAI-111] - ec2 userdata gets truncated
+    * [OHAI-112] - when installed on ubuntu/debian packages w/o rubygems
+      ohai fails with a type error
+    * [OHAI-130] - Ruby plugin should pull configuration from ruby in the system path
+    * [OHAI-95] - Support multiple JSON libraries
+    * [OHAI-116] - Redhat platform version should include the subrelease
+    * [OHAI-120] - refactor ohai to use Mixlib
+  * Additional changes from upstream release (0.3.6)
+    * [OHAI-131] - ohai lies about its version
+    * [OHAI-134] - yajl-ruby causes incompatibility with json gem
+    * [OHAI-138] - create explicit dependencies on source version.
 
-  [Bryan McLellan]
-  * New upstream release
-  * Update copyright file
-  * Add versioned dependency on libmixlib-*-ruby
+ -- Joshua Timberman <joshua at opscode.com>  Fri, 08 Jan 2010 13:44:38 -0600
 
- -- Bryan McLellan <btm at loftninjas.org>  Mon, 01 Mar 2010 12:52:33 -0800
-
 ohai (0.3.6-1) unstable; urgency=low
 
   [Joshua Timberman]
@@ -54,7 +84,7 @@
 ohai (0.3.0-2) unstable; urgency=low
 
   * Move ruby-pkg-tools from Build-Depends-Indep to Build-Depends
-  * Bump standards to 3.8.2 
+  * Bump standards to 3.8.2
 
  -- Bryan McLellan <btm at loftninjas.org>  Fri, 19 Jun 2009 14:14:39 -0700
 

Modified: trunk/ohai/debian/control
===================================================================
--- trunk/ohai/debian/control	2010-03-25 16:42:54 UTC (rev 5016)
+++ trunk/ohai/debian/control	2010-03-25 19:13:13 UTC (rev 5017)
@@ -4,7 +4,7 @@
 Maintainer: Joshua Timberman <joshua at opscode.com>
 Uploaders: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
 Build-Depends: cdbs, debhelper (>= 7), ruby-pkg-tools (>= 0.14), quilt
-Build-Depends-Indep: graphviz, ruby1.8
+Build-Depends-Indep: ruby1.8
 Standards-Version: 3.8.3
 Vcs-Browser: http://svn.debian.org/viewsvn/pkg-ruby-extras/trunk/ohai/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-ruby-extras/trunk/ohai/

Modified: trunk/ohai/debian/copyright
===================================================================
--- trunk/ohai/debian/copyright	2010-03-25 16:42:54 UTC (rev 5016)
+++ trunk/ohai/debian/copyright	2010-03-25 19:13:13 UTC (rev 5017)
@@ -16,6 +16,7 @@
     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>
+    Copyright 2009, Cary Penniman <cary at rightscale.com>
 
 License:
 
@@ -37,15 +38,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.


