[DRE-commits] [SCM] redmine.git branch, master-experimental, updated. debian/1.1.3-1-14-gea5b93f

[Jérémy Lal]

The following commit has been merged in the master-experimental branch:
commit 3aadbf7c135c509824dd23d7277ee9b822f2bbb3
Author: Jérémy Lal <kapouer at melix.org>
Date:   Sat Jul 2 16:52:53 2011 +0200

    Configuration file email.yml renamed to configuration.yml : purge accordingly.

diff --git a/debian/postinst b/debian/postinst
index fd2ad1d..c923f68 100644
--- a/debian/postinst
+++ b/debian/postinst
@@ -27,8 +27,10 @@ for lInstance in $gOldInstances; do
 	fi
 	if which ucf >/dev/null 2>&1; then
 		ucf --purge /etc/redmine/$lInstance/database.yml
-		ucf --purge /etc/redmine/$lInstance/email.yml
 		ucf --purge /etc/redmine/$lInstance/session.yml
+		ucf --purge /etc/redmine/$lInstance/configuration.yml
+		# email.yml was renamed to configuration.yml since 1.2.0
+		ucf --purge /etc/redmine/$lInstance/email.yml
 	fi
 	rm -rf /etc/redmine/$lInstance
 done
@@ -223,7 +225,7 @@ for lInstance in $gInstances; do
 			fi
 			# if dpkg --compare-versions "$2" lt "1.2.0-1~"; then
 			if [ -e "$fRailsEtc/email.yml" -a ! -e "$fRailsEtc/configuration.yml" ]; then
-				# email.yml was renamed to configuration.yml
+				# email.yml was renamed to configuration.yml since 1.2.0
 				mv "$fRailsEtc/email.yml" "$fRailsEtc/configuration.yml"
 			fi
 			#fi
diff --git a/debian/postrm b/debian/postrm
index e1ecef9..72806a7 100644
--- a/debian/postrm
+++ b/debian/postrm
@@ -59,13 +59,17 @@ case "$1" in
 		if which ucf >/dev/null 2>&1; then
 			for lInstance in $gOldInstances; do
 				ucf --purge /etc/redmine/$lInstance/database.yml
-				ucf --purge /etc/redmine/$lInstance/email.yml
 				ucf --purge /etc/redmine/$lInstance/session.yml
+				ucf --purge /etc/redmine/$lInstance/configuration.yml
+				# email.yml was renamed to configuration.yml since 1.2.0
+				ucf --purge /etc/redmine/$lInstance/email.yml
 			done
 			for lInstance in $gInstances; do
 				ucf --purge /etc/redmine/$lInstance/database.yml
-				ucf --purge /etc/redmine/$lInstance/email.yml
 				ucf --purge /etc/redmine/$lInstance/session.yml
+				ucf --purge /etc/redmine/$lInstance/configuration.yml
+				# email.yml was renamed to configuration.yml since 1.2.0
+				ucf --purge /etc/redmine/$lInstance/email.yml
 			done
 		fi
 		# package-generated or runtime files are removed

-- 
redmine.git