diff -Nru mcollective-plugins-0.0.0~git20120105.9b90c2b/debian/changelog mcollective-plugins-0.0.0~git20120105.9b90c2b/debian/changelog
--- mcollective-plugins-0.0.0~git20120105.9b90c2b/debian/changelog	2012-01-06 15:02:04.000000000 +0000
+++ mcollective-plugins-0.0.0~git20120105.9b90c2b/debian/changelog	2012-03-09 16:59:50.000000000 +0000
@@ -1,3 +1,9 @@
+mcollective-plugins (0.0.0~git20120105.9b90c2b-0ubuntu2) precise; urgency=low
+
+  * Removed facts ohai package (LP: #948437) 
+
+ -- Marc Cluet <marc.cluet@ubuntu.com>  Fri, 09 Mar 2012 16:59:09 +0000
+
 mcollective-plugins (0.0.0~git20120105.9b90c2b-0ubuntu1) precise; urgency=low
 
   * Update from upstream git source
diff -Nru mcollective-plugins-0.0.0~git20120105.9b90c2b/debian/control mcollective-plugins-0.0.0~git20120105.9b90c2b/debian/control
--- mcollective-plugins-0.0.0~git20120105.9b90c2b/debian/control	2012-01-06 14:59:44.000000000 +0000
+++ mcollective-plugins-0.0.0~git20120105.9b90c2b/debian/control	2012-03-09 16:58:52.000000000 +0000
@@ -6,13 +6,6 @@
 Homepage: http://projects.puppetlabs.com/projects/mcollective-plugins/wiki
 Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
 
-Package: mcollective-plugins-facts-ohai
-Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, mcollective, ruby, chef
-Description: mcollective plugin for collecting facts via ohai
- The mcollective Ohai plugin enables mcollective to use OpsCode Ohai
- as a source for facts about your system.
-
 Package: mcollective-plugins-facts-facter
 Architecture: all
 Depends: ${shlibs:Depends}, ${misc:Depends}, mcollective, ruby, facter
diff -Nru mcollective-plugins-0.0.0~git20120105.9b90c2b/debian/copyright mcollective-plugins-0.0.0~git20120105.9b90c2b/debian/copyright
--- mcollective-plugins-0.0.0~git20120105.9b90c2b/debian/copyright	2012-01-06 15:44:22.000000000 +0000
+++ mcollective-plugins-0.0.0~git20120105.9b90c2b/debian/copyright	2012-03-09 16:59:05.000000000 +0000
@@ -97,7 +97,6 @@
        agent/iptables-junkfilter/agent/iptables.rb
        agent/iptables-junkfilter/application/iptables.rb
        facts/facter/facter_facts.rb
-       facts/ohai/opscodeohai_facts.rb
 Copyright: (C) 2010-2011 R.I.Pienaar <rip@devco.net>
 License: GPLv2
  Copyright (C) 2010-2011 R.I.Pienaar <rip@devco.net>
diff -Nru mcollective-plugins-0.0.0~git20120105.9b90c2b/debian/mcollective-plugins-facts-ohai.docs mcollective-plugins-0.0.0~git20120105.9b90c2b/debian/mcollective-plugins-facts-ohai.docs
--- mcollective-plugins-0.0.0~git20120105.9b90c2b/debian/mcollective-plugins-facts-ohai.docs	2011-06-21 21:44:24.000000000 +0100
+++ mcollective-plugins-0.0.0~git20120105.9b90c2b/debian/mcollective-plugins-facts-ohai.docs	1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-README.markdown
diff -Nru mcollective-plugins-0.0.0~git20120105.9b90c2b/debian/mcollective-plugins-facts-ohai.install mcollective-plugins-0.0.0~git20120105.9b90c2b/debian/mcollective-plugins-facts-ohai.install
--- mcollective-plugins-0.0.0~git20120105.9b90c2b/debian/mcollective-plugins-facts-ohai.install	2012-01-06 14:51:19.000000000 +0000
+++ mcollective-plugins-0.0.0~git20120105.9b90c2b/debian/mcollective-plugins-facts-ohai.install	1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-facts/ohai/opscodeohai_facts.rb usr/share/mcollective/plugins/mcollective/facts
diff -Nru mcollective-plugins-0.0.0~git20120105.9b90c2b/debian/mcollective-plugins-facts-ohai.postinst mcollective-plugins-0.0.0~git20120105.9b90c2b/debian/mcollective-plugins-facts-ohai.postinst
--- mcollective-plugins-0.0.0~git20120105.9b90c2b/debian/mcollective-plugins-facts-ohai.postinst	2011-06-23 18:36:13.000000000 +0100
+++ mcollective-plugins-0.0.0~git20120105.9b90c2b/debian/mcollective-plugins-facts-ohai.postinst	1970-01-01 01:00:00.000000000 +0100
@@ -1,19 +0,0 @@
-#!/bin/sh -e
-
-if [ -f "/etc/mcollective/server.cfg" ]
-then
-    ucfr -pf mcollective /etc/mcollective/server.cfg
-    if [ $(grep "opscodeohai" /etc/mcollective/server.cfg | wc -l) = "0" ]
-    then
-        sed -i -e "/^plugin.yaml/d" -e "s/^factsource.*/factsource = opscodeohai/" /etc/mcollective/server.cfg
-    fi
-    if [ $(grep "fact_cache_time" /etc/mcollective/server.cfg | wc -l) = "0" ]
-    then
-        sed -i -e "/^plugin.yaml/d" -e "s/^fact_cache_time.*/fact_cache_time = 5/" /etc/mcollective/server.cfg
-    fi
-    chmod 640 /etc/mcollective/server.cfg
-    ucfr mcollective /etc/mcollective/server.cfg
-    invoke-rc.d mcollective restart
-fi
-
-#DEBHELPER#
diff -Nru mcollective-plugins-0.0.0~git20120105.9b90c2b/debian/mcollective-plugins-facts-ohai.postrm mcollective-plugins-0.0.0~git20120105.9b90c2b/debian/mcollective-plugins-facts-ohai.postrm
--- mcollective-plugins-0.0.0~git20120105.9b90c2b/debian/mcollective-plugins-facts-ohai.postrm	2011-06-23 18:35:57.000000000 +0100
+++ mcollective-plugins-0.0.0~git20120105.9b90c2b/debian/mcollective-plugins-facts-ohai.postrm	1970-01-01 01:00:00.000000000 +0100
@@ -1,19 +0,0 @@
-#!/bin/sh -e
-
-if [ -f "/etc/mcollective/server.cfg" ]
-then
-    ucfr -pf mcollective /etc/mcollective/server.cfg
-    if [ $(grep "opscodeohai" /etc/mcollective/server.cfg | wc -l) = "1" ]
-    then
-        sed -i -e "s/^factsource.*/factsource = yaml\nplugin.yaml = /etc/mcollective/facts.yaml/" /etc/mcollective/server.cfg
-    fi
-    if [ $(grep "fact_cache_time" /etc/mcollective/server.cfg | wc -l) = "1" ]
-    then
-        sed -i -e "/^fact_cache_time/d" /etc/mcollective/server.cfg
-    fi
-    chmod 640 /etc/mcollective/server.cfg
-    ucfr mcollective /etc/mcollective/server.cfg
-    invoke-rc.d mcollective restart
-fi
-
-#DEBHELPER#