[Pkg-puppet-devel] [SCM] Packaging of Facter for debian branch, master, updated. debian/1.7.0-1-1-gbd307c4
Stig Sandbeck Mathisen
ssm at debian.org
Sat Jun 29 13:14:39 UTC 2013
The following commit has been merged in the master branch:
commit c7fb94390c58e36be5c0feb99fdced2732d2e9e6
Author: Stig Sandbeck Mathisen <ssm at debian.org>
Date: Sun May 5 18:33:51 2013 +0200
Remove "virtual-xenu-detection" patch included upstream
diff --git a/debian/patches/series b/debian/patches/series
index 63f3a0a..dd4dba1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
no-require-rubygems
-virtual-xenu-detection
diff --git a/debian/patches/virtual-xenu-detection b/debian/patches/virtual-xenu-detection
deleted file mode 100644
index 559ecba..0000000
--- a/debian/patches/virtual-xenu-detection
+++ /dev/null
@@ -1,29 +0,0 @@
-From 00fb8c9198d237cc3f47ebd9d87a2a61ddd60598 Mon Sep 17 00:00:00 2001
-From: Grant Heffernan <heffergm at gmail.com>
-Date: Wed, 1 Feb 2012 18:38:29 -0500
-Subject: [PATCH 005/132] fix xen0/xenu detection:
- https://projects.puppetlabs.com/issues/10625
-
----
- lib/facter/virtual.rb | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/lib/facter/virtual.rb b/lib/facter/virtual.rb
-index ea9e1bd..652e528 100644
---- a/lib/facter/virtual.rb
-+++ b/lib/facter/virtual.rb
-@@ -73,9 +73,9 @@ Facter.add("virtual") do
- end
-
- if Facter::Util::Virtual.xen?
-- if FileTest.exists?("/proc/xen/xsd_kva")
-+ if FileTest.exists?("/dev/xen/evtchn")
- result = "xen0"
-- elsif FileTest.exists?("/proc/xen/capabilities")
-+ elsif FileTest.exists?("/proc/xen")
- result = "xenu"
- end
- end
---
-1.7.10.4
-
--
Packaging of Facter for debian
More information about the Pkg-puppet-devel
mailing list