[DRE-commits] [vagrant-libvirt] 05/07: Patch by intrigeri to read locales from /usr/share

[Antonio Terceiro]

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

terceiro pushed a commit to branch master
in repository vagrant-libvirt.

commit 76bdfa7dfd0948977c4a97f4046284c2b5e3196a
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Sun Apr 24 10:28:01 2016 -0300

    Patch by intrigeri to read locales from /usr/share
---
 debian/changelog                                   |  6 +++++
 ...s-from-usr-share-vagrant-plugins-vagrant-.patch | 28 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 3 files changed, 35 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 2cce02a..d19b7e5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,4 +2,10 @@ vagrant-libvirt (0.0.33-1) UNRELEASED; urgency=medium
 
   * Initial release. (Closes: #753012)
 
+  [ intrigeri ]
+  * Patches (which do exactly what it says on the tin):
+    - 0001-Read-locales-from-usr-share-vagrant-plugins-vagrant-.patch
+    - 0002-Make-it-possible-to-set-the-path-to-the-device-model.patch
+    - 0003-Document-the-emulator_path-option.patch
+
  -- Antonio Terceiro <terceiro at debian.org>  Sun, 04 Oct 2015 22:49:49 -0300
diff --git a/debian/patches/0001-Read-locales-from-usr-share-vagrant-plugins-vagrant-.patch b/debian/patches/0001-Read-locales-from-usr-share-vagrant-plugins-vagrant-.patch
new file mode 100644
index 0000000..d9dc715
--- /dev/null
+++ b/debian/patches/0001-Read-locales-from-usr-share-vagrant-plugins-vagrant-.patch
@@ -0,0 +1,28 @@
+From: intrigeri <intrigeri at boum.org>
+Date: Wed, 17 Feb 2016 17:05:13 +0000
+Subject: Read locales from
+ /usr/share/vagrant-plugins/vagrant-libvirt/locales/.
+
+This is similar to what is done in
+vagrant-lxc (debian/patches/0001-Read-extra-files-from-usr-share.patch).
+
+It fixes this problem:
+
+ $ cd $(mktemp -d) && vagrant init --provider libvirt
+/usr/lib/ruby/vendor_ruby/i18n/backend/base.rb:184:in `rescue in load_yml': can not load translations from /usr/lib/ruby/locales/en.yml: #<Errno::ENOENT: No such file or directory @ rb_sysopen - /usr/lib/ruby/locales/en.yml> (I18n::InvalidLocaleData)
+---
+ lib/vagrant-libvirt/plugin.rb | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+--- a/lib/vagrant-libvirt/plugin.rb
++++ b/lib/vagrant-libvirt/plugin.rb
+@@ -55,8 +55,7 @@ module VagrantPlugins
+ 
+       # This initializes the internationalization strings.
+       def self.setup_i18n
+-        I18n.load_path << File.expand_path('locales/en.yml',
+-                                           ProviderLibvirt.source_root)
++        I18n.load_path << '/usr/share/vagrant-plugins/vagrant-libvirt/locales/en.yml'
+         I18n.reload!
+       end
+ 
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..7c26903
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-Read-locales-from-usr-share-vagrant-plugins-vagrant-.patch

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