[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, master, updated. debian/0.25.4-2-14-gd9d9e2d

[Andrew Pollock]

The following commit has been merged in the master branch:
commit d9d9e2d71838f2283a03f47f4d9966b22403893a
Author: Andrew Pollock <apollock at debian.org>
Date:   Fri Apr 2 21:36:57 2010 -0700

    Fix for #571130
    
    Apply patch from Mathias Gug to add /etc/puppet to debian/puppet-common.dirs
    and remove /var/lib/puppet if it's empty

diff --git a/debian/changelog b/debian/changelog
index a249503..1f6d113 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,11 @@
 puppet (0.25.4-4) UNRELEASED; urgency=low
 
   * debian/watch: update for new upstream location
+  * apply patch from Mathias Gug to add /etc/puppet to puppet-common's
+    directories so that it is removed on package purge (if empty). Also removes
+    /var/log/puppet on purge (closes: #571130)
 
- -- Andrew Pollock <apollock at debian.org>  Fri, 02 Apr 2010 21:24:36 -0700
+ -- Andrew Pollock <apollock at debian.org>  Fri, 02 Apr 2010 21:34:53 -0700
 
 puppet (0.25.4-3) unstable; urgency=low
 
diff --git a/debian/puppet-common.dirs b/debian/puppet-common.dirs
index e5ecea4..41a50b4 100644
--- a/debian/puppet-common.dirs
+++ b/debian/puppet-common.dirs
@@ -1,3 +1,4 @@
+etc/puppet
 etc/puppet/manifests
 usr/lib/ruby/1.8
 var/lib/puppet
diff --git a/debian/puppet-common.postrm b/debian/puppet-common.postrm
index f7fedec..5ebf597 100644
--- a/debian/puppet-common.postrm
+++ b/debian/puppet-common.postrm
@@ -5,8 +5,14 @@ case "$1" in
 		# Remove puppetd.conf (used in > 0.24)
 		rm -f /etc/puppet/puppetd.conf
 
-		# Remove explicitly created state directory
+		# Remove puppet state directory created by the postinst script.
+		# This directory can be removed without causing harm 
+		# according to upstream documentation.
 		rm -rf /var/lib/puppet/state
+		rmdir --ignore-fail-on-non-empty /var/lib/puppet
+
+		# Remove puppet log files
+		rm -rf /var/log/puppet/
 		;;
     remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
 

-- 
Puppet packaging for Debian