diff options
| author | Melissa Stone <melissa@puppetlabs.com> | 2014-07-01 19:58:10 -0700 |
|---|---|---|
| committer | Melissa Stone <melissa@puppetlabs.com> | 2014-07-02 10:18:50 -0700 |
| commit | 4b13ae6c56a4af7a5a50776c5d0bb956a95bb23a (patch) | |
| tree | 0b9747c9ffc02edad0f90e34aef8929ffc0cb796 /ext | |
| parent | 401684525e1fc207486832a1f4a653a59132ce16 (diff) | |
| download | puppet-4b13ae6c56a4af7a5a50776c5d0bb956a95bb23a.tar.gz | |
(PUP-2878) file conflict upgrading from 2.7.26 to 3.6.2
Currently, upgrades from 2.7.26 to 3.6.2 break because of a file
conflict. It seems that as of Puppet 3.3.0, the manpages changed from
being owned by the puppet package, to being owned by the puppet-common
package. This change was initially done to allow upgrades from Debian
packages to ours. However, changing which package owns a given file
makes upgrades difficult. This commit adds in conflicts to allow smooth
upgrades from puppet packages prior to the manpage change to the current
version.
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/debian/control | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ext/debian/control b/ext/debian/control index 6f0e8467b..5cfcf6182 100644 --- a/ext/debian/control +++ b/ext/debian/control @@ -16,7 +16,7 @@ Recommends: lsb-release, debconf-utils Suggests: ruby-selinux | libselinux-ruby1.8, librrd-ruby1.9.1 | librrd-ruby1.8 Breaks: puppet (<< 2.6.0~rc2-1), puppetmaster (<< 0.25.4-1) Provides: hiera-puppet -Conflicts: hiera-puppet +Conflicts: hiera-puppet, puppet (<< 3.3.0-1puppetlabs1) Replaces: hiera-puppet Description: Centralized configuration management Puppet lets you centrally manage every important aspect of your system @@ -39,6 +39,7 @@ Architecture: all Depends: ${misc:Depends}, puppet-common (= ${binary:Version}), ruby | ruby-interpreter Recommends: rdoc Suggests: puppet-el, vim-puppet +Conflicts: puppet-common (<< 3.3.0-1puppetlabs1) Description: Centralized configuration management - agent startup and compatibility scripts This package contains the startup script and compatbility scripts for the puppet agent, which is the process responsible for configuring the local node. |