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

[Stig Sandbeck Mathisen]

The following commit has been merged in the master branch:
commit ce0f1e8ec25f4a3901a65a95a9317972730c9563
Author: Stig Sandbeck Mathisen <ssm at debian.org>
Date:   Tue Jun 15 09:28:15 2010 +0200

    Update changelog

diff --git a/debian/changelog b/debian/changelog
index 983a8ec..fd98a55 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,15 @@
 puppet (0.25.5-1) UNRELEASED; urgency=low
 
+  [ Stig Sandbeck Mathisen ]
   * New upstream version: 0.25.5
+  * Adjust conflicts for puppet-common, to ensure upgrade goes well
+
+  [ Mathias Gug ]
+  * Add /etc/puppet/templates and /etc/puppet/modules to the puppet-
+    common package
+  * Add binary package "puppet-testsuite"
 
- -- Stig Sandbeck Mathisen <ssm at debian.org>  Tue, 18 May 2010 11:19:18 +0200
+ -- Stig Sandbeck Mathisen <ssm at debian.org>  Tue, 15 Jun 2010 09:27:53 +0200
 
 puppet (0.25.4-6) unstable; urgency=low
 

-- 
Puppet packaging for Debian