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

Mon Sep 27 00:17:49 UTC 2010

Author: kapouer-guest
Date: 2010-09-27 00:17:46 +0000 (Mon, 27 Sep 2010)
New Revision: 5877

Added:
   trunk/redmine/debian/patches/disable-deprecations.patch
Removed:
   trunk/redmine/debian/patches/i18n-0.4.1.patch
Modified:
   trunk/redmine/debian/README.Debian
   trunk/redmine/debian/README.source
   trunk/redmine/debian/changelog
   trunk/redmine/debian/doc/examples/apache2-passenger-host.conf
   trunk/redmine/debian/patches/0009-Allows-environment-variables-to-setup-debian-paths.patch
   trunk/redmine/debian/patches/series
   trunk/redmine/debian/po/es.po
Log:
redmine 1.0.2-1

  * New upstream release: better stability, and translations
    updates. See http://www.redmine.org/versions/show/24
  * Reformat README.Debian to make it easier to read, mention that running
    with webrick needs a log dir. (Closes: #597649)
  * Remove patch for libi18n-ruby 0.4.1 support, applied upstream.
    Silent deprecation warnings in production env.
  * Update es translation. (Closes: #594853)
  * Improve apache2-passenger-host.conf example.

Modified: trunk/redmine/debian/README.Debian
===================================================================

--- trunk/redmine/debian/README.Debian	2010-09-26 21:35:45 UTC (rev 5876)
+++ trunk/redmine/debian/README.Debian	2010-09-27 00:17:46 UTC (rev 5877)
@@ -1,121 +1,167 @@
 redmine for Debian
-------------------
+==================
 
-* SUPPORTS SETUP AND UPGRADES OF MULTIPLE DATABASE INSTANCES
- This redmine package is designed to automatically configure database
- BUT NOT the web server.
- The default database instance is called "default".
- A debconf facility is provided for configuring several redmine
- instances. Use dpkg-reconfigure to define the instances identifiers.
- NOTICE : every rake command has to know which instance it applies to.
- TO SELECT THE INSTANCE, USE
-	X_DEBIAN_SITEID=<instancename>
- BEFORE ANY RAKE TASK.
+SUPPORTS SETUP AND UPGRADES OF MULTIPLE DATABASE INSTANCES
+----------------------------------------------------------
+
+This redmine package is designed to automatically configure database
+BUT NOT the web server.
+The default database instance is called "default".
+A debconf facility is provided for configuring several redmine
+instances. Use dpkg-reconfigure to define the instances identifiers.
+NOTICE : every rake command has to know which instance it applies to.
+TO SELECT THE INSTANCE, USE
+X_DEBIAN_SITEID=<instancename>
+BEFORE ANY RAKE TASK.
  
- Example : (run the imap mail receiver)
-sudo -u www-data X_DEBIAN_SITEID=default RAILS_ENV=production \
-rake -f /usr/share/redmine/Rakefile \
-redmine:email:receive_imap \
-host=imap.test.com \
-username=test at test.com password=xxxxxx
+Example : (run the imap mail receiver)
+    sudo -u www-data X_DEBIAN_SITEID=default RAILS_ENV=production \
+    rake -f /usr/share/redmine/Rakefile \
+    redmine:email:receive_imap \
+    host=imap.test.com \
+    username=test at test.com password=xxxxxx
 
-* REDMINE GUIDE
- http://www.redmine.org/wiki/redmine/Guide
 
-* REMEMBER TO CHANGE THE DEFAULT ADMIN PASSWORD
- By default, redmine admin account log/pass is admin/admin
+REDMINE GUIDE
+-------------
 
-* MANUAL WEB SERVER CONFIGURATION
- There are several ways to serve a rails app like redmine.
- Some examples for configuration with passenger, or with a fastcgi web server,
- are available in /usr/share/doc/redmine/examples.
- To run redmine with a fastcgi web server, libfcgi-ruby package must be installed.
- Also note that libapache2-mod-fcgid package provides fastcgi support for apache2.
+http://www.redmine.org/wiki/redmine/Guide
 
- In the provided examples, the environment variable must be set to the desired
- instance name :
- X_DEBIAN_SITEID=<instancename>
- By default, 
- X_DEBIAN_SITEID=default 
 
-* QUICK LAUNCH USING WEBRICK
- To test redmine without installing a web server, run as root :
- cd /usr/share/redmine/
- mkdir tmp
- chown www-data:www-data tmp
- sudo -u www-data X_DEBIAN_SITEID="default" ruby script/server webrick -e production
- and point your browser to http://localhost:3000
- When done, remove /usr/share/redmine/tmp
- NOTICE :
- - Running without sudoing to www-data will change permissions on some files, e.g.
- /var/log/redmine files. Fix it or reinstall the redmine package if you did so.
- - The tmp/ directory is needed when launching webrick, although nothing but empty directories
-   will be created in it.
+REMEMBER TO CHANGE THE DEFAULT ADMIN PASSWORD
+---------------------------------------------
 
- * OWNERS AND PERMISSIONS
- It is assumed ruby will run redmine as www-data:www-data.
- 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
- These folders are owned by www-data:www-data and have 750 permissions :
- /var/log/redmine/*
- /var/lib/redmine/*
- /var/cache/redmine/*
+By default, redmine admin account log/pass is admin/admin
 
- Relaxing those permissions is discouraged. Please think twice before doing so.
- If one really need to run redmine as another user, please read what follows.
 
-* MANUAL INSTALL / RUNNING AS UNPRIVILEGED USER WITHOUT COPYING /usr/share/redmine
- 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_LOG (the log files)
-  RAILS_VAR (contains the files/ directory)
-  RAILS_CACHE (cached data)
-  and, of course, RAILS_ENV
- That way, one can install redmine as a user foo :
- - first create some directories in e.g. /home/foo/redmine : config, files, tmp, log
- - in a terminal, declare those environment variables :
-  mydir=/home/dev/test/redmine
-  export RAILS_ETC=$mydir/config
-  export RAILS_LOG=$mydir/log
-  export RAILS_VAR=$mydir
-  export RAILS_CACHE=$mydir/tmp
-  export RAILS_ENV=production
-  export X_DEBIAN_SITEID=myinstance
- - copy /usr/share/redmine/templates/database.yml.template to $mydir/config/database.yml
- and adapt it to your needs; for a quick setup it's easier to use the sqlite template,
- located in the same dir.
- - link /usr/share/redmine/db to $mydir/db :
-  ln -s /usr/share/redmine/db $mydir/db
- - then "install" redmine :
-  rake -f /usr/share/redmine/Rakefile generate_session_store
-  rake -f /usr/share/redmine/Rakefile db:migrate
-  rake -f /usr/share/redmine/Rakefile redmine:load_default_data
-  rake -f /usr/share/redmine/Rakefile db:migrate_plugins
- - Run redmine using e.g. webrick and point your browser to localhost:3000
-  ruby /usr/share/redmine/script/server webrick -e production
+MANUAL WEB SERVER CONFIGURATION
+-------------------------------
+
+There are several ways to serve a rails app like redmine.
+Some examples for configuration with passenger, or with a fastcgi web server,
+are available in /usr/share/doc/redmine/examples.
+To run redmine with a fastcgi web server, libfcgi-ruby package must be installed.
+Also note that libapache2-mod-fcgid package provides fastcgi support for apache2.
+
+In the provided examples, the environment variable must be set to the desired
+instance name :
+X_DEBIAN_SITEID=<instancename>
+By default, 
+X_DEBIAN_SITEID=default 
+
+
+QUICK LAUNCH USING WEBRICK
+--------------------------
+
+To test redmine without installing a web server, run as root :
+
+    cd /usr/share/redmine/
+    mkdir tmp
+    chown www-data:www-data tmp
+    mkdir log
+    touch log/production.log
+    chown www-data:www-data log/production.log
+    sudo -u www-data X_DEBIAN_SITEID="default" ruby script/server webrick -e production
+
+and point your browser to http://localhost:3000
+When done, remove /usr/share/redmine/tmp
+
+NOTICE :
+
+* Running without sudoing to www-data will change permissions on some files, e.g.
+/var/log/redmine files. Fix it or reinstall the redmine package if you did so.
+* The tmp/ directory is needed when launching webrick, although nothing but empty directories
+will be created in it.
+
+
+OWNERS AND PERMISSIONS
+----------------------
+
+It is assumed ruby will run redmine as www-data:www-data.
+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
+
+These folders are owned by www-data:www-data and have 750 permissions :
+
+    /var/log/redmine/*
+    /var/lib/redmine/*
+    /var/cache/redmine/*
+
+Relaxing those permissions is discouraged. Please think twice before doing so.
+If one really need to run redmine as another user, please read what follows.
+
+
+MANUAL INSTALL / RUNNING AS UNPRIVILEGED USER WITHOUT COPYING /usr/share/redmine
+--------------------------------------------------------------------------------
+
+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_LOG (the log files)
+* RAILS_VAR (contains the files/ directory)
+* RAILS_CACHE (cached data)
+* RAILS_ENV
+
+That way, one can install redmine as a user foo :
+
+1. First create some directories in e.g. /home/foo/redmine : config, files, tmp, log
+
+2. In a terminal, declare those environment variables :
+    mydir=/home/dev/test/redmine
+    export RAILS_ETC=$mydir/config
+    export RAILS_LOG=$mydir/log
+    export RAILS_VAR=$mydir
+    export RAILS_CACHE=$mydir/tmp
+    export RAILS_ENV=production
+    export X_DEBIAN_SITEID=myinstance
+
+3. Copy /usr/share/redmine/templates/database.yml.template to $mydir/config/database.yml
+and adapt it to your needs; for a quick setup it's easier to use the sqlite template,
+located in the same dir.
+
+4. Link /usr/share/redmine/db to $mydir/db :
+    ln -s /usr/share/redmine/db $mydir/db
+
+5. Then "install" redmine :
+    rake -f /usr/share/redmine/Rakefile generate_session_store
+    rake -f /usr/share/redmine/Rakefile db:migrate
+    rake -f /usr/share/redmine/Rakefile redmine:load_default_data
+    rake -f /usr/share/redmine/Rakefile db:migrate_plugins
+
+6. Run redmine using e.g. webrick and point your browser to localhost:3000
+    ruby /usr/share/redmine/script/server webrick -e production
  
-* MANUAL EMAIL CONFIGURATION
-Email settings are not automatically configured, for a quick setup, copy
-/usr/share/doc/redmine/examples/email.yml
-to
-/etc/redmine/<instancename>/email.yml
+
+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
 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>/email.yml
+    chown root:www-data /etc/redmine/<instancename>/email.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
 or refer to the Redmine Guide.
 
-* WARNING : delivery_method: :async_smtp
+
+WARNING : delivery_method: :async_smtp
+--------------------------------------
+
 It has been reported [0] that this method does not work when used by a rake task (e.g.
 in a crontab). Simply use :smtp method in that case.
+
 [0]
 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

Modified: trunk/redmine/debian/README.source
===================================================================
--- trunk/redmine/debian/README.source	2010-09-26 21:35:45 UTC (rev 5876)
+++ trunk/redmine/debian/README.source	2010-09-27 00:17:46 UTC (rev 5877)
@@ -1,12 +1,20 @@
-* RAKE TEST
+RAKE TEST
+=========
+
 1. dpkg-reconfigure redmine, add a "test" sqlite3 instance
+
 2. edit /etc/redmine/test/database.yml, copy 'production' section and rename it 'test'
    edit /usr/share/redmine/config/environments/test.rb and comment "mocha"
-3. Install debian packages available for libshoulda-ruby and libmocha-ruby
+   
+3. Install debian packages available for libshoulda-ruby and libmocha-ruby.
+   Depending on the redmine version, shoulda must be installed by :
+    gem intall shoulda -v <required shoulda version>
+   Take care to remove the shoulda gem if desired.
+   
 4.
-cd /usr/share/redmine
-mkdir -p tmp/test
-X_DEBIAN_SITEID=test RAILS_ENV=test rake test:scm:setup:all
-X_DEBIAN_SITEID=test RAILS_ENV=test rake test
+    cd /usr/share/redmine
+    mkdir -p tmp/test
+    X_DEBIAN_SITEID=test RAILS_ENV=test rake test:scm:setup:all
+    X_DEBIAN_SITEID=test RAILS_ENV=test rake test
 
 5. READ doc/RUNNING_TESTS in redmine source package to get more informations.

Modified: trunk/redmine/debian/changelog
===================================================================
--- trunk/redmine/debian/changelog	2010-09-26 21:35:45 UTC (rev 5876)
+++ trunk/redmine/debian/changelog	2010-09-27 00:17:46 UTC (rev 5877)
@@ -1,3 +1,16 @@
+redmine (1.0.2-1) unstable; urgency=low
+
+  * New upstream release: better stability, and translations
+    updates. See http://www.redmine.org/versions/show/24
+  * Reformat README.Debian to make it easier to read, mention that running
+    with webrick needs a log dir. (Closes: #597649)
+  * Remove patch for libi18n-ruby 0.4.1 support, applied upstream.
+    Silent deprecation warnings in production env.
+  * Update es translation. (Closes: #594853)
+  * Improve apache2-passenger-host.conf example.
+
+ -- Jérémy Lal <kapouer at melix.org>  Mon, 27 Sep 2010 02:17:00 +0200
+
 redmine (1.0.1-1) unstable; urgency=low
 
   * Upstream update, fixes many 1.0.0 RC bugs, see :

Modified: trunk/redmine/debian/doc/examples/apache2-passenger-host.conf
===================================================================
--- trunk/redmine/debian/doc/examples/apache2-passenger-host.conf	2010-09-26 21:35:45 UTC (rev 5876)
+++ trunk/redmine/debian/doc/examples/apache2-passenger-host.conf	2010-09-27 00:17:46 UTC (rev 5877)
@@ -1,11 +1,13 @@
 # These modules must be enabled : passenger
-# Configuration for http://localhost:3000/
+# Configuration for multiple vhosts http://localhost:3000/ and http://localhost:3030/
 # listen the port...
 Listen 3000
 <VirtualHost localhost:3000>
         # ServerName my.domain.name
         # this is the passenger config
         RailsEnv production
+        # create a link in /var/lib/redmine/default/passenger to /usr/share/redmine
+        PassengerAppRoot /var/lib/redmine/default/passenger
         SetEnv X_DEBIAN_SITEID "default"
         Alias "/plugin_assets/" /var/cache/redmine/default/plugin_assets/
         DocumentRoot /usr/share/redmine/public
@@ -14,3 +16,19 @@
                 Allow from all
         </Directory>
 </VirtualHost>
+
+Listen 3030
+<VirtualHost localhost:3030>
+        # ServerName my.domain.name
+        # this is the passenger config
+        RailsEnv production
+        # create a link in /var/lib/redmine/instance2/passenger to /usr/share/redmine
+        PassengerAppRoot /var/lib/redmine/instance2/passenger
+        SetEnv X_DEBIAN_SITEID "instance2"
+        Alias "/plugin_assets/" /var/cache/redmine/instance2/plugin_assets/
+        DocumentRoot /usr/share/redmine/public
+        <Directory "/usr/share/redmine/public">
+                Order allow,deny
+                Allow from all
+        </Directory>
+</VirtualHost>

Modified: trunk/redmine/debian/patches/0009-Allows-environment-variables-to-setup-debian-paths.patch
===================================================================
--- trunk/redmine/debian/patches/0009-Allows-environment-variables-to-setup-debian-paths.patch	2010-09-26 21:35:45 UTC (rev 5876)
+++ trunk/redmine/debian/patches/0009-Allows-environment-variables-to-setup-debian-paths.patch	2010-09-27 00:17:46 UTC (rev 5877)
@@ -61,13 +61,16 @@
    # config.active_record.observers = :cacher, :garbage_collector
 --- a/config/initializers/10-patches.rb
 +++ b/config/initializers/10-patches.rb
-@@ -78,3 +78,6 @@
- end
+@@ -79,6 +79,9 @@
  
  ActionMailer::Base.send :include, AsynchronousMailer
-+
+ 
 +# the session store
 +ActionController::Base.session_options[:tmpdir] = File.join(ENV['RAILS_VAR'], 'sessions') unless !ENV['RAILS_VAR']
++
+ # TODO: Hack to support i18n 4.x on Rails 2.3.5.  Remove post 2.3.6.
+ # See http://www.redmine.org/issues/6428 and http://www.redmine.org/issues/5608
+ module I18n
 --- a/config/initializers/40-email.rb
 +++ b/config/initializers/40-email.rb
 @@ -1,7 +1,7 @@

Added: trunk/redmine/debian/patches/disable-deprecations.patch
===================================================================
--- trunk/redmine/debian/patches/disable-deprecations.patch	                        (rev 0)
+++ trunk/redmine/debian/patches/disable-deprecations.patch	2010-09-27 00:17:46 UTC (rev 5877)
@@ -0,0 +1,13 @@
+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/environments/production.rb
++++ b/config/environments/production.rb
+@@ -28,3 +28,7 @@
+ 
+ # No email in production log
+ config.action_mailer.logger = nil
++
++# disable deprecation warnings
++ActiveSupport::Deprecation.silenced = true
++

Deleted: trunk/redmine/debian/patches/i18n-0.4.1.patch
===================================================================
--- trunk/redmine/debian/patches/i18n-0.4.1.patch	2010-09-26 21:35:45 UTC (rev 5876)
+++ trunk/redmine/debian/patches/i18n-0.4.1.patch	2010-09-27 00:17:46 UTC (rev 5877)
@@ -1,26 +0,0 @@
-Description: Patch for libi18n-ruby 0.4.1 support
- See discussion in redmine issue 5608.
- 
-Origin: upstream, http://www.redmine.org/issues/5608
-Author: Jérémy Lal <kapouer at melix.org>
-
---- redmine-1.0.0.orig/lib/redmine/i18n.rb
-+++ redmine-1.0.0/lib/redmine/i18n.rb
-@@ -37,7 +37,7 @@ module Redmine
- 
-     def format_date(date)
-       return nil unless date
--      Setting.date_format.blank? ? ::I18n.l(date.to_date) : date.strftime(Setting.date_format)
-+      Setting.date_format.blank? ? ::I18n.l(date.to_date, :count => date.day) : date.strftime(Setting.date_format)
-     end
-     
-     def format_time(time, include_date = true)
-@@ -45,7 +45,7 @@ module Redmine
-       time = time.to_time if time.is_a?(String)
-       zone = User.current.time_zone
-       local = zone ? time.in_time_zone(zone) : (time.utc? ? time.localtime : time)
--      Setting.time_format.blank? ? ::I18n.l(local, :format => (include_date ? :default : :time)) : 
-+      Setting.time_format.blank? ? ::I18n.l(local, :count => local.day, :format => (include_date ? :default : :time)) : 
-                                    ((include_date ? "#{format_date(time)} " : "") + "#{local.strftime(Setting.time_format)}")
-     end
- 

Modified: trunk/redmine/debian/patches/series
===================================================================
--- trunk/redmine/debian/patches/series	2010-09-26 21:35:45 UTC (rev 5876)
+++ trunk/redmine/debian/patches/series	2010-09-27 00:17:46 UTC (rev 5877)
@@ -4,4 +4,4 @@
 0016-plugin_assets_in_var_dir.patch
 0017-dump_schema_to_cache_dir.patch
 0018-remove-shebang.patch
-i18n-0.4.1.patch
+disable-deprecations.patch

Modified: trunk/redmine/debian/po/es.po
===================================================================
--- trunk/redmine/debian/po/es.po	2010-09-26 21:35:45 UTC (rev 5876)
+++ trunk/redmine/debian/po/es.po	2010-09-27 00:17:46 UTC (rev 5877)
@@ -5,6 +5,8 @@
 # Changes:
 #   - Initial translation
 #       Ricardo Fraile <rikr at esdebian.org>, 2009
+#   - Update
+#       Ricardo Fraile <rikr at esdebian.org>, 2010
 #
 # Traductores, si no conocen el formato PO, merece la pena leer la
 # documentación de gettext, especialmente las secciones dedicadas a este
@@ -29,7 +31,7 @@
 "Project-Id-Version: redmine 0.9.0\n"
 "Report-Msgid-Bugs-To: redmine at packages.debian.org\n"
 "POT-Creation-Date: 2010-08-13 14:00+0200\n"
-"PO-Revision-Date: 2009-10-26 17:35+0100\n"
+"PO-Revision-Date: 2010-08-03 17:35+0100\n"
 "Last-Translator: Ricardo Fraile <rikr at esdebian.org>\n"
 "Language-Team: Spanish <debian-l10n-spanish at lists.debian.org>\n"
 "Language: es\n"
@@ -51,9 +53,9 @@
 "now called the \"default\" instance. Please check your web server "
 "configuration files, see README.Debian."
 msgstr ""
-"Está migrando de una versión sin soporte. La instancia actual se llamará "
-"«default». Por favor, compruebe los archivos de configuración de su servidor "
-"web, vea «README.Debian»."
+"Está migrando desde una versión sin soporte. La instancia actual se llamará "
+"\"default\". Por favor, compruebe los archivos de configuración de su servidor "
+"web, vea README.Debian."
 
 #. Type: string
 #. Description
@@ -94,8 +96,8 @@
 "Each instance has its configuration files in /etc/redmine/<instance-"
 "identifier>/"
 msgstr ""
-"Cada instancia tiene su archivo de configuración en«/etc/redmine/"
-"<identificador-de-instancia>/»"
+"Cada instancia tiene su archivo de configuración en /etc/redmine/"
+"<identificador-de-instancia>/"
 
 #. Type: string
 #. Description
@@ -114,7 +116,7 @@
 #. Description
 #: ../templates:5001
 msgid "redmine-${dbtype} package required"
-msgstr ""
+msgstr "redmine-${dbtype} paquete necesario"
 
 #. Type: error
 #. Description
@@ -123,12 +125,15 @@
 "Redmine instance ${instance} is configured to use database type ${dbtype}, "
 "but the corresponding redmine-${dbtype} package is not installed."
 msgstr ""
+"La instancia de Redmine ${instance} está configurada para usar una base de "
+"datos tipo ${dbtype}, pero el correspondiente paquete redmine-${dbtype} no "
+"se encuentra instalado."
 
 #. Type: error
 #. Description
 #: ../templates:5001
 msgid "Configuration of instance ${instance} is aborted."
-msgstr ""
+msgstr "Se ha abortado la configuración de la instancia ${instance}."
 
 #. Type: error
 #. Description
@@ -137,3 +142,5 @@
 "To finish that configuration, please install the redmine-${dbtype} package, "
 "and reconfigure redmine using:"
 msgstr ""
+"Para finalizar la configuración, por favor, instale el paquete redmine-"
+"${dbtype}, yvuelva a configurar Redmine usando:"


