[DRE-commits] [vagrant-lxc] 08/17: store expanded gemspec inside debian/

[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 147c93614c7ed62fc79c95d6324c0d285090218b
Author: Antonio Terceiro <terceiro at softwarelivre.org>
Date:   Tue May 26 18:44:10 2015 -0300

    store expanded gemspec inside debian/
---
 debian/patches/expanded-gemspec.patch | 31 -------------------------------
 debian/patches/series                 |  1 -
 debian/refresh-gemspec                | 18 ++----------------
 debian/rules                          |  2 +-
 debian/vagrant-lxc-1.1.0.gemspec      | 20 ++++++++++++++++++++
 5 files changed, 23 insertions(+), 49 deletions(-)

diff --git a/debian/patches/expanded-gemspec.patch b/debian/patches/expanded-gemspec.patch
deleted file mode 100644
index 0156bd5..0000000
--- a/debian/patches/expanded-gemspec.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- /dev/null
-+++ b/vagrant-lxc-0.8.0.gemspec
-@@ -0,0 +1,28 @@
-+# -*- encoding: utf-8 -*-
-+
-+Gem::Specification.new do |s|
-+  s.name = "vagrant-lxc"
-+  s.version = "0.8.0"
-+
-+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-+  s.authors = ["Fabio Rehm"]
-+  s.date = "2014-02-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", "development/Vagrantfile", "development/lxc-configs/lxc-dev-box", "development/lxc-configs/sid", "development/lxc-configs/squeeze", "development/lxc-configs/vbox", "development/lxc-configs/wheezy", "development/site.pp", "lib/vagrant-lxc.rb", "lib/vagrant-lxc/action.rb", "lib/vagrant-lxc/action/boot.rb", "lib/vagrant-lxc/action/check_created.rb", "lib/vagrant-lxc/action/check_running.rb", [...]
-+  s.homepage = "https://github.com/fgrehm/vagrant-lxc"
-+  s.licenses = ["MIT"]
-+  s.require_paths = ["lib"]
-+  s.rubygems_version = "1.8.23"
-+  s.summary = "Linux Containers provider for Vagrant"
-+  s.test_files = ["spec/Vagrantfile", "spec/acceptance/sanity_check_spec.rb", "spec/acceptance/support/acceptance_example_group.rb", "spec/acceptance/support/machine_ext.rb", "spec/acceptance/support/test_ui.rb", "spec/acceptance_helper.rb", "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_b [...]
-+
-+  if s.respond_to? :specification_version then
-+    s.specification_version = 3
-+
-+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-+    else
-+    end
-+  else
-+  end
-+end
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index beeea8e..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-expanded-gemspec.patch
diff --git a/debian/refresh-gemspec b/debian/refresh-gemspec
index c1e76bb..d24daf2 100755
--- a/debian/refresh-gemspec
+++ b/debian/refresh-gemspec
@@ -4,21 +4,7 @@ set -e
 
 version=$(dpkg-parsechangelog -SVersion | cut -d - -f 1)
 
-gemspec=vagrant-lxc-${version}.gemspec
-rm -f $gemspec
-
-patch=expanded-gemspec.patch
-
-if (quilt series | grep -q $patch); then
-  while ! (quilt top | grep -q $patch); do
-    quilt push
-  done
-else
-  mkdir debian/patches
-  quilt new $patch
-  quilt add $gemspec
-fi
+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
-quilt refresh
-quilt pop -a
diff --git a/debian/rules b/debian/rules
index 100a829..053aa2c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,7 +6,7 @@
 version = $(shell dpkg-parsechangelog -SVersion | cut -d - -f 1)
 
 gem = vagrant-lxc-$(version).gem
-gemspec = $(gem)spec
+gemspec = debian/$(gem)spec
 plugindir = debian/vagrant-lxc/usr/share/vagrant-plugins
 
 override_dh_auto_install:
diff --git a/debian/vagrant-lxc-1.1.0.gemspec b/debian/vagrant-lxc-1.1.0.gemspec
new file mode 100644
index 0000000..23d3ae5
--- /dev/null
+++ b/debian/vagrant-lxc-1.1.0.gemspec
@@ -0,0 +1,20 @@
+# -*- 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

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