diff -u puppet-0.25.4/debian/changelog puppet-0.25.4/debian/changelog
--- puppet-0.25.4/debian/changelog
+++ puppet-0.25.4/debian/changelog
@@ -1,3 +1,11 @@
+puppet (0.25.4-2ubuntu6.1) lucid-proposed; urgency=low
+
+  * Work around a bug in Ruby that causes meaningful error messages to be
+    hidden by a ruby error message (cf.
+    http://projects.puppetlabs.com/issues/3101). Fixes LP: #700945.
+
+ -- Oliver Brakmann <obrakmann@gmx.net>  Sun, 03 Apr 2011 17:15:54 +0200
+
 puppet (0.25.4-2ubuntu6) lucid; urgency=low
 
   * Fix init service provider to correctly check the status of services
only in patch2:
unchanged:
--- puppet-0.25.4.orig/lib/puppet/util/monkey_patches.rb
+++ puppet-0.25.4/lib/puppet/util/monkey_patches.rb
@@ -6,3 +6,16 @@
         }
     end
 end
+
+# Workaround for bug in MRI 1.8.7, see
+#     http://redmine.ruby-lang.org/issues/show/2708
+# for details
+#
+
+if RUBY_VERSION == '1.8.7'
+    class NilClass
+        def closed?
+            true
+        end
+    end
+end