[DRE-commits] [SCM] ruby-heckle.git branch, master, updated. debian/1.4.3-3

[Gunnar Wolf]

The following commit has been merged in the master branch:
commit f677132f6e32e25563996fae84735a5bfb56569d
Author: Gunnar Wolf <gwolf at debian.org>
Date:   Tue May 29 09:39:16 2012 -0500

    Make the package build for ruby1.8 only

diff --git a/debian/changelog b/debian/changelog
index 3b1b6e6..4dc4c37 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,12 @@
-ruby-heckle (1.4.3-3) UNSTABLE; urgency=low
+ruby-heckle (1.4.3-3) unstable; urgency=low
 
   [ Cédric Boutillier ]
   * Repackaged using the gem2deb infrastructure
 
   [ Gunnar Wolf ]
-  * Added dependency on ruby-sourcify so it can run under Ruby
-    interpreters other than 1.8 ← THIS HAS NOT YET BEEN ACHIEVED.
-    Apparently Sourcify is not enough for Heckle to work :-P
+  * Make the package build only for Ruby 1.8, as it depends on
+    ruby-parsetree. FWIW, using ruby-sourcify was attempted, but it's not
+    a complete enough replacement.
 
  -- Gunnar Wolf <gwolf at debian.org>  Sat, 19 May 2012 17:52:59 -0500
 
diff --git a/debian/control b/debian/control
index f21d206..5b804f8 100644
--- a/debian/control
+++ b/debian/control
@@ -4,17 +4,17 @@ Priority: optional
 Maintainer: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
 Uploaders: Cédric Boutillier <cedric.boutillier at gmail.com>, Gunnar Wolf <gwolf at debian.org>
 DM-Upload-Allowed: yes
-Build-Depends: debhelper (>= 7.0.50~), gem2deb (>= 0.2.13~), ruby-ruby2ruby, ruby-sourcify
+Build-Depends: debhelper (>= 7.0.50~), gem2deb (>= 0.2.13~), ruby-ruby2ruby, ruby-parsetree, help2man
 Standards-Version: 3.9.3
 Vcs-Git: git://git.debian.org/pkg-ruby-extras/ruby-heckle.git
 Vcs-Browser: http://git.debian.org/?p=pkg-ruby-extras/ruby-heckle.git;a=summary
 Homepage: http://www.rubyforge.org/projects/seattlerb
-XS-Ruby-Versions: all
+XS-Ruby-Versions: ruby1.8
 
 Package: ruby-heckle
 Architecture: all
 XB-Ruby-Versions: ${ruby:Versions}
-Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter, ruby-ruby2ruby, ruby-sourcify | ruby-parsetree
+Depends: ${shlibs:Depends}, ${misc:Depends}, ruby1.8, ruby-ruby2ruby, ruby-parsetree
 Replaces: libheckle-ruby1.8 (<< 1.4.3-3~), libheckle-ruby (<< 1.4.3-3~)
 Breaks: libheckle-ruby1.8 (<< 1.4.3-3~), libheckle-ruby (<< 1.4.3-3~)
 Provides: libheckle-ruby1.8, libheckle-ruby
diff --git a/debian/ruby-test-files.yaml b/debian/ruby-test-files.yaml
deleted file mode 100644
index c8025d8..0000000
--- a/debian/ruby-test-files.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
---- 
-- test/test_heckle.rb
diff --git a/debian/ruby-tests.rb b/debian/ruby-tests.rb
new file mode 100644
index 0000000..fad8092
--- /dev/null
+++ b/debian/ruby-tests.rb
@@ -0,0 +1,9 @@
+require 'rbconfig'
+ruby = File.join(RbConfig::CONFIG['bindir'], RbConfig::CONFIG['ruby_install_name'])
+
+# instead of using Inline's regular directory in the user's home, use
+# a temporary directory
+require 'tmpdir'
+ENV['INLINEDIR'] = Dir.mktmpdir
+
+exec "#{ruby} -I. ./test/test_heckle.rb"

-- 
ruby-heckle.git