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

[Joshua Timberman]

Author: jtimberman-guest
Date: 2010-05-12 17:28:24 +0000 (Wed, 12 May 2010)
New Revision: 5293

Modified:
   trunk/ohai/debian/changelog
   trunk/ohai/debian/control
   trunk/ohai/debian/rules
Log:
fix lintian findings on built ohai packages, version bump for launchpad ppa happiness

Modified: trunk/ohai/debian/changelog
===================================================================
--- trunk/ohai/debian/changelog	2010-05-12 17:10:53 UTC (rev 5292)
+++ trunk/ohai/debian/changelog	2010-05-12 17:28:24 UTC (rev 5293)
@@ -1,3 +1,10 @@
+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 <joshua at opscode.com>  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. 

Modified: trunk/ohai/debian/control
===================================================================
--- trunk/ohai/debian/control	2010-05-12 17:10:53 UTC (rev 5292)
+++ trunk/ohai/debian/control	2010-05-12 17:28:24 UTC (rev 5293)
@@ -3,7 +3,7 @@
 Priority: extra
 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: 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

Modified: trunk/ohai/debian/rules
===================================================================
--- trunk/ohai/debian/rules	2010-05-12 17:10:53 UTC (rev 5292)
+++ trunk/ohai/debian/rules	2010-05-12 17:28:24 UTC (rev 5293)
@@ -28,14 +28,14 @@
     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
+	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
@@ -44,6 +44,7 @@
 	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