[DRE-commits] r5959 - in trunk/redmine/debian: . doc/examples patches

Mon Nov 1 12:28:34 UTC 2010

Author: kapouer-guest
Date: 2010-11-01 12:28:32 +0000 (Mon, 01 Nov 2010)
New Revision: 5959

Added:
   trunk/redmine/debian/patches/thin_x_debian_siteid.patch
Removed:
   trunk/redmine/debian/doc/examples/thin-redmine.rb
   trunk/redmine/debian/patches/save_disable_autologin.patch
Modified:
   trunk/redmine/debian/changelog
   trunk/redmine/debian/config
   trunk/redmine/debian/doc/examples/thin-redmine.yml
   trunk/redmine/debian/patches/series
Log:
Upstream update, add support for new locales config, patch for thin x_debian_siteid config, better example.

Modified: trunk/redmine/debian/changelog
===================================================================

--- trunk/redmine/debian/changelog	2010-11-01 08:21:44 UTC (rev 5958)
+++ trunk/redmine/debian/changelog	2010-11-01 12:28:32 UTC (rev 5959)
@@ -1,6 +1,12 @@
-redmine (1.0.2-5) UNRELEASED; urgency=low
+redmine (1.0.3-1) unstable; urgency=low
 
-  * Adds a configuration example for "thin".
+  * New upstream release.
+  * Support for variable 'x_debian_siteid' in thin config file,
+    and provide yml example.
+  * Update the list of supported locales for loading default data,
+    upstream added support for : en-GB, eu, lv, mk, mn, sr-YU.
+    (Closes: #566859)
+  * Remove "disable autologin" patch, applied upstream.
 
  -- Jérémy Lal <kapouer at melix.org>  Wed, 27 Oct 2010 00:13:57 +0200
 

Modified: trunk/redmine/debian/config
===================================================================
--- trunk/redmine/debian/config	2010-11-01 08:21:44 UTC (rev 5958)
+++ trunk/redmine/debian/config	2010-11-01 12:28:32 UTC (rev 5959)
@@ -3,7 +3,8 @@
 set -e
 #set -x
 
-redLocales="bg, bs, ca, cs, da, de, el, en, es, fi, fr, gl, he, hr, hu, id, it, ja, ko, lt, nl, no, pl, pt, pt-br, ro, ru, sk, sl, sr, sv, th, tr, uk, vi, zh, zh-tw"
+# variants must be placed before to be automatically configured
+redLocales="bg, bs, ca, cs, da, de, el, en-gb, en, es, eu, fi, fr, gl, he, hr, hu, id, it, ja, ko, lt, lv, mk, mn, nl, no, pl, pt-br, pt, ro, ru, sk, sl, sr-yu, sr, sv, th, tr, uk, vi, zh-tw, zh"
 
 . /usr/share/debconf/confmodule
 db_version 2.0

Deleted: trunk/redmine/debian/doc/examples/thin-redmine.rb
===================================================================
--- trunk/redmine/debian/doc/examples/thin-redmine.rb	2010-11-01 08:21:44 UTC (rev 5958)
+++ trunk/redmine/debian/doc/examples/thin-redmine.rb	2010-11-01 12:28:32 UTC (rev 5959)
@@ -1,2 +0,0 @@
-# put the name of the instance you want to launch using thin :
-ENV['X_DEBIAN_SITEID'] = 'default'

Modified: trunk/redmine/debian/doc/examples/thin-redmine.yml
===================================================================
--- trunk/redmine/debian/doc/examples/thin-redmine.yml	2010-11-01 08:21:44 UTC (rev 5958)
+++ trunk/redmine/debian/doc/examples/thin-redmine.yml	2010-11-01 12:28:32 UTC (rev 5959)
@@ -1,12 +1,17 @@
-# the trick is to require the file that sets the X_DEBIAN_SITEID environment variable :
-require: [thin-redmine.rb]
-
-# mandatory parameters
+# parameters common to all instances
 environment: production
 chdir: /usr/share/redmine/
 user: www-data
 group: www-data
 
-# anything else
-servers: 2
-daemonize: true
+# parameters that depend on the redmine instance
+x_debian_siteid: default
+pid: /var/run/redmine/sockets/default/thin-1.pid
+log: /var/log/redmine/default/thin.log
+port: 3000
+# might use a unix socket instead :
+# socket: /var/run/redmine/sockets/default/thin-1.socket
+
+# read http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=602077 before using this
+# servers: 2
+# a workaround is to copy this file and change pid name and port number (or socket name)

Deleted: trunk/redmine/debian/patches/save_disable_autologin.patch
===================================================================
--- trunk/redmine/debian/patches/save_disable_autologin.patch	2010-11-01 08:21:44 UTC (rev 5958)
+++ trunk/redmine/debian/patches/save_disable_autologin.patch	2010-11-01 12:28:32 UTC (rev 5959)
@@ -1,15 +0,0 @@
-Description: Annoying little issue, fixed upstream http://www.redmine.org/issues/6438
-
-diff --git a/app/views/settings/_authentication.rhtml b/app/views/settings/_authentication.rhtml
-index da29bb7..1122053 100644
---- a/app/views/settings/_authentication.rhtml
-+++ b/app/views/settings/_authentication.rhtml
-@@ -3,7 +3,7 @@
- <div class="box tabular settings">
- <p><%= setting_check_box :login_required %></p>
- 
--<p><%= setting_select :autologin, [1, 7, 30, 365].collect{|days| [l('datetime.distance_in_words.x_days', :count => days), days.to_s]}, :blank => :label_disabled %></p>
-+<p><%= setting_select :autologin, [[l(:label_disabled), 0]] + [1, 7, 30, 365].collect{|days| [l('datetime.distance_in_words.x_days', :count => days), days.to_s]} %></p>
- 
- <p><%= setting_select :self_registration, [[l(:label_disabled), "0"],
- 							                             [l(:label_registration_activation_by_email), "1"],

Modified: trunk/redmine/debian/patches/series
===================================================================
--- trunk/redmine/debian/patches/series	2010-11-01 08:21:44 UTC (rev 5958)
+++ trunk/redmine/debian/patches/series	2010-11-01 12:28:32 UTC (rev 5959)
@@ -1,4 +1,3 @@
-save_disable_autologin.patch
 0008-Wrong-path-for-interpreter.patch
 0009-Allows-environment-variables-to-setup-debian-paths.patch
 0014-Move-session-configuration-to-YML-file-next-to-datab.patch
@@ -7,3 +6,4 @@
 0018-remove-shebang.patch
 disable-deprecations.patch
 mysql_create_table_utf8.patch
+thin_x_debian_siteid.patch

Added: trunk/redmine/debian/patches/thin_x_debian_siteid.patch
===================================================================
--- trunk/redmine/debian/patches/thin_x_debian_siteid.patch	                        (rev 0)
+++ trunk/redmine/debian/patches/thin_x_debian_siteid.patch	2010-11-01 12:28:32 UTC (rev 5959)
@@ -0,0 +1,14 @@
+Description: adds support for "x_debian_siteid" configuration option for thin yaml config file.
+ See also debian/doc/examples/thin-redmine.yml
+Author: Jérémy Lal <kapouer at melix.org>
+
+--- a/config/environment.rb
++++ b/config/environment.rb
+@@ -6,6 +6,7 @@
+ 
+ # for debian package : setup proper environment variables and paths
+ # To run redmine as unprivileged user, see /usr/share/doc/redmine/README.Debian
++ObjectSpace.each_object(Thin::Runner){|x| ENV["X_DEBIAN_SITEID"] = x.options[:x_debian_siteid] if x.options[:x_debian_siteid]} if defined?(Thin)
+ ENV['X_DEBIAN_SITEID'] ||= 'default'
+ ENV['RAILS_ETC'] ||= "/etc/redmine/#{ENV['X_DEBIAN_SITEID']}"
+ ENV['RAILS_LOG'] ||= "/var/log/redmine/#{ENV['X_DEBIAN_SITEID']}"


