[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, master, updated. debian/0.25.4-6-92-g344d2c9

[Stig Sandbeck Mathisen]

The following commit has been merged in the master branch:
commit 344d2c9eb039a6e629bf92a657bbc01acb586615
Author: Stig Sandbeck Mathisen <ssm at debian.org>
Date:   Wed Jun 9 20:57:59 2010 +0200

    Adjust conflicts for puppet-common, to ensure upgrade goes well

diff --git a/debian/control b/debian/control
index bb4af38..4c50d80 100644
--- a/debian/control
+++ b/debian/control
@@ -50,7 +50,7 @@ Description: centralised configuration management control daemon
 Package: puppet-common
 Architecture: all
 Depends: ${misc:Depends}, ruby1.8, libxmlrpc-ruby, libopenssl-ruby, libshadow-ruby1.8, adduser
-Conflicts: puppet (<< ${source:Version}), puppetmaster (<< ${source:Version})
+Conflicts: puppet (<< 0.25.4-1), puppetmaster (<< 0.25.4-1)
 Description: common files for puppet and puppetmaster
  Puppet lets you centrally manage every important aspect of your system
  using a cross-platform specification language that manages all the

-- 
Puppet packaging for Debian