[DRE-commits] [vagrant-libvirt] 02/03: debian/rules: switch to Rubygems layout

[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 490f83cfc0469c924d4bc6f1448ea36786bcd30c
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Fri Dec 9 19:20:33 2016 -0200

    debian/rules: switch to Rubygems layout
---
 debian/changelog                                   |  3 +++
 debian/install                                     |  1 -
 ...s-from-usr-share-vagrant-plugins-vagrant-.patch | 28 ----------------------
 debian/patches/series                              |  1 -
 debian/rules                                       |  2 ++
 5 files changed, 5 insertions(+), 30 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2c52bcd..8b5f3ab 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,9 @@
 vagrant-libvirt (0.0.36.git20161125.a894dc0-2) UNRELEASED; urgency=medium
 
   * debian/tests/basics: halt and destroy test box
+  * debian/rules: switch to Rubygems layout
+    + Drop 0001-Read-locales-from-usr-share-vagrant-plugins-vagrant-.patch;
+      not needed anymore
 
  -- Antonio Terceiro <terceiro at debian.org>  Fri, 09 Dec 2016 19:17:03 -0200
 
diff --git a/debian/install b/debian/install
deleted file mode 100644
index 5e8e03a..0000000
--- a/debian/install
+++ /dev/null
@@ -1 +0,0 @@
-locales   usr/share/vagrant-plugins/vagrant-libvirt
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
deleted file mode 100644
index d9dc715..0000000
--- a/debian/patches/0001-Read-locales-from-usr-share-vagrant-plugins-vagrant-.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-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
deleted file mode 100644
index 7c26903..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-0001-Read-locales-from-usr-share-vagrant-plugins-vagrant-.patch
diff --git a/debian/rules b/debian/rules
index 43f0643..b3244e0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,8 @@
 #!/usr/bin/make -f
 
 export GEM2DEB_TEST_RUNNER = --check-dependencies
+export DH_RUBY = --gem-install
+export DH_RUBY_GEM_INSTALL_BLACKLIST_APPEND = example_box/* tools/*
 
 %:
 	dh $@ --buildsystem=ruby --with ruby

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