[SCM] live-build branch, debian, updated. debian/3.0_a48-1-17-g6e10198

[Daniel Baumann]

The following commit has been merged in the debian branch:
commit 4c903bab69b24f2a79cafc262273229a1b108044
Author: Daniel Baumann <daniel at debian.org>
Date:   Sun Jun 3 21:34:26 2012 +0200

    Removing some more configuration files on purge (Closes: #672379).

diff --git a/debian/live-build-cron.postrm b/debian/live-build-cron.postrm
index f386276..6b7eeb6 100644
--- a/debian/live-build-cron.postrm
+++ b/debian/live-build-cron.postrm
@@ -2,21 +2,26 @@
 
 set -e
 
-_DIRECTORY="/srv/debian.net/live-manual"
-
 case "${1}" in
-	remove)
-		if [ -d "${_DIRECTORY}" ]
-		then
-			rmdir --ignore-fail-on-non-empty "${_DIRECTORY}" || true
-		fi
-		;;
-
 	purge)
-		#rm -rf "${_DIRECTORY}"
+		# images
+		rm -f /etc/live/build-cron.d/images.conf
+		rmdir --ignore-fail-on-non-empty /etc/live/build-cron.d 2>&1 || true
+		rmdir --ignore-fail-on-non-empty /etc/live 2>&1 || true
+
+		rm -f /etc/cron.d/live-build-cron-manual
+		rmdir --ignore-fail-on-non-empty /etc/cron.d/live-build-cron-manual 2>&1 || true
+
+		# manual
+		rm -f /etc/live/build-cron.d/manual.conf
+		rmdir --ignore-fail-on-non-empty /etc/live/build-cron.d 2>&1 || true
+		rmdir --ignore-fail-on-non-empty /etc/live 2>&1 || true
+
+		rm -f /etc/cron.d/live-build-cron-images
+		rmdir --ignore-fail-on-non-empty /etc/cron.d/live-build-cron-images 2>&1 || true
 		;;
 
-	upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
+	remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
 
 		;;
 

-- 
live-build