[DRE-commits] r4103 - in trunk/ohai: . bin debian
Joshua Timberman
jtimberman-guest at alioth.debian.org
Wed Sep 9 15:06:26 UTC 2009
Author: jtimberman-guest
Date: 2009-09-09 15:06:26 +0000 (Wed, 09 Sep 2009)
New Revision: 4103
Added:
trunk/ohai/debian/
trunk/ohai/debian/changelog
trunk/ohai/debian/compat
trunk/ohai/debian/control
trunk/ohai/debian/copyright
trunk/ohai/debian/ohai.1
trunk/ohai/debian/ohai.dirs
trunk/ohai/debian/rules
trunk/ohai/debian/watch
Modified:
trunk/ohai/bin/ohai
Log:
[svn-inject] Applying Debian modifications to trunk
Modified: trunk/ohai/bin/ohai
===================================================================
--- trunk/ohai/bin/ohai 2009-09-09 15:06:15 UTC (rev 4102)
+++ trunk/ohai/bin/ohai 2009-09-09 15:06:26 UTC (rev 4103)
@@ -1,4 +1,4 @@
-#!/usr/bin/env ruby
+#! /usr/bin/ruby1.8
#
# ./ohai - I'm in ur serverz, showin you the daters
#
Property changes on: trunk/ohai/debian
___________________________________________________________________
Added: mergeWithUpstream
+ 1
Added: trunk/ohai/debian/changelog
===================================================================
--- trunk/ohai/debian/changelog (rev 0)
+++ trunk/ohai/debian/changelog 2009-09-09 15:06:26 UTC (rev 4103)
@@ -0,0 +1,26 @@
+ohai (0.3.2-1) unstable; urgency=low
+
+ * New upstream release
+ * Add libsystemu-ruby as new dependency
+
+ -- Bryan McLellan <btm at loftninjas.org> 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 <btm at loftninjas.org> Fri, 19 Jun 2009 14:14:39 -0700
+
+ohai (0.3.0-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Bryan McLellan <btm at loftninjas.org> Fri, 19 Jun 2009 10:40:49 -0700
+
+ohai (0.2.0-1) unstable; urgency=low
+
+ * Initial release (Closes: #514680)
+
+ -- Bryan McLellan <btm at loftninjas.org> Tue, 28 Apr 2009 15:29:15 -0700
+
Added: trunk/ohai/debian/compat
===================================================================
--- trunk/ohai/debian/compat (rev 0)
+++ trunk/ohai/debian/compat 2009-09-09 15:06:26 UTC (rev 4103)
@@ -0,0 +1 @@
+7
Added: trunk/ohai/debian/control
===================================================================
--- trunk/ohai/debian/control (rev 0)
+++ trunk/ohai/debian/control 2009-09-09 15:06:26 UTC (rev 4103)
@@ -0,0 +1,70 @@
+Source: ohai
+Section: ruby
+Priority: extra
+Maintainer: Bryan McLellan <btm at loftninjas.org>
+Build-Depends: cdbs, debhelper (>= 7), ruby-pkg-tools (>= 0.14)
+Build-Depends-Indep: graphviz, ruby1.8
+Standards-Version: 3.8.2
+Homepage: http://github.com/opscode/ohai/tree/master
+
+Package: ohai
+Architecture: all
+Depends: ${shlibs:Depends}, ${misc:Depends}, ruby1.8, libohai-ruby1.8
+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}, libohai-ruby1.8
+Suggests: 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
+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.
+
Added: trunk/ohai/debian/copyright
===================================================================
--- trunk/ohai/debian/copyright (rev 0)
+++ trunk/ohai/debian/copyright 2009-09-09 15:06:26 UTC (rev 4103)
@@ -0,0 +1,33 @@
+This package was debianized by Bryan McLellan <btm at loftninjas.org> on
+Mon, 09 Feb 2009 15:57:23 -0800.
+
+It was downloaded from <http://github.com/opscode/ohai/tree/master>
+
+Upstream Authors and Copyright:
+
+ Copyright 2008-2009, Opscode <legal at opscode.com>
+ 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 2009, Joe Williams <joe at joetify.com>
+ Copyright 2009, Paul Nasrat <pnasrat at googlemail.com>
+
+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, Bryan McLellan <btm at loftninjas.org> and
+is licensed under the GPL version 2, see `/usr/share/common-licenses/GPL-2'.
Added: trunk/ohai/debian/ohai.1
===================================================================
--- trunk/ohai/debian/ohai.1 (rev 0)
+++ trunk/ohai/debian/ohai.1 2009-09-09 15:06:26 UTC (rev 4103)
@@ -0,0 +1,23 @@
+.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.36.
+.TH OHAI "1" "April 2009" "ohai" "User Commands"
+.SH NAME
+ohai \- collect system information
+.SH SYNOPSIS
+.B ohai
+[\fIOPTION\fR]...
+.SH DESCRIPTION
+Information about your system is collected and returned as multidimensional
+attributes in a JSON format.
+.TP
+\fB\-d\fR, \fB\-\-directory\fR NAME
+A directory to add to the Ohai search path
+.TP
+\fB\-f\fR, \fB\-\-file\fR NAME
+A file to run Ohai against
+.TP
+\fB\-l\fR, \fB\-\-loglevel\fR NAME
+Set log level for Ohai
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Show this message
+.IP
Added: trunk/ohai/debian/ohai.dirs
===================================================================
--- trunk/ohai/debian/ohai.dirs (rev 0)
+++ trunk/ohai/debian/ohai.dirs 2009-09-09 15:06:26 UTC (rev 4103)
@@ -0,0 +1 @@
+usr/bin
Added: trunk/ohai/debian/rules
===================================================================
--- trunk/ohai/debian/rules (rev 0)
+++ trunk/ohai/debian/rules 2009-09-09 15:06:26 UTC (rev 4103)
@@ -0,0 +1,57 @@
+#!/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/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)
+ mv $(CURDIR)/debian/libohai-ruby1.8/usr/bin/ohai $(CURDIR)/debian/ohai/usr/bin/ohai
+ rmdir $(CURDIR)/debian/libohai-ruby1.8/usr/bin/
+
+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::
+ dh_installman debian/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
+
+
Property changes on: trunk/ohai/debian/rules
___________________________________________________________________
Added: svn:executable
+ *
Added: trunk/ohai/debian/watch
===================================================================
--- trunk/ohai/debian/watch (rev 0)
+++ trunk/ohai/debian/watch 2009-09-09 15:06:26 UTC (rev 4103)
@@ -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://gems.opscode.com/gems/ohai-(.*)\.gem
More information about the Pkg-ruby-extras-commits
mailing list