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

Proposed by Adam Gandelman
Status: Merged
Merge reported by: Jamie Strandboge
Merged at revision: not available
Proposed branch: lp://staging/~gandelman-a/ubuntu/precise/facter/merge922788
Merge into: lp://staging/ubuntu/precise/facter
Diff against target: 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)
To merge this branch: bzr merge lp://staging/~gandelman-a/ubuntu/precise/facter/merge922788
Reviewer Review Type Date Requested Status
Ubuntu branches Pending
Review via email: mp+90519@code.staging.launchpad.net

Description of the change

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 <email address hidden> Fri, 27 Jan 2012 11:05:12 -0800

To post a comment you must log in.
Revision history for this message
Jamie Strandboge (jdstrand) wrote :

This was uploaded a few moments ago and pushed to the bzr branch in r18.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches