[DRE-commits] r5936 - in trunk/redmine/debian: . patches

[Jérémy Lal]

Author: kapouer-guest
Date: 2010-10-17 23:24:16 +0000 (Sun, 17 Oct 2010)
New Revision: 5936

Added:
   trunk/redmine/debian/patches/save_disable_autologin.patch
Modified:
   trunk/redmine/debian/changelog
   trunk/redmine/debian/patches/disable-deprecations.patch
   trunk/redmine/debian/patches/mysql_create_table_utf8.patch
   trunk/redmine/debian/patches/series
Log:
Some patches were missing a description. Fix an issue with autologin, fixed upstream.

Modified: trunk/redmine/debian/changelog
===================================================================
--- trunk/redmine/debian/changelog	2010-10-17 21:58:19 UTC (rev 5935)
+++ trunk/redmine/debian/changelog	2010-10-17 23:24:16 UTC (rev 5936)
@@ -1,9 +1,12 @@
 redmine (1.0.2-4) unstable; urgency=low
 
-  * Fix wrong dependencies on libdbd-*-ruby packages :
+  * Fix wrong dependencies on libdbd-*-ruby packages,
     only lib(mysql|pgsql|sqlite3)-ruby are needed.
+  * Make "disable autologin" really work. From upstream patch
+    http://www.redmine.org/issues/6438
+  * Some patches were missing a description.
 
- -- Jérémy Lal <kapouer at melix.org>  Sun, 17 Oct 2010 19:30:22 +0200
+ -- Jérémy Lal <kapouer at melix.org>  Mon, 18 Oct 2010 01:14:19 +0200
 
 redmine (1.0.2-3) unstable; urgency=low
 

Modified: trunk/redmine/debian/patches/disable-deprecations.patch
===================================================================
--- trunk/redmine/debian/patches/disable-deprecations.patch	2010-10-17 21:58:19 UTC (rev 5935)
+++ trunk/redmine/debian/patches/disable-deprecations.patch	2010-10-17 23:24:16 UTC (rev 5936)
@@ -1,6 +1,7 @@
-Deprecation warnings are not interesting for production use.
-The debian redmine maintainers are supposed to run the test suite
-before release (see README.source), so the warnings won't be missed.
+Description: Deprecation warnings are not interesting for production use.
+ The debian redmine maintainers are supposed to run the test suite
+ before release (see README.source), so the warnings won't be missed.
+
 --- a/config/environment.rb
 +++ b/config/environment.rb
 @@ -19,6 +19,11 @@

Modified: trunk/redmine/debian/patches/mysql_create_table_utf8.patch
===================================================================
--- trunk/redmine/debian/patches/mysql_create_table_utf8.patch	2010-10-17 21:58:19 UTC (rev 5935)
+++ trunk/redmine/debian/patches/mysql_create_table_utf8.patch	2010-10-17 23:24:16 UTC (rev 5936)
@@ -1,3 +1,12 @@
+Description: Mysql is unfortunately not configured by default to create UTF8 databases,
+ and dbconfig-common is missing a configuration variable too :
+ http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=599374
+ Mysql is to blame, but at least it is possible to create a table with a
+ default charset, though libactiverecord does not take advantage of that fact.
+ This patch address the issue in ActiveRecord, forwarded upstream :
+ http://rails.lighthouseapp.com/projects/8994/tickets/5830-mysql-adapter-should-create-table-with-default-charset
+Author: Jérémy Lal <kapouer at melix.org>
+
 --- a/config/initializers/10-patches.rb
 +++ b/config/initializers/10-patches.rb
 @@ -1,6 +1,22 @@

Added: trunk/redmine/debian/patches/save_disable_autologin.patch
===================================================================
--- trunk/redmine/debian/patches/save_disable_autologin.patch	                        (rev 0)
+++ trunk/redmine/debian/patches/save_disable_autologin.patch	2010-10-17 23:24:16 UTC (rev 5936)
@@ -0,0 +1,15 @@
+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-10-17 21:58:19 UTC (rev 5935)
+++ trunk/redmine/debian/patches/series	2010-10-17 23:24:16 UTC (rev 5936)
@@ -1,3 +1,4 @@
+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