lp://staging/~gandelman-a/ubuntu/precise/facter/merge922788

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp://staging/ubuntu/precise/facter

Ubuntu branches: Pending requested 2012-01-27

Diff: 6642 lines (+3054/-2736)

64 files modified

CHANGELOG (+18/-0)
LICENSE (+1/-1)
conf/osx/createpackage.sh (+1/-1)
conf/redhat/facter.spec (+13/-6)
conf/solaris/pkginfo (+1/-1)
debian/changelog (+35/-0)
debian/control (+1/-1)
debian/facter.dirs (+0/-1)
install.rb (+14/-17)
lib/facter.rb (+2/-2)
lib/facter/architecture.rb (+1/-2)
lib/facter/augeasversion.rb (+1/-2)
lib/facter/domain.rb (+3/-3)
lib/facter/hardwareisa.rb (+1/-1)
lib/facter/ipaddress.rb (+2/-2)
lib/facter/lsbmajdistrelease.rb (+1/-1)
lib/facter/macaddress.rb (+2/-2)
lib/facter/manufacturer.rb (+6/-1)
lib/facter/netmask.rb (+0/-3)
lib/facter/network.rb (+2/-3)
lib/facter/operatingsystem.rb (+5/-2)
lib/facter/operatingsystemrelease.rb (+3/-3)
lib/facter/osfamily.rb (+1/-1)
lib/facter/processor.rb (+2/-2)
lib/facter/selinux.rb (+3/-3)
lib/facter/uniqueid.rb (+1/-1)
lib/facter/uptime_days.rb (+0/-1)
lib/facter/uptime_hours.rb (+0/-1)
lib/facter/util/macaddress.rb (+1/-0)
lib/facter/util/manufacturer.rb (+2/-3)
lib/facter/util/processor.rb (+3/-3)
lib/facter/util/resolution.rb (+3/-3)
lib/facter/util/values.rb (+1/-1)
lib/facter/virtual.rb (+2/-2)
lib/facter/vlans.rb (+1/-2)
lib/facter/xendomains.rb (+0/-1)
spec/fixtures/ifconfig/linux_ifconfig_no_mac (+8/-0)
spec/fixtures/ifconfig/linux_ifconfig_venet (+24/-0)
spec/fixtures/unit/util/manufacturer/solaris_sunfire_v120_prtdiag (+33/-0)
spec/fixtures/unit/util/manufacturer/solaris_t5220_prtdiag (+136/-0)
spec/spec_helper.rb (+5/-0)
spec/unit/architecture_spec.rb (+44/-44)
spec/unit/facter_spec.rb (+266/-264)
spec/unit/id_spec.rb (+21/-21)
spec/unit/interfaces_spec.rb (+6/-6)
spec/unit/macaddress_spec.rb (+36/-12)
spec/unit/memory_spec.rb (+137/-137)
spec/unit/operatingsystem_spec.rb (+82/-73)
spec/unit/operatingsystemrelease_spec.rb (+50/-49)
spec/unit/processor_spec.rb (+2/-2)
spec/unit/selinux_spec.rb (+80/-80)
spec/unit/util/collection_spec.rb (+247/-247)
spec/unit/util/confine_spec.rb (+129/-129)
spec/unit/util/fact_spec.rb (+121/-121)
spec/unit/util/ip_spec.rb (+290/-290)
spec/unit/util/loader_spec.rb (+265/-265)
spec/unit/util/macaddress_spec.rb (+6/-1)
spec/unit/util/macosx_spec.rb (+73/-73)
spec/unit/util/manufacturer_spec.rb (+123/-106)
spec/unit/util/resolution_spec.rb (+291/-291)
spec/unit/util/virtual_spec.rb (+168/-168)
spec/unit/util/vlans_spec.rb (+6/-6)
spec/unit/virtual_spec.rb (+271/-271)
spec/watchr.rb (+1/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #408402: Main Inclusion Report for facter.	Undecided	Fix Released
Bug #922788: Please merge facter 1.6.4-2 (main) from Debain testing (main)	High	Fix Released

Link a bug report

Related blueprints

18. By Adam Gandelman on 2012-01-27

* 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)
* Move dmidecode from Depends to Recommends (Closes: #651501)
* New upstream release
* Add dependency on dmidecode
* New upstream release

17. By Adam Gandelman on 2011-11-10

* 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.

16. By Adam Gandelman on 2011-10-18

* Merge from Debian unstable (LP: #877621). Remaining changes:
  - debian/rules: use what we had in natty; we dont 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.

15. By Andres Rodriguez on 2011-05-27

* 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 dont 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.

14. By Chuck Short on 2011-04-04

lib/facter/ec2.rb: Use the latest-meta api so it always
does not return false. (LP: #732953)

13. By Chuck Short on 2011-02-08

* Merge from debian unstable. Remaining changes:
  - Dropped ruby-pkg-tools and libsetup-ruby1.8, we dont want ruby-pkg-tools
    in main. (LP: #408402)

12. By Chuck Short on 2011-01-10

* Merge from debian unstable, remaining changes are:
  - Dropped ruby-pkg-tools and libsetup-ruby1.8, we dont want ruby-pkg-tools
    in main. (LP: #408402)

11. By Chuck Short on 2010-03-26

* Merge from debian testing. Remaining changes:
  - Dropped ruby-pkg-tools, and libsetup-ruby1.8, and cdbs, use what
    we had in lucid. Since we dont want ruby-pkg-tools in main
    (LP: #408402)

10. By Chuck Short on 2010-03-26

Dropped ruby-pkg-tools, and libsetup-ruby1.8, and cdbs, use what
we had in karmic. Since we dont want ruby-pkg-tools in main.
(LP: #408402)

9. By Chuck Short on 2009-11-06

* Merge from debian testing, remaining changes:
  - Use bind9-host9 only.