[DRE-commits] [SCM] ruby-inline.git branch, master, updated. debian/3.11.1-1
Gunnar Wolf
gwolf at gwolf.org
Mon Feb 6 20:46:05 UTC 2012
The following commit has been merged in the master branch:
commit de545a83cf2e1d0ebeabb954014dae69e20e2691
Author: Gunnar Wolf <gwolf at gwolf.org>
Date: Mon Feb 6 14:44:03 2012 -0600
New upstream release; purge remaining RubyGems calls, and some minor fixes
diff --git a/debian/changelog b/debian/changelog
index e623760..1bf9151 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+ruby-inline (3.11.1-1) unstable; urgency=low
+
+ * New upstream release
+ * Fixed Vcs-Browser and Vcs-Git fields, which had a component
+ mistaken. Thanks to Laurent Bigonville for noticing!
+ * Once again, purged remanent calls to RubyGems (Closes: #658889)
+ * Added DEP3 headers to existing patches
+
+ -- Gunnar Wolf <gwolf at debian.org> Mon, 06 Feb 2012 13:25:59 -0600
+
ruby-inline (3.11.0-1) unstable; urgency=low
* New upstream release
diff --git a/debian/control b/debian/control
index 3e3b1d8..8f0afdc 100644
--- a/debian/control
+++ b/debian/control
@@ -4,18 +4,18 @@ Priority: optional
Maintainer: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
Uploaders: Patrick Ringl <patrick_ at freenet.de>, Paul van Tilburg <paulvt at debian.org>, Gunnar Wolf <gwolf at debian.org>
DM-Upload-Allowed: yes
-Build-Depends: debhelper (>= 7.0.50~), gem2deb (>= 0.2.8~), ruby-minitest
+Build-Depends: debhelper (>= 7.0.50~), gem2deb (>= 0.2.8~), ruby-minitest, rake
Standards-Version: 3.9.2
-Vcs-Git: git://git.debian.org/pkg-ruby-extras/ruby-rubyinline.git
-Vcs-Browser: http://git.debian.org/?p=pkg-ruby-extras/ruby-rubyinline.git;a=summary
+Vcs-Git: git://git.debian.org/pkg-ruby-extras/ruby-inline.git
+Vcs-Browser: http://git.debian.org/?p=pkg-ruby-extras/ruby-inline.git;a=summary
Homepage: http://www.zenspider.com/ZSS/Products/RubyInline/
XS-Ruby-Versions: all
Package: ruby-inline
Architecture: all
XB-Ruby-Versions: ${ruby:Versions}
-Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter, ruby1.8-dev | ruby1.9.1-dev
-Recommends: gcc | c-compiler
+Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter, ruby1.8-dev | ruby1.9.1-dev, rake
+Recommends: gcc | c-compiler, rubygems
Replaces: libinline-ruby (<< 3.10.1-1~), libinline-ruby1.8 (<< 3.10.1-1~)
Breaks: libinline-ruby (<< 3.10.1-1~), libinline-ruby1.8 (<< 3.10.1-1~)
Provides: libinline-ruby, libinline-ruby1.8
@@ -32,6 +32,7 @@ Description: Ruby library for embedding C/++ external module code
# Transitional packages
Package: libinline-ruby
Section: oldlibs
+Priority: extra
Architecture: all
Depends: ${misc:Depends}, ruby-inline
Description: Transitional package for ruby-inline
@@ -40,6 +41,7 @@ Description: Transitional package for ruby-inline
Package: libinline-ruby1.8
Section: oldlibs
+Priority: extra
Architecture: all
Depends: ${misc:Depends}, ruby-inline
Description: Transitional package for ruby-inline
diff --git a/debian/patches/dont_require_rubygems b/debian/patches/dont_require_rubygems
new file mode 100644
index 0000000..0a260cb
--- /dev/null
+++ b/debian/patches/dont_require_rubygems
@@ -0,0 +1,89 @@
+Author: Gunnar Wolf <gwolf at debian.org>
+Forwarded: Not-needed
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=658889
+Last-Update: 2012-02-06
+Applied-upstream: no
+Description: Calls to Rubygems not allowed within the Debian archive
+ This module still had some RubyGems calls - This patch replaces them
+ with the proper location, according to the Debian Ruby policy
+
+Index: ruby-inline/lib/inline.rb
+===================================================================
+--- ruby-inline.orig/lib/inline.rb 2012-02-06 13:10:49.000000000 -0600
++++ ruby-inline/lib/inline.rb 2012-02-06 14:40:21.000000000 -0600
+@@ -50,7 +50,7 @@
+ require "rbconfig"
+ require "digest/md5"
+ require 'fileutils'
+-require 'rubygems'
++#require 'rubygems'
+
+ require 'zentest_mapping'
+
+@@ -71,13 +71,15 @@
+ RUBINIUS = defined? RUBY_ENGINE
+ DEV_NULL = (WINDOZE ? 'nul' : '/dev/null')
+ GEM = (WINDOZE ? 'gem.bat' : 'gem')
+- RAKE = if WINDOZE then
+- 'rake.bat'
+- elsif RUBINIUS then
+- File.join(Gem.bindir, 'rake')
+- else
+- "#{Gem.ruby} -S rake"
+- end
++ # RAKE = if WINDOZE then
++ # 'rake.bat'
++ # elsif RUBINIUS then
++ # File.join(Gem.bindir, 'rake')
++ # else
++ # "#{Gem.ruby} -S rake"
++ # end
++ require 'rbconfig'
++ RAKE = '%s -S rake' % File.join(RbConfig::CONFIG["bindir"], RbConfig::CONFIG["RUBY_INSTALL_NAME"])
+
+ warn "RubyInline v #{VERSION}" if $DEBUG
+
+@@ -135,7 +137,18 @@
+
+ def self.directory
+ unless defined? @@directory then
+- version = "#{Gem.ruby_engine}-#{RbConfig::CONFIG['ruby_version']}"
++ # This version requires Rubygems - Work around it
++ # version = "#{Gem.ruby_engine}-#{RbConfig::CONFIG['ruby_version']}"
++ engine = defined?(RUBY_ENGINE) ? RUBY_ENGINE : 'ruby'
++ rubyver = case RUBY_VERSION
++ when /^1\.9/
++ '1.9.1'
++ when /^1\.8/
++ '1.8'
++ else
++ raise 'unsupported ruby version: ' + RUBY_VERSION
++ end
++ version = "#{engine}-#{rubyver}"
+
+ @@directory = File.join(self.rootdir, ".ruby_inline", version)
+ end
+Index: ruby-inline/test/test_inline.rb
+===================================================================
+--- ruby-inline.orig/test/test_inline.rb 2012-02-06 13:10:50.000000000 -0600
++++ ruby-inline/test/test_inline.rb 2012-02-06 14:33:02.000000000 -0600
+@@ -80,7 +80,18 @@
+ end
+
+ def test_directory
+- version = "#{Gem.ruby_engine}-#{RbConfig::CONFIG['ruby_version']}"
++ # This version requires Rubygems - Work around it
++ # version = "#{Gem.ruby_engine}-#{RbConfig::CONFIG['ruby_version']}"
++ engine = defined?(RUBY_ENGINE) ? RUBY_ENGINE : 'ruby'
++ rubyver = case RUBY_VERSION
++ when /^1\.9/
++ '1.9.1'
++ when /^1\.8/
++ '1.8'
++ else
++ raise 'unsupported ruby version: ' + RUBY_VERSION
++ end
++ version = "#{engine}-#{rubyver}"
+ inlinedir = File.join(@rootdir, ".ruby_inline", version)
+ assert_equal(inlinedir, Inline.directory)
+ end
diff --git a/debian/patches/fix_ruby_path b/debian/patches/fix_ruby_path
index bc75028..f945af2 100644
--- a/debian/patches/fix_ruby_path
+++ b/debian/patches/fix_ruby_path
@@ -1,7 +1,15 @@
+Author: Gunnar Wolf <gwolf at debian.org>
+Forwarded: Not-needed
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=658889
+Last-Update: 2012-02-06
+Applied-upstream: no
+Description: Use the correct location for the Ruby interpreter
+ Following Debian Ruby policy.
+
Index: ruby-inline/lib/inline.rb
===================================================================
---- ruby-inline.orig/lib/inline.rb 2011-09-15 11:53:33.000000000 -0500
-+++ ruby-inline/lib/inline.rb 2011-09-15 12:22:44.000000000 -0500
+--- ruby-inline.orig/lib/inline.rb 2012-02-06 13:10:31.000000000 -0600
++++ ruby-inline/lib/inline.rb 2012-02-06 13:10:44.000000000 -0600
@@ -1,4 +1,4 @@
-#!/usr/local/bin/ruby -w
+#!/usr/bin/ruby -w
diff --git a/debian/patches/inline_mapping_instead_of_zentest_mapping b/debian/patches/inline_mapping_instead_of_zentest_mapping
index 60ed36f..5f7071d 100644
--- a/debian/patches/inline_mapping_instead_of_zentest_mapping
+++ b/debian/patches/inline_mapping_instead_of_zentest_mapping
@@ -1,17 +1,26 @@
-Index: ruby-inline-3.10.1/lib/inline.rb
+Author: Gunnar Wolf <gwolf at debian.org>
+Forwarded: Not-needed
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=658889
+Last-Update: 2012-02-06
+Applied-upstream: no
+Description: Replaced ZenTestMapping usage with custom implementation
+ This avoids pulling in a series of build-dependencies while allowing
+ us to run the test suite
+
+Index: ruby-inline/lib/inline.rb
===================================================================
---- ruby-inline-3.10.1.orig/lib/inline.rb 2011-09-14 19:00:30.000000000 -0500
-+++ ruby-inline-3.10.1/lib/inline.rb 2011-09-15 11:33:03.000000000 -0500
+--- ruby-inline.orig/lib/inline.rb 2012-02-06 13:10:32.000000000 -0600
++++ ruby-inline/lib/inline.rb 2012-02-06 13:10:33.000000000 -0600
@@ -52,7 +52,7 @@
require 'fileutils'
- require 'rubygems'
+ #require 'rubygems'
-require 'zentest_mapping'
+require 'inline_method_name_mapping'
$TESTING = false unless defined? $TESTING
-@@ -154,7 +154,7 @@
+@@ -156,7 +156,7 @@
class C
@@ -20,7 +29,7 @@ Index: ruby-inline-3.10.1/lib/inline.rb
MAGIC_ARITY_THRESHOLD = 15
MAGIC_ARITY = -1
-@@ -248,7 +248,7 @@
+@@ -250,7 +250,7 @@
signature = parse_signature(src, !expand_types)
function_name = signature['name']
method_name = options[:method_name]
diff --git a/debian/patches/series b/debian/patches/series
index bf670f1..9ea5db2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
+dont_require_rubygems
fix_ruby_path
inline_mapping_instead_of_zentest_mapping
diff --git a/debian/require-rubygems.overrides b/debian/require-rubygems.overrides
deleted file mode 100644
index 36a6e5e..0000000
--- a/debian/require-rubygems.overrides
+++ /dev/null
@@ -1 +0,0 @@
-debian/ruby-inline/usr/lib/ruby/vendor_ruby/inline.rb
--
ruby-inline.git
More information about the Pkg-ruby-extras-commits
mailing list