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

[Joshua Timberman]

Author: jtimberman-guest
Date: 2010-05-12 05:50:48 +0000 (Wed, 12 May 2010)
New Revision: 5274

Modified:
   trunk/ohai/debian/changelog
   trunk/ohai/debian/control
   trunk/ohai/debian/patches/remove_rubygems.patch
Log:
upstream package version update

Modified: trunk/ohai/debian/changelog
===================================================================
--- trunk/ohai/debian/changelog	2010-05-11 13:47:26 UTC (rev 5273)
+++ trunk/ohai/debian/changelog	2010-05-12 05:50:48 UTC (rev 5274)
@@ -1,3 +1,25 @@
+ohai (0.5.4-3) unstable; urgency=low
+
+  * Fix remove_rubygems patch for new version of bin/ohai. 
+
+ -- Joshua Timberman <joshua at opscode.com>  Tue, 11 May 2010 20:05:36 -0600
+
+ohai (0.5.4-2) unstable; urgency=low
+
+  * Fix source package for launchpad.
+
+ -- Joshua Timberman <joshua at opscode.com>  Tue, 11 May 2010 17:26:26 -0600
+
+ohai (0.5.4-1) unstable; urgency=low
+
+  * New upstream release (0.5.4).
+    * [OHAI-185] - Specs fail on all platforms other than darwin
+    * [OHAI-187] - Ohai plugin breaks shef
+    * [OHAI-190] - Chef plugin for ohai uses the same namespace as the chef
+      attributes
+
+ -- Joshua Timberman <joshua at opscode.com>  Tue, 11 May 2010 16:37:21 -0600
+
 ohai (0.5.2-1) unstable; urgency=low
 
   * New upstream release (0.5.2).
@@ -16,11 +38,10 @@
 
   * Remove rubygems patch missed bin/ohai. 
   * ohai needs to depend on 'ruby' or it fails to process plugins.
-    (Closes: #575067)
 
  -- Joshua Timberman <joshua at opscode.com>  Tue, 09 Mar 2010 19:21:06 -0700
 
-ohai (0.5.0-1) lucid; urgency=low
+ohai (0.5.0-1) unstable; urgency=low
 
   * New upstream release (0.5.0).
     * [OHAI-155] - Chef summons army of dmidecode Zombies

Modified: trunk/ohai/debian/control
===================================================================
--- trunk/ohai/debian/control	2010-05-11 13:47:26 UTC (rev 5273)
+++ trunk/ohai/debian/control	2010-05-12 05:50:48 UTC (rev 5274)
@@ -6,13 +6,11 @@
 Build-Depends: cdbs, debhelper (>= 7), ruby-pkg-tools (>= 0.14), quilt
 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/
 Homepage: http://github.com/opscode/ohai/tree/master
 
 Package: ohai
 Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, ruby, libohai-ruby1.8 ( = ${source:Version} )
+Depends: ${shlibs:Depends}, ${misc:Depends}, ruby, libohai-ruby
 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
@@ -42,9 +40,7 @@
 
 Package: libohai-ruby1.8
 Architecture: all
-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)
+Depends: ${shlibs:Depends}, ${misc:Depends}, ruby1.8, libextlib-ruby1.8, libjson-ruby1.8, libsystemu-ruby1.8, libmixlib-config-ruby1.8, libmixlib-log-ruby1.8, libmixlib-cli-ruby1.8
 Suggests: libvirt-ruby1.8, libhpricot-ruby1.8, ohai-doc
 Description: Ruby 1.8 library to collect data about your operating system
  Information about your system is collected and returned as multidimensional

Modified: trunk/ohai/debian/patches/remove_rubygems.patch
===================================================================
--- trunk/ohai/debian/patches/remove_rubygems.patch	2010-05-11 13:47:26 UTC (rev 5273)
+++ trunk/ohai/debian/patches/remove_rubygems.patch	2010-05-12 05:50:48 UTC (rev 5274)
@@ -1,16 +1,22 @@
 # 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-68e07be/bin/ohai
+Index: ohai-0.5.4/bin/ohai
 ===================================================================
---- 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.
+--- ohai-0.5.4.orig/bin/ohai	2010-05-11 20:03:19.000000000 -0600
++++ ohai-0.5.4/bin/ohai	2010-05-11 20:04:27.000000000 -0600
+@@ -20,12 +20,8 @@
  #
  
--require 'rubygems'
--
- $: << File.join(File.dirname(__FILE__), "..", "lib")
+ 
+-begin
+-  require 'rubygems'
+-rescue LoadError
+-  # must be debian! ;)
+-  missing_rubygems = true
+-end
++# must be debian! ;)
++missing_rubygems = true
  begin
-   require 'rubygems'
+   # if we're in a source code checkout, we want to run the code from that.
+   # have to do this *after* rubygems is loaded.