[DRE-commits] r5016 - in trunk/ohai/debian: . patches

[Joshua Timberman]

Author: jtimberman-guest
Date: 2010-03-25 16:42:54 +0000 (Thu, 25 Mar 2010)
New Revision: 5016

Modified:
   trunk/ohai/debian/changelog
   trunk/ohai/debian/control
   trunk/ohai/debian/patches/remove_rubygems.patch
Log:
fix remove_rubygems to get bin/ohai and depend on ruby for language plugin

Modified: trunk/ohai/debian/changelog
===================================================================
--- trunk/ohai/debian/changelog	2010-03-25 06:55:06 UTC (rev 5015)
+++ trunk/ohai/debian/changelog	2010-03-25 16:42:54 UTC (rev 5016)
@@ -1,3 +1,21 @@
+ohai (0.5.0-2) unstable; urgency=low
+
+  [Joshua Timberman]
+  * New maintainer.
+  * Fix remove_rubygems patch that 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
+
+  * New upstream release (0.5.0).
+    * [OHAI-155] - Chef summons army of dmidecode Zombies
+    * [OHAI-166] - Make it possible to disable plugins
+  * Update man page w/ see also section.
+
+ -- Joshua Timberman <joshua at opscode.com>  Thu, 04 Mar 2010 12:48:35 -0700
+
 ohai (0.4.0-1) unstable; urgency=low
 
   [Joshua Timberman]

Modified: trunk/ohai/debian/control
===================================================================
--- trunk/ohai/debian/control	2010-03-25 06:55:06 UTC (rev 5015)
+++ trunk/ohai/debian/control	2010-03-25 16:42:54 UTC (rev 5016)
@@ -1,8 +1,8 @@
 Source: ohai
 Section: ruby
 Priority: extra
-Maintainer: Bryan McLellan <btm at loftninjas.org>
-Uploaders: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>, Joshua Timberman <joshua at opscode.com>
+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
 Standards-Version: 3.8.3
@@ -12,7 +12,7 @@
 
 Package: ohai
 Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, ruby1.8, libohai-ruby1.8 ( = ${source:Version} )
+Depends: ${shlibs:Depends}, ${misc:Depends}, ruby, libohai-ruby1.8 ( = ${source:Version} )
 Suggests: ohai-doc
 Description: Detects data about your operating system and reports it in JSON
  Information about your system is collected and returned as multidimensional
@@ -25,7 +25,7 @@
 
 Package: libohai-ruby
 Architecture: all
-Depends: ${misc:Depends}, libohai-ruby1.8 ( = ${source:Version} )
+Depends: ${misc:Depends}, ruby, libohai-ruby1.8 ( = ${source:Version} )
 Suggests: ohai, ohai-doc
 Description: Library to collect data about your operating system and report it in JSON
  Information about your system is collected and returned as multidimensional
@@ -42,7 +42,7 @@
 
 Package: libohai-ruby1.8
 Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, ruby1.8, libextlib-ruby1.8, 
+Depends: ${shlibs:Depends}, ${misc:Depends}, ruby, libextlib-ruby1.8, 
   libjson-ruby1.8, libsystemu-ruby1.8, libmixlib-cli-ruby1.8 (>= 1.1.0),
   libmixlib-config-ruby1.8 (>= 1.1.0), libmixlib-log-ruby1.8 (>= 1.1.0)
 Suggests: libvirt-ruby1.8, libhpricot-ruby1.8, ohai-doc

Modified: trunk/ohai/debian/patches/remove_rubygems.patch
===================================================================
--- trunk/ohai/debian/patches/remove_rubygems.patch	2010-03-25 06:55:06 UTC (rev 5015)
+++ trunk/ohai/debian/patches/remove_rubygems.patch	2010-03-25 16:42:54 UTC (rev 5016)
@@ -1,10 +1,23 @@
 # Description: Remove requirement of rubygems
 # Requiring RubyGems is discouraged by the Debian Ruby Extras team
 # per http://pkg-ruby-extras.alioth.debian.org/upstream-devs.html
-Index: opscode-ohai-5bdfa78/lib/ohai/system.rb
+Index: opscode-ohai-68e07be/bin/ohai
 ===================================================================
---- opscode-ohai-5bdfa78.orig/lib/ohai/system.rb	2010-01-08 21:56:56.000000000 -0800
-+++ opscode-ohai-5bdfa78/lib/ohai/system.rb	2010-01-08 21:57:03.000000000 -0800
+--- opscode-ohai-68e07be.orig/bin/ohai	2010-03-09 19:19:42.000000000 -0700
++++ opscode-ohai-68e07be/bin/ohai	2010-03-09 19:19:47.000000000 -0700
+@@ -19,8 +19,6 @@
+ # limitations under the License.
+ #
+ 
+-require 'rubygems'
+-
+ $: << File.join(File.dirname(__FILE__), "..", "lib")
+ begin
+   require 'rubygems'
+Index: opscode-ohai-68e07be/lib/ohai/system.rb
+===================================================================
+--- opscode-ohai-68e07be.orig/lib/ohai/system.rb	2010-03-09 19:19:53.000000000 -0700
++++ opscode-ohai-68e07be/lib/ohai/system.rb	2010-03-09 19:19:57.000000000 -0700
 @@ -16,7 +16,6 @@
  # limitations under the License.
  #