[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, master, updated. debian/0.24.7-1-1-gdbce12b

[Micah Anderson]

The following commit has been merged in the master branch:
commit dbce12b40f0f95c510e24a2b5fa94ffbe283ed6b
Author: Micah Anderson <micah at riseup.net>
Date:   Wed Jan 28 10:29:41 2009 -0500

    Set puppetmaster to conflict with previous versions of puppet because the man page move

diff --git a/debian/changelog b/debian/changelog
index 89c5252..73b4559 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+puppet (0.24.7-2) experimental; urgency=low
+
+  * make puppetmaster conflict previous puppet due to man page move
+
+ -- Micah Anderson <micah at debian.org>  Wed, 28 Jan 2009 10:28:23 -0500
+
 puppet (0.24.7-1) experimental; urgency=low
 
   * New upstream release
diff --git a/debian/control b/debian/control
index ddb64fa..0e1d8aa 100644
--- a/debian/control
+++ b/debian/control
@@ -29,6 +29,7 @@ Description: centralised configuration management for networks
 Package: puppetmaster
 Architecture: all
 Depends: ruby (>= 1.8.1), puppet (= ${source:Version}), facter, lsb-base
+Conflicts: puppet (<< 0.24.7-1)
 Recommends: rails (>= 1.2.3-2), rdoc, libldap-ruby1.8
 Suggests: apache2 | nginx, mongrel
 Description: centralised configuration management control daemon

-- 
Puppet packaging for Debian