← Back to branch summary

~bkerensa/ubuntu/raring/puppet/new-upstream-release

« back to all changes in this revision

Viewing changes to debian/control

  • Committer: Bazaar Package Importer
  • Author(s): Chuck Short
  • Date: 2011-07-25 01:00:37 UTC
  • mfrom: (1.1.24 upstream) (3.1.25 sid)
  • Revision ID: james.westby@ubuntu.com-20110725010037-875vuxs10eboqgw3
Tags: 2.7.1-1ubuntu1
https://launchpad.net/bugs/641001
* Merge from debian unstable.  Remaining changes:
  - debian/puppetmaster-passenger.postinst: Use cacrl instead of hostcrl to
    set the location of the CRL in apache2 configuration. Fix apache2
    configuration on upgrade as well (LP: #641001)
  - move all puppet dependencies to puppet-common since all the code
    actually located in puppet-common.
  - move libagueas from a recommend to a dependency.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/control
6
6
Uploaders: Micah Anderson <micah@debian.org>, Andrew Pollock <apollock@debian.org>, Nigel Kersten <nigel@explanatorygap.net>, Stig Sandbeck Mathisen <ssm@debian.org>
7
7
Build-Depends-Indep: ruby (>= 1.8.1), libopenssl-ruby, facter (>= 1.5)
8
8
Build-Depends: debhelper (>= 6.0.7~), openssl
9
 
Standards-Version: 3.9.1
 
9
Standards-Version: 3.9.2
10
10
Vcs-Git: git://git.debian.org/git/pkg-puppet/puppet.git
11
11
Vcs-Browser: http://git.debian.org/?p=pkg-puppet/puppet.git
12
12
Homepage: http://projects.puppetlabs.com/projects/puppet
13
13
 
14
14
Package: puppet-common
15
15
Architecture: all
16
 
Depends: ${misc:Depends}, ruby1.8, libxmlrpc-ruby, libopenssl-ruby, libshadow-ruby1.8, libaugeas-ruby1.8, adduser, facter, lsb-base, sysv-rc (>= 2.87)
 
16
Depends: ${misc:Depends}, ruby1.8, libxmlrpc-ruby, libopenssl-ruby, libshadow-ruby1.8, libaugeas-ruby1.8, adduser, facter, lsb-base, sysv-rc (>= 2.87) | file-rc
17
17
Recommends: lsb-release, debconf-utils
18
18
Suggests: libselinux-ruby1.8, librrd-ruby1.8
19
19
Breaks: puppet (<< 2.6.0~rc2-1), puppetmaster (<< 0.25.4-1)