[DRE-commits] [vagrant-lxc] 10/17: Install as a regular Ruby library

[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 509ed11ae7ccdef026127171ed842c3064572b19
Author: Antonio Terceiro <terceiro at softwarelivre.org>
Date:   Wed May 27 10:16:43 2015 -0300

    Install as a regular Ruby library
---
 debian/control                   |  2 +-
 debian/refresh-gemspec           | 10 ----------
 debian/rules                     | 16 ++--------------
 debian/vagrant-lxc-1.1.0.gemspec | 20 --------------------
 debian/vagrant-lxc.install       |  3 +++
 5 files changed, 6 insertions(+), 45 deletions(-)

diff --git a/debian/control b/debian/control
index 43feb50..f5b4e86 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: ruby
 Priority: optional
 Maintainer: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
 Uploaders: Antonio Terceiro <terceiro at debian.org>
-Build-Depends: debhelper (>= 7.0.50~), ruby, vagrant
+Build-Depends: debhelper (>= 7.0.50~), ruby, vagrant, gem2deb
 Standards-Version: 3.9.5
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-ruby-extras/vagrant-lxc.git
 Vcs-Git: git://anonscm.debian.org/pkg-ruby-extras/vagrant-lxc.git
diff --git a/debian/refresh-gemspec b/debian/refresh-gemspec
deleted file mode 100755
index d24daf2..0000000
--- a/debian/refresh-gemspec
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-set -e
-
-version=$(dpkg-parsechangelog -SVersion | cut -d - -f 1)
-
-rm -fv debian/*.gemspec
-gemspec=debian/vagrant-lxc-${version}.gemspec
-
-ruby -e 'spec = Gem::Specification.load("vagrant-lxc.gemspec"); spec.files.reject! { |f| f =~ /^debian\// || f == ".gitignore" || f == "LICENSE.txt" || f =~ /boxes\// || f =~ /\.md$/ }; puts spec.to_ruby' > $gemspec
diff --git a/debian/rules b/debian/rules
index c4ca493..cb75993 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,27 +3,15 @@
 export HOME=/invalid
 
 %:
-	dh $@
+	dh $@ --buildsystem=ruby --with ruby
 
 version = $(shell dpkg-parsechangelog -SVersion | cut -d - -f 1)
-
 ruby_version = $(shell ruby -e 'puts RUBY_VERSION')
 vagrant_version = $(shell cat /usr/share/vagrant/version.txt)
-
-gem = vagrant-lxc-$(version).gem
-gemspec = debian/$(gem)spec
-plugindir = debian/vagrant-lxc/usr/share/vagrant-plugins
-plugingemdir = $(plugindir)/gems
-pluginjsondir = $(plugindir)/plugins.d
+pluginjsondir = debian/vagrant-lxc/usr/share/vagrant-plugins/plugins.d
 
 override_dh_auto_install:
-	gem build $(gemspec)
-	gem install --no-rdoc --no-ri -i $(plugingemdir) $(gem)
-	$(RM) $(plugindir)/cache/*
 	mkdir -p $(pluginjsondir)
 	sed -e 's/@@RUBY_VERSION@@/$(ruby_version)/g; s/@@VAGRANT_VERSION@@/$(vagrant_version)/g' \
 		debian/vagrant-lxc.json.in > $(pluginjsondir)/vagrant-lxc.json
 	dh_auto_install
-
-override_dh_auto_clean:
-	$(RM) $(gem)
diff --git a/debian/vagrant-lxc-1.1.0.gemspec b/debian/vagrant-lxc-1.1.0.gemspec
deleted file mode 100644
index 23d3ae5..0000000
--- a/debian/vagrant-lxc-1.1.0.gemspec
+++ /dev/null
@@ -1,20 +0,0 @@
-# -*- encoding: utf-8 -*-
-# stub: vagrant-lxc 1.1.0 ruby lib
-
-Gem::Specification.new do |s|
-  s.name = "vagrant-lxc"
-  s.version = "1.1.0"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.require_paths = ["lib"]
-  s.authors = ["Fabio Rehm"]
-  s.date = "2015-05-26"
-  s.description = "Linux Containers provider for Vagrant"
-  s.email = ["fgrehm at gmail.com"]
-  s.files = [".rspec", ".travis.yml", ".vimrc", "Gemfile", "Gemfile.lock", "Guardfile", "Rakefile", "lib/vagrant-lxc.rb", "lib/vagrant-lxc/action.rb", "lib/vagrant-lxc/action/boot.rb", "lib/vagrant-lxc/action/clear_forwarded_ports.rb", "lib/vagrant-lxc/action/compress_rootfs.rb", "lib/vagrant-lxc/action/create.rb", "lib/vagrant-lxc/action/destroy.rb", "lib/vagrant-lxc/action/destroy_confirm.rb", "lib/vagrant-lxc/action/fetch_ip_from_dnsmasq_leases.rb", "lib/vagrant-lxc/action/fetch_ip_wi [...]
-  s.homepage = "https://github.com/fgrehm/vagrant-lxc"
-  s.licenses = ["MIT"]
-  s.rubygems_version = "2.2.2"
-  s.summary = "Linux Containers provider for Vagrant"
-  s.test_files = ["spec/Vagrantfile", "spec/fixtures/sample-ip-addr-output", "spec/spec_helper.rb", "spec/support/.gitkeep", "spec/unit/action/clear_forwarded_ports_spec.rb", "spec/unit/action/compress_rootfs_spec.rb", "spec/unit/action/forward_ports_spec.rb", "spec/unit/action/handle_box_metadata_spec.rb", "spec/unit/action/setup_package_files_spec.rb", "spec/unit/driver/cli_spec.rb", "spec/unit/driver_spec.rb", "spec/unit/support/unit_example_group.rb", "spec/unit_helper.rb"]
-end
diff --git a/debian/vagrant-lxc.install b/debian/vagrant-lxc.install
new file mode 100644
index 0000000..6db060a
--- /dev/null
+++ b/debian/vagrant-lxc.install
@@ -0,0 +1,3 @@
+scripts usr/share/vagrant-plugins/vagrant-lxc
+templates usr/share/vagrant-plugins/vagrant-lxc
+locales 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