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

[Jérémy Lal]

The following commit has been merged in the master-experimental branch:
commit fe4fab3fb29c899df2a15bad97ae1353b0e5192b
Author: Ondřej Surý <ondrej at sury.org>
Date:   Tue May 31 09:38:36 2011 +0200

    email.yml was renamed to configuration.yml
    
    Signed-off-by: Ondřej Surý <ondrej at sury.org>
    Signed-off-by: Jérémy Lal <kapouer at melix.org>

diff --git a/debian/README.Debian b/debian/README.Debian
index 2eec38c..5a1fe66 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -82,7 +82,7 @@ Accordingly, these files are owned by root:www-data and have 640 permissions :
 
     /etc/redmine/<instancename>/session.yml
     /etc/redmine/<instancename>/database.yml
-    /etc/redmine/<instancename>/email.yml
+    /etc/redmine/<instancename>/configuration.yml
 
 These folders are owned by www-data:www-data and have 750 permissions :
 
@@ -101,7 +101,7 @@ Why : redmine package upgrades will benefit to all redmine instances, although
 calling manually rake db:migrate on each package upgrade is still necessary.
 Besides support for X_DEBIAN_SITEID, several environment variables are available :
 
-* RAILS_ETC (where database.yml, email.yml are supposed to be)
+* RAILS_ETC (where database.yml, configuration.yml are supposed to be)
 * RAILS_LOG (the log files)
 * RAILS_VAR (contains the files/ directory)
 * RAILS_CACHE (cached data)
@@ -141,12 +141,12 @@ MANUAL EMAIL CONFIGURATION
 --------------------------
 
 Email settings are not automatically configured, for a quick setup :
-    cp /usr/share/doc/redmine/examples/email.yml /etc/redmine/<instancename>/email.yml
+    cp /usr/share/doc/redmine/examples/configuration.yml /etc/redmine/<instancename>/configuration.yml
 and edit the file.
 
 Then change permissions and owner :
-    chmod 640 /etc/redmine/<instancename>/email.yml
-    chown root:www-data /etc/redmine/<instancename>/email.yml
+    chmod 640 /etc/redmine/<instancename>/configuration.yml
+    chown root:www-data /etc/redmine/<instancename>/configuration.yml
 
 then restart redmine and check if it's working by sending a test email in
 Administration panel -> Settings -> Email notifications -> Send a test email
@@ -164,4 +164,4 @@ http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=570402
 
 
 
- -- Jérémy Lal <kapouer at melix.org>  Sat, 19 Sep 2009 14:30:19 +0200
+ -- Ondřej Surý <ondrej at debian.org>, Tue, 31 May 2011 09:30:21 +0200
diff --git a/debian/examples b/debian/examples
index bb260d1..e2c01a8 100644
--- a/debian/examples
+++ b/debian/examples
@@ -1,2 +1,2 @@
 debian/doc/examples/*
-config/email.yml.example
+config/configuration.yml.example
diff --git a/debian/postinst b/debian/postinst
index 260ff5d..fd2ad1d 100644
--- a/debian/postinst
+++ b/debian/postinst
@@ -221,6 +221,12 @@ for lInstance in $gInstances; do
 			if [ -f db/schema.db ]; then
 				cp db/schema.db $fRailsCache/schema.db
 			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
+				mv "$fRailsEtc/email.yml" "$fRailsEtc/configuration.yml"
+			fi
+			#fi
 			# add secret key, set permissions, manage file with ucf
 			if [ ! -f "${fRailsEtc}/session.yml" ]; then
 				rake -s generate_session_store YML_SESSION_FILENAME="session.yml.new" RAILS_ENV=$fRailsEnv X_DEBIAN_SITEID="${lInstance}" || true
diff --git a/debian/rules b/debian/rules
index 6b7557a..1ef1782 100755
--- a/debian/rules
+++ b/debian/rules
@@ -25,7 +25,7 @@ binary-install/redmine::
 	rm -f debian/redmine/usr/share/redmine/config/database.yml.example
 
 	# replace config/email.yml by /etc/redmine/<instance>/email.yml in all locales (Closes: #590846)
-	sed -i -e 's/config\/email\.yml/\/etc\/redmine\/\&lt\;instance\&gt\;\/email\.yml/g' debian/redmine/usr/share/redmine/config/locales/*.yml 
+	sed -i -e 's/config\/configuration\.yml/\/etc\/redmine\/\&lt\;instance\&gt\;\/configuration\.yml/g' debian/redmine/usr/share/redmine/config/locales/*.yml 
 
 	# Mark scripts as executable until upstream fixes their .tar.gz archive build
 	chmod a+x debian/redmine/usr/share/redmine/extra/mail_handler/rdm-mailhandler.rb

-- 
redmine.git