--- ohai-0.5.6.orig/debian/ohai-doc.doc-base +++ ohai-0.5.6/debian/ohai-doc.doc-base @@ -0,0 +1,8 @@ +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/* --- ohai-0.5.6.orig/debian/control +++ ohai-0.5.6/debian/control @@ -0,0 +1,71 @@ +Source: ohai +Section: ruby +Priority: extra +Maintainer: Joshua Timberman +Uploaders: Debian Ruby Extras Maintainers +Build-Depends: cdbs, debhelper (>= 7), ruby-pkg-tools (>= 0.14), quilt, graphviz +Build-Depends-Indep: ruby1.8 +Standards-Version: 3.8.4 +Homepage: http://github.com/opscode/ohai/tree/master + +Package: ohai +Architecture: all +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 + attributes in JSON format. The following information is captured: + * Operating system and kernel + * Filesystems in use + * Network configuration and statistics + * Available languages + * Virtualization + +Package: libohai-ruby +Architecture: all +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 + attributes in JSON format. The following information is captured: + * Operating system and kernel + * Filesystems in use + * Network configuration and statistics + * Available languages + * Virtualization + . + This package is a dependency package, which depends on the package + containing actual Ruby ohai libraries for the default Ruby version + (currently 1.8). + +Package: libohai-ruby1.8 +Architecture: all +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 + attributes in JSON format. The following information is captured: + * Operating system and kernel + * Filesystems in use + * Network configuration and statistics + * Available languages + * Virtualization + . + This package contains ohai libraries for Ruby 1.8. + +Package: ohai-doc +Section: doc +Architecture: all +Depends: ${misc:Depends} +Suggests: ruby1.8 +Description: Documentation for ohai + Information about your system is collected and returned as multidimensional + attributes in JSON format. The following information is captured: + * Operating system and kernel + * Filesystems in use + * Network configuration and statistics + * Available languages + * Virtualization + . + This package provides generated HTML documentation for ohai. + --- ohai-0.5.6.orig/debian/compat +++ ohai-0.5.6/debian/compat @@ -0,0 +1 @@ +7 --- ohai-0.5.6.orig/debian/copyright +++ ohai-0.5.6/debian/copyright @@ -0,0 +1,40 @@ +This package was debianized by Bryan McLellan on +Mon, 09 Feb 2009 15:57:23 -0800. + +It was downloaded from + +Upstream Authors and Copyright: + + Copyright 2008-2010, Opscode + Copyright 2008-2009, Adam Jacob + Copyright 2008-2009, Ben Black + Copyright 2008-2009, Ezra Zygmuntowicz + Copyright 2008-2009, Bryan McLellan + Copyright 2009, Joe Williams + Copyright 2009, Paul Nasrat + Copyright 2008, Arjuna Christensen + Copyright 2009, Daniel DeLeo + Copyright 2009, Diego Algorta + Copyright 2009, Mathieu Sauve-Frankel + Copyright 2009, Cary Penniman + +License: + + 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. + + 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-2010, Bryan McLellan 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. --- ohai-0.5.6.orig/debian/README.source +++ ohai-0.5.6/debian/README.source @@ -0,0 +1,3 @@ +This packages uses quilt to manage changes to the upstream source. See +/usr/share/doc/quilt/README.source from the quilt package for how to +use quilt. --- ohai-0.5.6.orig/debian/watch +++ ohai-0.5.6/debian/watch @@ -0,0 +1,7 @@ +# Example watch control file for uscan +# Rename this file to "watch" and then you can run the "uscan" command +# to check for upstream updates and more. +# See uscan(1) for format + +version=3 +http://githubredir.debian.net/github/opscode/ohai/([0-9].*).tar.gz --- ohai-0.5.6.orig/debian/ohai.dirs +++ ohai-0.5.6/debian/ohai.dirs @@ -0,0 +1 @@ +usr/bin --- ohai-0.5.6.orig/debian/rules +++ ohai-0.5.6/debian/rules @@ -0,0 +1,59 @@ +#!/usr/bin/make -f +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/ruby-pkg-tools/1/class/ruby-common.mk +include /usr/share/cdbs/1/rules/patchsys-quilt.mk +#include /usr/share/ruby-pkg-tools/1/class/ruby-setup-rb.mk + +CDBS_NO_DOC_SYMLINKING = "" + +PACKAGED_RUBY_SETUP_CMD = /usr/lib/ruby/1.8/setup.rb +DEB_RUBY_SETUP_CMD = debian-setup.rb +DEB_RUBY_CONFIG_ARGS = --installdirs=std + +# command to install symlink to packaged setup.rb: used in both build and clean +# targets +DEB_RUBY_INSTALL_SETUP_CMD = \ + if [ ! -L $(DEB_RUBY_SETUP_CMD) ] ; then \ + if [ -f $(DEB_RUBY_SETUP_CMD) ] ; then \ + mv $(DEB_RUBY_SETUP_CMD) $(DEB_RUBY_SETUP_CMD).moved_away_by_debian_build ;\ + fi ; \ + ln -s $(PACKAGED_RUBY_SETUP_CMD) $(DEB_RUBY_SETUP_CMD) ; \ + fi + +DEB_RUBY_REMOVE_SETUP_CMD = \ + if [ -L $(DEB_RUBY_SETUP_CMD) ] ; then \ + rm $(DEB_RUBY_SETUP_CMD) ; \ + fi ; \ + if [ -f $(DEB_RUBY_SETUP_CMD).moved_away_by_debian_build ] ; then \ + mv $(DEB_RUBY_SETUP_CMD).moved_away_by_debian_build $(DEB_RUBY_SETUP_CMD) ; \ + fi + +install/libohai-ruby1.8:: + $(DEB_RUBY_INSTALL_SETUP_CMD) + cd $(DEB_SRCDIR) && /usr/bin/ruby $(DEB_RUBY_SETUP_CMD) config $(DEB_RUBY_CONFIG_ARGS) && /usr/bin/ruby $(DEB_RUBY_SETUP_CMD) setup + cd $(DEB_SRCDIR) && /usr/bin/ruby $(DEB_RUBY_SETUP_CMD) install --prefix=debian/$(cdbs_curpkg) + rm -f $(CURDIR)/debian/libohai-ruby1.8/usr/bin/ohai + rmdir $(CURDIR)/debian/libohai-ruby1.8/usr/bin/ + +# TODO: Add libohai-ruby1.9 to control and handle binaries. +install/libohai-ruby1.9:: + $(DEB_RUBY_INSTALL_SETUP_CMD) + cd $(DEB_SRCDIR) && /usr/bin/ruby1.9 $(DEB_RUBY_SETUP_CMD) config $(DEB_RUBY_CONFIG_ARGS) && /usr/bin/ruby1.9 $(DEB_RUBY_SETUP_CMD) setup + cd $(DEB_SRCDIR) && /usr/bin/ruby1.9 $(DEB_RUBY_SETUP_CMD) install --prefix=debian/$(cdbs_curpkg) + rm -f $(CURDIR)/debian/libohai-ruby1.9/usr/bin/ohai + rmdir $(CURDIR)/debian/libohai-ruby1.9/usr/bin/ + +install/ohai:: + cp $(CURDIR)/bin/ohai $(CURDIR)/debian/ohai/usr/bin/ohai + dh_installman docs/man/man1/ohai.1 + dh_installchangelogs + dh_installdirs + +clean:: + $(DEB_RUBY_INSTALL_SETUP_CMD) + /usr/bin/ruby $(DEB_RUBY_SETUP_CMD) distclean + $(DEB_RUBY_REMOVE_SETUP_CMD) + rm -f $(DEB_SRCDIR)/.config + rm -f $(DEB_SRCDIR)/InstalledFiles + + --- ohai-0.5.6.orig/debian/changelog +++ ohai-0.5.6/debian/changelog @@ -0,0 +1,154 @@ +ohai (0.5.6-1) unstable; urgency=low + + * New upstream release (0.5.6). + + -- Joshua Timberman Tue, 29 Jun 2010 14:47:35 -0600 + +ohai (0.5.4-4) unstable; urgency=low + + * Fix use ohai binary from source instead of the one mangled by setup.rb. + * Build-depend graphviz so rdoc gets created properly for ohai-doc. + + -- Joshua Timberman Wed, 12 May 2010 11:03:32 -0600 + +ohai (0.5.4-3) unstable; urgency=low + + * Fix remove_rubygems patch for new version of bin/ohai. + + [ Deepak Tripathi ] + * Bumped Standard Version to 3.8.4 (no changes) + + -- Joshua Timberman Tue, 11 May 2010 20:05:36 -0600 + +ohai (0.5.4-2) unstable; urgency=low + + * Fix source package for launchpad. + + -- Joshua Timberman 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 Tue, 11 May 2010 16:37:21 -0600 + +ohai (0.5.2-1) unstable; urgency=low + + * New upstream release (0.5.2). + * [OHAI-170] - Rackspace cloud detection fails on machines with strictly intracloud traffic + * [OHAI-171] - executable script-without-shebang + * [OHAI-174] - ohai problems with dropping privileges + * [OHAI-159] - php plugin + * [OHAI-160] - lua plugin + * [OHAI-161] - mono plugin + * [OHAI-162] - groovy plugin + * [OHAI-178] - don't use ruby plugin to guess OS + + -- Joshua Timberman Thu, 06 May 2010 23:09:49 -0600 + +ohai (0.5.0-2) unstable; urgency=low + + * Remove rubygems patch missed bin/ohai. + * ohai needs to depend on 'ruby' or it fails to process plugins. + + -- Joshua Timberman 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 Thu, 04 Mar 2010 12:48:35 -0700 + +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 Sun, 28 Feb 2010 17:15:49 -0700 + +ohai (0.3.6-2) unstable; urgency=low + + [Joshua Timberman] + * 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. + + -- Joshua Timberman Fri, 08 Jan 2010 13:44:38 -0600 + +ohai (0.3.6-1) unstable; urgency=low + + [Joshua Timberman] + * Add DRE team to uploaders. + * Bump standards version to 3.8.3 + + [Bryan McLellan] + * New upstream release + * Add Joshua Timberman to uploaders + * Add ohai as suggests to libohai-ruby + * Update watch to use githubredir + * Add quilt patch to remove rubygems require + * Remove package man page in favor of upstream + + -- Bryan McLellan Thu, 07 Jan 2010 12:51:20 -0800 + +ohai (0.3.2-1) unstable; urgency=low + + * New upstream release + * Add libsystemu-ruby as new dependency + + -- Bryan McLellan Wed, 15 Jul 2009 14:46:28 -0700 + +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 + + -- Bryan McLellan Fri, 19 Jun 2009 14:14:39 -0700 + +ohai (0.3.0-1) unstable; urgency=low + + * New upstream release + + -- Bryan McLellan Fri, 19 Jun 2009 10:40:49 -0700 + +ohai (0.2.0-1) unstable; urgency=low + + * Initial release (Closes: #514680) + + -- Bryan McLellan Tue, 28 Apr 2009 15:29:15 -0700 + --- ohai-0.5.6.orig/debian/source/format +++ ohai-0.5.6/debian/source/format @@ -0,0 +1 @@ +1.0 --- ohai-0.5.6.orig/debian/patches/series +++ ohai-0.5.6/debian/patches/series @@ -0,0 +1 @@ +remove_rubygems.patch --- ohai-0.5.6.orig/debian/patches/remove_rubygems.patch +++ ohai-0.5.6/debian/patches/remove_rubygems.patch @@ -0,0 +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: ohai-0.5.4/bin/ohai +=================================================================== +--- 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 @@ + # + + +-begin +- require 'rubygems' +-rescue LoadError +- # must be debian! ;) +- missing_rubygems = true +-end ++# must be debian! ;) ++missing_rubygems = true + begin + # if we're in a source code checkout, we want to run the code from that. + # have to do this *after* rubygems is loaded.