Skip to content

Commit e01ef48

Browse files
committed
Merge branch 'develop'
2 parents 80d67ce + 69c3605 commit e01ef48

File tree

3 files changed

+12
-11
lines changed

3 files changed

+12
-11
lines changed

Rakefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ hoespec = Hoe.spec 'ruby-opencv' do |s|
3030
s.test_globs = ['test/test_*.rb']
3131
s.urls = ['https://github.com/ruby-opencv/ruby-opencv/']
3232

33-
s.extra_dev_deps << ['rake-compiler', '>= 0'] << ['hoe-gemspec']
33+
s.extra_dev_deps << ['rake-compiler', '~> 0'] << ['hoe-gemspec', '~> 0']
3434

3535
Rake::ExtensionTask.new('opencv', spec) do |ext|
3636
ext.lib_dir = 'lib'

lib/opencv/version.rb

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
module OpenCV
2-
VERSION = '0.0.11'
2+
VERSION = '0.0.12.pre'
33
end
4+

ruby-opencv.gemspec

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
# -*- encoding: utf-8 -*-
2-
# stub: ruby-opencv 0.0.11.20140119025355 ruby lib
2+
# stub: ruby-opencv 0.0.12.pre.20140119031203 ruby lib
33
# stub: ext/opencv/extconf.rb
44

55
Gem::Specification.new do |s|
66
s.name = "ruby-opencv"
7-
s.version = "0.0.11.20140119025355"
7+
s.version = "0.0.12.pre.20140119031203"
88

9-
s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
9+
s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
1010
s.require_paths = ["lib"]
1111
s.authors = ["lsxi", "ser1zw", "pcting"]
1212
s.date = "2014-01-18"
@@ -28,19 +28,19 @@ Gem::Specification.new do |s|
2828

2929
if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
3030
s.add_development_dependency(%q<rdoc>, ["~> 4.0"])
31-
s.add_development_dependency(%q<rake-compiler>, [">= 0"])
32-
s.add_development_dependency(%q<hoe-gemspec>, [">= 0"])
31+
s.add_development_dependency(%q<rake-compiler>, ["~> 0"])
32+
s.add_development_dependency(%q<hoe-gemspec>, ["~> 0"])
3333
s.add_development_dependency(%q<hoe>, ["~> 3.8"])
3434
else
3535
s.add_dependency(%q<rdoc>, ["~> 4.0"])
36-
s.add_dependency(%q<rake-compiler>, [">= 0"])
37-
s.add_dependency(%q<hoe-gemspec>, [">= 0"])
36+
s.add_dependency(%q<rake-compiler>, ["~> 0"])
37+
s.add_dependency(%q<hoe-gemspec>, ["~> 0"])
3838
s.add_dependency(%q<hoe>, ["~> 3.8"])
3939
end
4040
else
4141
s.add_dependency(%q<rdoc>, ["~> 4.0"])
42-
s.add_dependency(%q<rake-compiler>, [">= 0"])
43-
s.add_dependency(%q<hoe-gemspec>, [">= 0"])
42+
s.add_dependency(%q<rake-compiler>, ["~> 0"])
43+
s.add_dependency(%q<hoe-gemspec>, ["~> 0"])
4444
s.add_dependency(%q<hoe>, ["~> 3.8"])
4545
end
4646
end

0 commit comments

Comments
 (0)