[DRE-commits] [vagrant-lxc] 02/05: 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-lxc.

commit 4806e31c52df2452d8b31c04fa401e78c9e630ce
Author: Antonio Terceiro <terceiro at softwarelivre.org>
Date:   Fri Dec 9 18:31:56 2016 -0200

    debian/rules: switch to Rubygems layout.
---
 debian/changelog                                   |  3 +
 .../0001-Read-extra-files-from-usr-share.patch     | 83 ----------------------
 debian/patches/series                              |  1 -
 debian/rules                                       |  3 +
 debian/vagrant-lxc.install                         |  3 -
 5 files changed, 6 insertions(+), 87 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1cacf05..b6a6dc7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,9 @@ vagrant-lxc (1.2.1-3) UNRELEASED; urgency=medium
 
   [ Antonio Terceiro ]
   * debian/tests/: add simple smoke test
+  * debian/rules: switch to Rubygems layout.
+    + drop 0001-Read-extra-files-from-usr-share.patch
+    + drop debian/vagrant-lxc.install
 
  -- Antonio Terceiro <terceiro at debian.org>  Mon, 11 Apr 2016 14:00:50 -0300
 
diff --git a/debian/patches/0001-Read-extra-files-from-usr-share.patch b/debian/patches/0001-Read-extra-files-from-usr-share.patch
deleted file mode 100644
index 5ad50f0..0000000
--- a/debian/patches/0001-Read-extra-files-from-usr-share.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-From: Antonio Terceiro <terceiro at softwarelivre.org>
-Date: Wed, 27 May 2015 10:27:57 -0300
-Subject: Read extra files from /usr/share/...
-
----
- lib/vagrant-lxc.rb                            | 8 ++++++++
- lib/vagrant-lxc/action/handle_box_metadata.rb | 2 +-
- lib/vagrant-lxc/command/sudoers.rb            | 2 +-
- lib/vagrant-lxc/driver.rb                     | 2 +-
- lib/vagrant-lxc/plugin.rb                     | 2 +-
- 5 files changed, 12 insertions(+), 4 deletions(-)
-
-diff --git a/lib/vagrant-lxc.rb b/lib/vagrant-lxc.rb
-index 825eb18..67a738a 100644
---- a/lib/vagrant-lxc.rb
-+++ b/lib/vagrant-lxc.rb
-@@ -7,6 +7,14 @@ module Vagrant
-       @source_root ||= Pathname.new(File.dirname(__FILE__)).join('..').expand_path
-     end
- 
-+    def self.scripts_path
-+      Pathname.new('/usr/share/vagrant-plugins/vagrant-lxc/scripts')
-+    end
-+
-+    def self.templates_path
-+      Pathname.new('/usr/share/vagrant-plugins/vagrant-lxc/templates')
-+    end
-+
-     def self.sudo_wrapper_path
-       "/usr/local/bin/vagrant-lxc-wrapper"
-     end
-diff --git a/lib/vagrant-lxc/action/handle_box_metadata.rb b/lib/vagrant-lxc/action/handle_box_metadata.rb
-index 6d78800..d76ab44 100644
---- a/lib/vagrant-lxc/action/handle_box_metadata.rb
-+++ b/lib/vagrant-lxc/action/handle_box_metadata.rb
-@@ -46,7 +46,7 @@ module Vagrant
-             if (box_template = @box.directory.join('lxc-template')).exist?
-               box_template.to_s
-             else
--              Vagrant::LXC.source_root.join('scripts/lxc-template').to_s
-+              Vagrant::LXC.scripts_path.join('lxc-template').to_s
-             end
-         end
- 
-diff --git a/lib/vagrant-lxc/command/sudoers.rb b/lib/vagrant-lxc/command/sudoers.rb
-index 42b538a..cf74643 100644
---- a/lib/vagrant-lxc/command/sudoers.rb
-+++ b/lib/vagrant-lxc/command/sudoers.rb
-@@ -46,7 +46,7 @@ module Vagrant
-           wrapper = Tempfile.new('lxc-wrapper').tap do |file|
-             template = Vagrant::Util::TemplateRenderer.new(
-               'sudoers.rb',
--              :template_root  => Vagrant::LXC.source_root.join('templates').to_s,
-+              :template_root  => Vagrant::LXC.templates_path.to_s,
-               :cmd_paths      => build_cmd_paths_hash,
-               :pipework_regex => "#{ENV['HOME']}/\.vagrant\.d/gems/gems/vagrant-lxc.+/scripts/pipework"
-             )
-diff --git a/lib/vagrant-lxc/driver.rb b/lib/vagrant-lxc/driver.rb
-index e2304bf..e050a18 100644
---- a/lib/vagrant-lxc/driver.rb
-+++ b/lib/vagrant-lxc/driver.rb
-@@ -164,7 +164,7 @@ module Vagrant
-         end
- 
-         cmd = [
--          Vagrant::LXC.source_root.join('scripts/pipework').to_s,
-+          Vagrant::LXC.scripts_path.join('pipework').to_s,
-           bridge_name,
-           container_name,
-           ip ||= "dhcp"
-diff --git a/lib/vagrant-lxc/plugin.rb b/lib/vagrant-lxc/plugin.rb
-index bf8f4dd..9f4d947 100644
---- a/lib/vagrant-lxc/plugin.rb
-+++ b/lib/vagrant-lxc/plugin.rb
-@@ -12,7 +12,7 @@ module Vagrant
-       provider(:lxc, parallel: true, priority: 7) do
-         require File.expand_path("../provider", __FILE__)
- 
--        I18n.load_path << File.expand_path(File.dirname(__FILE__) + '/../../locales/en.yml')
-+        I18n.load_path << '/usr/share/vagrant-plugins/vagrant-lxc/locales/en.yml'
-         I18n.reload!
- 
-         Provider
diff --git a/debian/patches/series b/debian/patches/series
index b0953fe..643d315 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-0001-Read-extra-files-from-usr-share.patch
 0002-Fix-shebang-in-sudoers-template.patch
diff --git a/debian/rules b/debian/rules
index fec1f71..f43ceaa 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,8 @@
 #!/usr/bin/make -f
 
+export DH_RUBY == --gem-install
+export DH_RUBY_GEM_INSTALL_BLACKLIST_APPEND = tasks/*
+
 %:
 	dh $@ --buildsystem=ruby --with ruby
 
diff --git a/debian/vagrant-lxc.install b/debian/vagrant-lxc.install
deleted file mode 100644
index 752e9c3..0000000
--- a/debian/vagrant-lxc.install
+++ /dev/null
@@ -1,3 +0,0 @@
-locales usr/share/vagrant-plugins/vagrant-lxc
-scripts usr/share/vagrant-plugins/vagrant-lxc
-templates usr/share/vagrant-plugins/vagrant-lxc

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