[DRE-commits] [ruby-devise] 01/03: copy locales file from the right place

[Antonio Terceiro]

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

terceiro pushed a commit to branch master
in repository ruby-devise.

commit 41560e0353668578d393e07dc791faaf7263d406
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Wed Nov 11 15:41:29 2015 -0200

    copy locales file from the right place
    
    (fixes rails generator)
---
 debian/changelog             |  8 ++++++++
 debian/install               |  1 +
 debian/patches/locales.patch | 11 +++++++++++
 debian/patches/series        |  1 +
 4 files changed, 21 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index dd79df4..6d5304b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+ruby-devise (3.5.2-2) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * debian/patches/locales.patch: copy locales file from the right place
+    (fixes rails generator)
+
+ -- Antonio Terceiro <terceiro at debian.org>  Wed, 11 Nov 2015 15:40:56 -0200
+
 ruby-devise (3.5.2-1) unstable; urgency=medium
 
   * New upstream release
diff --git a/debian/install b/debian/install
index d90c802..75a39e0 100644
--- a/debian/install
+++ b/debian/install
@@ -1 +1,2 @@
 app usr/share/ruby-devise
+config/locales usr/share/ruby-devise
diff --git a/debian/patches/locales.patch b/debian/patches/locales.patch
new file mode 100644
index 0000000..2a0746a
--- /dev/null
+++ b/debian/patches/locales.patch
@@ -0,0 +1,11 @@
+--- a/lib/generators/devise/install_generator.rb
++++ b/lib/generators/devise/install_generator.rb
+@@ -14,7 +14,7 @@ module Devise
+       end
+ 
+       def copy_locale
+-        copy_file "../../../config/locales/en.yml", "config/locales/devise.en.yml"
++        copy_file "/usr/share/ruby-devise/locales/en.yml", "config/locales/devise.en.yml"
+       end
+ 
+       def show_readme
diff --git a/debian/patches/series b/debian/patches/series
index b06d6c8..6c34183 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 engine-root.rb
+locales.patch

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