diff options
| author | Kylo Ginsberg <kylo@puppetlabs.com> | 2014-10-09 14:11:38 -0700 |
|---|---|---|
| committer | Kylo Ginsberg <kylo@puppetlabs.com> | 2014-10-09 14:11:38 -0700 |
| commit | 4e88867c87db4a2ce6028d865ba4c4a6f7950166 (patch) | |
| tree | 5e646eec6fd13b18e04572497c2b7a17842e0d6e | |
| parent | 69a35f21ab5c7a8653a8bf131d1a18f4751b87c1 (diff) | |
| parent | 55f097184779848378c7f08112ac1140c4f83d68 (diff) | |
| download | puppet-4e88867c87db4a2ce6028d865ba4c4a6f7950166.tar.gz | |
Merge pull request #3074 from melissaanne/stable
(PUP-3227) Address man page ownship conflicts
| -rw-r--r-- | ext/debian/control | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/ext/debian/control b/ext/debian/control index 02c1f8f42..3bdccb683 100644 --- a/ext/debian/control +++ b/ext/debian/control @@ -60,6 +60,7 @@ Architecture: all Depends: ${misc:Depends}, ruby | ruby-interpreter, puppet-common (= ${binary:Version}), facter (>= 1.7.0), lsb-base Breaks: puppet (<< 0.24.7-1), puppetmaster (<< 2.6.1~rc2-1) Replaces: puppetmaster (<< 2.6.1~rc2-1) +Conflicts: puppet-common (<< 3.3.0-1puppetlabs1) Suggests: apache2 | nginx, puppet-el, vim-puppet, stompserver, ruby-stomp | libstomp-ruby1.8, rdoc, ruby-ldap | libldap-ruby1.8, puppetdb-terminus Description: Puppet master common scripts @@ -81,6 +82,7 @@ Package: puppetmaster Architecture: all Depends: ${misc:Depends}, ruby | ruby-interpreter, puppetmaster-common (= ${source:Version}), facter (>= 1.7.0), lsb-base Breaks: puppet (<< 0.24.7-1) +Conflicts: puppet (<< 3.3.0-1puppetlabs1) Suggests: apache2 | nginx, puppet-el, vim-puppet, stompserver, ruby-stomp | libstomp-ruby1.8, rdoc, ruby-ldap | libldap-ruby1.8, puppetdb-terminus Description: Centralized configuration management - master startup and compatibility scripts |