~ubuntu-branches/ubuntu/precise/facter/precise

Viewing all changes in revision 11.

  • Committer: Bazaar Package Importer
  • Author(s): Chuck Short
  • Date: 2010-03-26 16:14:26 UTC
  • mfrom: (1.1.7 upstream) (3.1.4 sid)
  • Revision ID: james.westby@ubuntu.com-20100326161426-h2srt5tpv216vm4x
Tags: 1.5.7-1ubuntu1
* 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)

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: