[DRE-commits] [redmine-recaptcha] 01/02: - Add debian/patches infrastructure. - Put .pc in .gitignore. - debian/patches/01_rails3-init: Added, to fix old initialization logic.

[David Martínez]

This is an automated email from the git hooks/post-receive script.

ender pushed a commit to branch master
in repository redmine-recaptcha.

commit 30862d9d49e13404a07b6595f67e8ef992aa13ff
Author: David Martínez Moreno <ender at debian.org>
Date:   Mon Jan 6 23:16:25 2014 -0800

    - Add debian/patches infrastructure.
    - Put .pc in .gitignore.
    - debian/patches/01_rails3-init: Added, to fix old initialization logic.
---
 .gitignore                          |  1 +
 debian/changelog                    |  1 +
 debian/patches/01_rails3-init.patch | 30 ++++++++++++++++++++++++++++++
 debian/patches/series               |  1 +
 4 files changed, 33 insertions(+)

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..845ca06
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+.pc
diff --git a/debian/changelog b/debian/changelog
index 58754a3..4510ee8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ redmine-recaptcha (0.1.0+git20121018-2) UNRELEASED; urgency=medium
 
   * Moved the plugin to /usr/share/redmine/plugins/ for compatibility with
     Redmine 2 (closes: #725217).
+  * debian/patches/01_rails3-init: Added, to fix old initialization logic.
 
  -- David Martínez Moreno <ender at debian.org>  Mon, 06 Jan 2014 18:09:42 -0800
 
diff --git a/debian/patches/01_rails3-init.patch b/debian/patches/01_rails3-init.patch
new file mode 100644
index 0000000..66c076b
--- /dev/null
+++ b/debian/patches/01_rails3-init.patch
@@ -0,0 +1,30 @@
+Description: Migrate init.rb to Rails 3.
+ The plugin hasn't been touched in a while and the Dispatcher class is no longer
+ available, so migrate it to the proper init method in Rails 3.
+Author: David Martínez Moreno <ender at debian.org>
+Origin: other
+Forwarded: no
+Last-Update: 2013-10-08
+
+--- a/init.rb
++++ b/init.rb
+@@ -4,16 +4,15 @@
+ require 'net/http'
+ require 'recaptcha/rails'
+ require 'redmine'
+-require 'dispatcher'
+ 
+-Dispatcher.to_prepare :redmine_recaptcha do
++Rails.configuration.to_prepare do
+   require_dependency 'recaptcha/client_helper'
+   require_dependency 'client_helper_patch'
+-  Recaptcha::ClientHelper.send(:include, ClientHelperPatch) 
++  Recaptcha::ClientHelper.send(:include, ClientHelperPatch)
+ 
+   require_dependency 'account_controller'
+   require_dependency 'account_controller_patch'
+-  AccountController.send(:include, AccountControllerPatch) 
++  AccountController.send(:include, AccountControllerPatch)
+ end
+ 
+ Redmine::Plugin.register :redmine_recaptcha do
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..c14dd2c
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+01_rails3-init.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/redmine-recaptcha.git