diff -Nru facter-1.6.10/debian/changelog facter-1.6.10/debian/changelog --- facter-1.6.10/debian/changelog 2012-06-24 11:01:56.000000000 +0000 +++ facter-1.6.10/debian/changelog 2013-05-02 12:35:13.000000000 +0000 @@ -1,3 +1,28 @@ +facter (1.6.10-1ubuntu1) saucy; urgency=low + + * Merge from Debian unstable (LP: #1173265). Remaining changes: + - debian/patches/ubuntu_xen_print_virtual.patch: correctly detect + xen0,xenu. (LP: #980291) + - debian/control: ruby-json is not in main, so move Depends to Suggests. + * Dropped changes: + - debian/rules: + + use what we had in natty; we don't want ruby-pkg-tools + in main. (LP: #408402) + - ruby-pkg-tools is now in main. + + Use dh_prep instead of dh_clean, add build-arch + build-indep targets + - No longer necessary. + - debian/control: + + Continue using ruby + libopenssl-ruby as Build-Depends even tho Debian + has moved to gem2deb (not in main). + - gem2deb is now in main. + + Make binary package depend on ruby1.8 explicitly + - Debian packaging now supports multiple Ruby versions. + * d/p/kvm-cpuinfo: detect "Common KVM processor" in /proc/cpuinfo as virtual + (LP: #1170325). + * d/control, d/tests: add dep8 smoke test. + + -- Robie Basak Wed, 01 May 2013 14:53:05 +0000 + facter (1.6.10-1) unstable; urgency=low * New upstream release @@ -5,6 +30,22 @@ -- Stig Sandbeck Mathisen Sun, 24 Jun 2012 13:01:40 +0200 +facter (1.6.9-2ubuntu1) quantal; urgency=low + + * Merge from Debian unstable (LP: #1007560). Remaining changes: + - debian/rules: + + use what we had in natty; we don't want ruby-pkg-tools + in main. (LP: #408402) + + Use dh_prep instead of dh_clean, add build-arch + build-indep targets + - debian/control: + + Continue using ruby + libopenssl-ruby as Build-Depends even tho Debian + has moved to gem2deb (not in main). Move ruby-json to Suggests. + + Make binary package depend on ruby1.8 explicitly + * debian/patches/ubuntu_xen_print_virtual.patch: correctly detect + xen0,xenu. (LP: #980291) + + -- Andres Rodriguez Fri, 01 Jun 2012 14:51:28 -0400 + facter (1.6.9-2) unstable; urgency=medium * Add patch from upstream (b050eb1) to ignore LSB noise @@ -36,12 +77,42 @@ -- Stig Sandbeck Mathisen Mon, 27 Feb 2012 16:45:49 +0100 +facter (1.6.5-1ubuntu1) precise; urgency=low + + * Merge from Debian testing. Remaining changes: + - debian/rules: use what we had in natty; we don't want ruby-pkg-tools + in main. (LP: #408402) + - debian/control: Continue using ruby + libopenssl-ruby as Build-Depends + even tho Debian has moved to gem2deb (not in main). Move ruby-json to + Suggests. + - debian/rules: Use dh_prep instead of dh_clean, add build-arch + + build-indep targets + - debian/control: Make binary package depend on ruby1.8 explicitly + + -- Chuck Short Sun, 12 Feb 2012 20:40:24 -0500 + facter (1.6.5-1) unstable; urgency=low * New upstream release -- Stig Sandbeck Mathisen Thu, 26 Jan 2012 11:11:13 +0100 +facter (1.6.4-2ubuntu1) precise; urgency=low + + * Merge from Debian testing (LP: #922788). Remaining changes: + - debian/rules: use what we had in natty; we don't want ruby-pkg-tools + in main. (LP: #408402) + - debian/control: Continue using ruby + libopenssl-ruby as Build-Depends + even tho Debian has moved to gem2deb (not in main). Move ruby-json to + Suggests. + - debian/rules: Use dh_prep instead of dh_clean, add build-arch + + build-indep targets + - debian/control: Make binary package depend on ruby1.8 explicitly. + * Dropped changes: + - debian/control: Update debhelper Build-Depends to 8 (Updated in Debian) + + -- Adam Gandelman Fri, 27 Jan 2012 11:05:12 -0800 + facter (1.6.4-2) unstable; urgency=low * Move dmidecode from Depends to Recommends (Closes: #651501) @@ -61,12 +132,38 @@ -- Stig Sandbeck Mathisen Tue, 22 Nov 2011 21:44:38 +0100 +facter (1.6.2-1ubuntu1) precise; urgency=low + + * Merge from Debian testing (LP: #888671). Remaining changes: + - debian/rules: use what we had in natty; we don't want ruby-pkg-tools + in main. (LP: #408402) + - debian/control: Continue using ruby + libopenssl-ruby as Build-Depends + even tho Debian has moved to gem2deb (not in main). Move ruby-json to + Suggests. + * debian/rules: Use dh_prep instead of dh_clean, add build-arch + build-indep + targets + * debian/control: Update debhelper Build-Depends to 8, make binary package + depend on ruby1.8 explicitly. + + -- Adam Gandelman Thu, 10 Nov 2011 10:11:05 -0800 + facter (1.6.2-1) unstable; urgency=low * New upstream release -- Stig Sandbeck Mathisen Wed, 12 Oct 2011 11:29:53 +0200 +facter (1.6.1-1ubuntu1) precise; urgency=low + + * Merge from Debian unstable (LP: #877621). Remaining changes: + - debian/rules: use what we had in natty; we don't want ruby-pkg-tools + in main. (LP: #408402) + * debian/control: Continue using ruby + libopenssl-ruby as Build-Depends + even tho Debian has moved to gem2deb (not in main). Move ruby-json to + Suggests. + + -- Adam Gandelman Tue, 18 Oct 2011 10:32:42 -0700 + facter (1.6.1-1) unstable; urgency=low * New upstream release @@ -83,6 +180,16 @@ -- Stig Sandbeck Mathisen Fri, 24 Jun 2011 10:04:12 +0200 +facter (1.5.9-1ubuntu1) oneiric; urgency=low + + * Merge from debian unstable (LP: #788284). Remaining changes: + - Dropped ruby-pkg-tools and libsetup-ruby1.8; debian/rules: use what we + had in natty; we don't want ruby-pkg-tools in main. (LP: #408402) + * Dropped changes to lib/facter/ec2.rb. (Use the latest-meta api so it + always does not retunr false). This was fixed upstream. + + -- Andres Rodriguez Fri, 27 May 2011 11:27:00 +0100 + facter (1.5.9-1) unstable; urgency=low * New upstream release @@ -97,6 +204,21 @@ -- Stig Sandbeck Mathisen Fri, 18 Mar 2011 12:06:08 +0100 +facter (1.5.8-2ubuntu2) natty; urgency=low + + * lib/facter/ec2.rb: Use the latest-meta api so it always + does not return false. (LP: #732953) + + -- Chuck Short Mon, 04 Apr 2011 11:34:30 -0400 + +facter (1.5.8-2ubuntu1) natty; urgency=low + + * Merge from debian unstable. Remaining changes: + - Dropped ruby-pkg-tools and libsetup-ruby1.8, we don't want ruby-pkg-tools + in main. (LP: #408402) + + -- Chuck Short Tue, 08 Feb 2011 00:18:35 +0000 + facter (1.5.8-2) unstable; urgency=low * Release for unstable @@ -127,6 +249,52 @@ -- Stig Sandbeck Mathisen Wed, 01 Dec 2010 16:02:13 +0100 +facter (1.5.7-3ubuntu1) natty; urgency=low + + * Merge from debian unstable, remaining changes are: + - Dropped ruby-pkg-tools and libsetup-ruby1.8, we don't want ruby-pkg-tools + in main. (LP: #408402) + + -- Chuck Short Mon, 10 Jan 2011 11:25:00 -0500 + +facter (1.5.7-3) unstable; urgency=low + + * Remove unnecessary alternate dependency on libopenssl-ruby1.9 + * Fix 1.5.7-2 changelog, correcting bug number for #545867 + + -- Micah Anderson Fri, 17 Dec 2010 12:17:49 -0500 + +facter (1.5.7-2) unstable; urgency=low + + [ Stig Sandbeck Mathisen ] + * Fix "upgrade from 1.3.5 to 1.5.1 requires puppet to be restarted", + added a note in debian/NEWS about restarting puppet (Closes: #515726) + * debian/control: bump standards version: no changes + * debian/control: Remove unused build dependency on "cdbs" + * Add versioned dependency for ruby1.8 (Closes: #545867) + * Cherry-pick domain/fqdn fact fix from upstream (Closes: #515591) + + [ Micah Anderson ] + * debian/control: add Vcs-Git, Vcs-Browser, and Homepage fields + * debian/NEWS: fix lintian syntax-error-in-debian-news-file + * debian/facter.8: fix manpage-section-mismatch + * cherry pick upstream virtualization support: + . openvz fix [#4156] + . add kvm support (Closes: #603001) + . fix Linux-Vserver of virtual fact [#3397] + . add xendomains fact + + -- Micah Anderson Wed, 15 Dec 2010 00:21:46 -0500 + +facter (1.5.7-1ubuntu1) maverick; urgency=low + + * Merge from debian testing. Remaining changes: + - Dropped ruby-pkg-tools, and libsetup-ruby1.8, and cdbs, use what + we had in lucid. Since we don't want ruby-pkg-tools in main + (LP: #408402) + + -- Chuck Short Fri, 26 Mar 2010 16:14:26 +0000 + facter (1.5.7-1) unstable; urgency=low * New upstream version 1.5.7 @@ -149,6 +317,21 @@ -- Stig Sandbeck Mathisen Fri, 25 Dec 2009 00:41:25 +0100 +facter (1.5.6-2ubuntu2) lucid; urgency=low + + * Dropped ruby-pkg-tools, and libsetup-ruby1.8, and cdbs, use what + we had in karmic. Since we don't want ruby-pkg-tools in main. + (LP: #408402) + + -- Chuck Short Fri, 26 Mar 2010 08:34:25 -0400 + +facter (1.5.6-2ubuntu1) lucid; urgency=low + + * Merge from debian testing, remaining changes: + - Use bind9-host9 only. + + -- Chuck Short Fri, 06 Nov 2009 00:52:19 +0000 + facter (1.5.6-2) unstable; urgency=low * Added depends possibility on libopenssl-ruby1.9 @@ -170,6 +353,12 @@ -- Micah Anderson Mon, 29 Jun 2009 22:53:18 -0400 +facter (1.5.4-1ubuntu1) karmic; urgency=low + + * Use bind9-host9 only. + + -- Chuck Short Mon, 03 Aug 2009 09:51:59 -0400 + facter (1.5.4-1) unstable; urgency=low [ Nigel Kersten ] diff -Nru facter-1.6.10/debian/control facter-1.6.10/debian/control --- facter-1.6.10/debian/control 2012-06-24 11:01:56.000000000 +0000 +++ facter-1.6.10/debian/control 2013-05-02 09:19:46.000000000 +0000 @@ -1,7 +1,8 @@ Source: facter Section: admin Priority: optional -Maintainer: Puppet Package Maintainers +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Puppet Package Maintainers Uploaders: Andrew Pollock , Nigel Kersten , Micah Anderson , Stig Sandbeck Mathisen Build-Depends: debhelper (>= 8), gem2deb (>= 0.2.4~) Standards-Version: 3.9.3 @@ -9,12 +10,14 @@ Vcs-Browser: http://git.debian.org/?p=pkg-puppet/facter.git Homepage: http://projects.puppetlabs.com/projects/facter XS-Ruby-Versions: all +XS-Testsuite: autopkgtest Package: facter Architecture: all XB-Ruby-Versions: ${ruby:Versions} -Depends: ${misc:Depends}, ruby | ruby-interpreter, ruby-json, net-tools, bind9-host | host +Depends: ${misc:Depends}, ruby | ruby-interpreter, net-tools, bind9-host | host Recommends: pciutils, dmidecode +Suggests: ruby-json Description: collect and display facts about the system A cross-platform Ruby library for retrieving facts from operating systems. Supports multiple resolution mechanisms, any of which can be restricted to diff -Nru facter-1.6.10/debian/patches/kvm-cpuinfo facter-1.6.10/debian/patches/kvm-cpuinfo --- facter-1.6.10/debian/patches/kvm-cpuinfo 1970-01-01 00:00:00.000000000 +0000 +++ facter-1.6.10/debian/patches/kvm-cpuinfo 2013-05-02 08:42:37.000000000 +0000 @@ -0,0 +1,25 @@ +Author: rustx +Bug: https://github.com/puppetlabs/facter/pull/419 +Bug-Ubuntu: https://launchpad.net/bugs/1170325 +Description: detect "Common KVM processor" in /proc/cpuinfo as virtual +Forwarded: not-needed +Last-Update: 2013-05-02 + +It looks like this was originally implemented upstream in a buggy way to me, +then merged, reverted and merged again upstream, with a correction along the +way. The patch is so trivial that I think that taking rustx's patch as-is is +the easiest way to fix this for now, rather than trying to cherry-pick all the +appropriate upstream commits. The issue is already fixed upstream, so this can +be dropped when we update to the latest upstream release anyway. --rbasak + +--- a/lib/facter/util/virtual.rb ++++ b/lib/facter/util/virtual.rb +@@ -58,7 +58,7 @@ + elsif ["FreeBSD", "OpenBSD"].include? Facter.value(:kernel) + Facter::Util::Resolution.exec("/sbin/sysctl -n hw.model") + end +- (txt =~ /QEMU Virtual CPU/) ? true : false ++ (txt =~ /QEMU Virtual CPU|Common KVM processor/) ? true : false + end + + def self.kvm_type diff -Nru facter-1.6.10/debian/patches/series facter-1.6.10/debian/patches/series --- facter-1.6.10/debian/patches/series 2012-06-24 11:01:56.000000000 +0000 +++ facter-1.6.10/debian/patches/series 2013-05-02 08:14:45.000000000 +0000 @@ -1 +1,3 @@ no-require-rubygems +ubuntu_xen_print_virtual.patch +kvm-cpuinfo diff -Nru facter-1.6.10/debian/patches/ubuntu_xen_print_virtual.patch facter-1.6.10/debian/patches/ubuntu_xen_print_virtual.patch --- facter-1.6.10/debian/patches/ubuntu_xen_print_virtual.patch 1970-01-01 00:00:00.000000000 +0000 +++ facter-1.6.10/debian/patches/ubuntu_xen_print_virtual.patch 2013-05-01 14:52:30.000000000 +0000 @@ -0,0 +1,22 @@ +From: Andres Rodriguez +Description: fix xen0/xenu detection + facter virtual prints 'physical'. This patch is to correctly + detect that xen0/xenu are virtual rather than physical +Bug: https://projects.puppetlabs.com/issues/10625 +Bug-Ubuntu: https://launchpad.net/bugs/980291 +Origin: upstream, https://github.com/puppetlabs/facter/commit/976b7af24d641e589121d30e37bacc983d79cc0a#diff-0 +Forwarded: not-needed +--- facter-1.6.9-2ubuntu1.orig/lib/facter/virtual.rb 2012-05-31 17:10:51.000000000 -0400 ++++ facter-1.6.9-2ubuntu1/lib/facter/virtual.rb 2012-06-01 14:45:12.340063802 -0400 +@@ -73,9 +73,9 @@ + 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 diff -Nru facter-1.6.10/debian/tests/control facter-1.6.10/debian/tests/control --- facter-1.6.10/debian/tests/control 1970-01-01 00:00:00.000000000 +0000 +++ facter-1.6.10/debian/tests/control 2013-05-02 09:20:59.000000000 +0000 @@ -0,0 +1 @@ +Tests: smoke diff -Nru facter-1.6.10/debian/tests/smoke facter-1.6.10/debian/tests/smoke --- facter-1.6.10/debian/tests/smoke 1970-01-01 00:00:00.000000000 +0000 +++ facter-1.6.10/debian/tests/smoke 2013-05-02 10:55:40.000000000 +0000 @@ -0,0 +1,8 @@ +#!/bin/sh +set -e + +result=`facter osfamily` +if [ "$result" != Debian ]; then + echo "\"facter osfamily\" returned \"$result\" instead of \"Debian\"" >&2 + exit 1 +fi