[DRE-commits] r4362 - in trunk/libheckle-ruby/debian: . patches

Tobias Grimm tiber-guest at alioth.debian.org
Sun Nov 22 01:51:12 UTC 2009


Author: tiber-guest
Date: 2009-11-22 01:51:12 +0000 (Sun, 22 Nov 2009)
New Revision: 4362

Removed:
   trunk/libheckle-ruby/debian/patches/12_fix-tests.dpatch.sik
   trunk/libheckle-ruby/debian/patches/12_parsetree-backwards-compatibility.dpatch
Modified:
   trunk/libheckle-ruby/debian/changelog
   trunk/libheckle-ruby/debian/control
   trunk/libheckle-ruby/debian/patches/00list
Log:
* Dropped 12_parsetree-backwards-compatibility.dpatch
* Depend on libparsetree-ruby1.8 (>= 3.0.4)

Modified: trunk/libheckle-ruby/debian/changelog
===================================================================
--- trunk/libheckle-ruby/debian/changelog	2009-11-21 18:46:02 UTC (rev 4361)
+++ trunk/libheckle-ruby/debian/changelog	2009-11-22 01:51:12 UTC (rev 4362)
@@ -1,3 +1,10 @@
+libheckle-ruby (1.4.3-2) UNRELEASED; urgency=low
+
+  * Dropped 12_parsetree-backwards-compatibility.dpatch
+  * Depend on libparsetree-ruby1.8 (>= 3.0.4)
+
+ -- Tobias Grimm <etobi at debian.org>  Sun, 22 Nov 2009 02:47:56 +0100
+
 libheckle-ruby (1.4.3-1) unstable; urgency=low
 
   * New upstream release.

Modified: trunk/libheckle-ruby/debian/control
===================================================================
--- trunk/libheckle-ruby/debian/control	2009-11-21 18:46:02 UTC (rev 4361)
+++ trunk/libheckle-ruby/debian/control	2009-11-22 01:51:12 UTC (rev 4362)
@@ -4,7 +4,7 @@
 Maintainer: Sebastien Delafond <seb at debian.org>
 Uploaders: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>, Tobias Grimm <etobi at debian.org>
 Build-Depends: debhelper (>= 5), cdbs, dpatch, ruby1.8
-Build-Depends-Indep: libruby2ruby-ruby1.8, libparsetree-ruby1.8 (>= 2.2.1-2)
+Build-Depends-Indep: libruby2ruby-ruby1.8, libparsetree-ruby1.8 (>= 3.0.4)
 Standards-Version: 3.8.3
 Homepage: http://seattlerb.rubyforge.org/heckle
 Vcs-Browser: http://svn.debian.org/viewsvn/pkg-ruby-extras/trunk/libheckle-ruby/
@@ -12,7 +12,7 @@
 
 Package: libheckle-ruby1.8
 Architecture: all
-Depends: ${misc:Depends}, ruby1.8, libruby2ruby-ruby1.8, libparsetree-ruby1.8
+Depends: ${misc:Depends}, ruby1.8, libruby2ruby-ruby1.8, libparsetree-ruby1.8 (>= 3.0.4)
 Description: Heckle is a mutation tester (ruby1.8)
  Heckle is a mutation tester. It modifies your code and runs your tests
  to make sure they fail. The idea is that if code can be changed and

Modified: trunk/libheckle-ruby/debian/patches/00list
===================================================================
--- trunk/libheckle-ruby/debian/patches/00list	2009-11-21 18:46:02 UTC (rev 4361)
+++ trunk/libheckle-ruby/debian/patches/00list	2009-11-22 01:51:12 UTC (rev 4362)
@@ -1,4 +1,3 @@
 10_correct-path-for-ruby-interpreter
 11_no-rubygems
-12_parsetree-backwards-compatibility
 13_optional-zentest

Deleted: trunk/libheckle-ruby/debian/patches/12_fix-tests.dpatch.sik
===================================================================
--- trunk/libheckle-ruby/debian/patches/12_fix-tests.dpatch.sik	2009-11-21 18:46:02 UTC (rev 4361)
+++ trunk/libheckle-ruby/debian/patches/12_fix-tests.dpatch.sik	2009-11-22 01:51:12 UTC (rev 4362)
@@ -1,137 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 12_fix-tests.dpatch by Tobias Grimm <etobi at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-diff -urNad libheckle-ruby-1.4.2~/lib/heckle.rb libheckle-ruby-1.4.2/lib/heckle.rb
---- libheckle-ruby-1.4.2~/lib/heckle.rb	2009-04-26 13:05:17.000000000 +0200
-+++ libheckle-ruby-1.4.2/lib/heckle.rb	2009-04-26 13:05:33.000000000 +0200
-@@ -1,5 +1,6 @@
- require 'parse_tree'
- require 'sexp_processor'
-+require 'unified_ruby'
- require 'ruby2ruby'
- require 'timeout'
- require 'tempfile'
-@@ -17,6 +18,8 @@
- 
-   class Timeout < Timeout::Error; end
- 
-+  include UnifiedRuby
-+
-   ##
-   # The version of Heckle you are using.
- 
-@@ -498,13 +501,7 @@
-   end
- 
-   def current_tree
--    ur = Unifier.new
--
--    sexp = ParseTree.translate(klass_name.to_class, method_name)
--    raise "sexp invalid for #{klass_name}##{method_name}" if sexp == [nil]
--    sexp = ur.process(sexp)
--
--    rewrite sexp
-+    rewrite Sexp.from_array(ParseTree.translate(klass_name.to_class, method_name))
-   end
- 
-   def reset
-diff -urNad libheckle-ruby-1.4.2~/test/test_heckle.rb libheckle-ruby-1.4.2/test/test_heckle.rb
---- libheckle-ruby-1.4.2~/test/test_heckle.rb	2009-04-26 13:05:13.000000000 +0200
-+++ libheckle-ruby-1.4.2/test/test_heckle.rb	2009-04-26 13:05:17.000000000 +0200
-@@ -25,10 +25,7 @@
- end
- 
- class HeckleTestCase < Test::Unit::TestCase
--  unless defined? Mini then
--    undef_method :default_test
--    alias :refute_equal :assert_not_equal
--  end
-+  undef_method :default_test unless defined? Mini
- 
-   def setup
-     @nodes ||= Heckle::MUTATABLE_NODES
-@@ -43,7 +40,7 @@
-   end
- 
-   def teardown
--    @heckler.reset if defined?(@heckler) && @heckler
-+    @heckler.reset if defined? @heckler
-   end
- end
- 
-@@ -161,8 +158,8 @@
- 
-     3.times { @heckler.process(@heckler.current_tree) }
- 
--    refute_equal original_tree, @heckler.current_tree
--    refute_equal original_mutatees, @heckler.mutatees
-+    assert_not_equal original_tree, @heckler.current_tree
-+    assert_not_equal original_mutatees, @heckler.mutatees
- 
-     @heckler.reset
-     assert_equal original_tree[2], @heckler.current_tree[2]
-@@ -173,7 +170,7 @@
-     original_tree = @heckler.current_tree.deep_clone
- 
-     @heckler.process(@heckler.current_tree)
--    refute_equal original_tree, @heckler.current_tree
-+    assert_not_equal original_tree, @heckler.current_tree
- 
-     @heckler.reset_tree
-     assert_equal original_tree, @heckler.current_tree
-@@ -184,16 +181,16 @@
-     original_mutatees = @heckler.mutatees.deep_clone
- 
-     @heckler.process(@heckler.current_tree)
--    refute_equal original_tree, @heckler.current_tree
--    refute_equal original_mutatees, @heckler.mutatees
-+    assert_not_equal original_tree, @heckler.current_tree
-+    assert_not_equal original_mutatees, @heckler.mutatees
- 
-     @heckler.reset
-     assert_equal original_tree, @heckler.current_tree
-     assert_equal original_mutatees, @heckler.mutatees
- 
-     3.times { @heckler.process(@heckler.current_tree) }
--    refute_equal original_tree, @heckler.current_tree
--    refute_equal original_mutatees, @heckler.mutatees
-+    assert_not_equal original_tree, @heckler.current_tree
-+    assert_not_equal original_mutatees, @heckler.mutatees
- 
-     @heckler.reset
-     assert_equal original_tree, @heckler.current_tree
-@@ -204,7 +201,7 @@
-     original_mutatees = @heckler.mutatees.deep_clone
- 
-     @heckler.process(@heckler.current_tree)
--    refute_equal original_mutatees, @heckler.mutatees
-+    assert_not_equal original_mutatees, @heckler.mutatees
- 
-     @heckler.reset_mutatees
-     assert_equal original_mutatees, @heckler.mutatees
-@@ -709,8 +706,8 @@
-                      s(:lasgn, :x, s(:nil)),
-                      s(:iter,
-                        s(:call, s(:lvar, :x), :each, s(:arglist)),
--                       s(:lasgn, :y),
--                       s(:lvar, :y)))))
-+                       s(:dasgn_curr, :y),
-+                       s(:dvar, :y)))))
-     
-     # This call causes the replacement of [:lasgn, :x...] above to
-     # become [:lasgn, :nil].  We then reset the tree to ensure that
-@@ -728,8 +725,8 @@
-                      s(:lasgn, :x, s(:array, s(:lit, 1), s(:lit, 2), s(:lit, 3))),
-                      s(:iter,
-                        s(:call, s(:lvar, :x), :each, s(:arglist)),
--                       s(:lasgn, :_heckle_dummy),
--                       s(:call, nil, :y, s(:arglist))))))
-+                       s(:dasgn_curr, :y),
-+                       s(:dvar, :y)))))
- 
-     @heckler.process(@heckler.current_tree)
-     assert_equal(expected, @heckler.current_tree)

Deleted: trunk/libheckle-ruby/debian/patches/12_parsetree-backwards-compatibility.dpatch
===================================================================
--- trunk/libheckle-ruby/debian/patches/12_parsetree-backwards-compatibility.dpatch	2009-11-21 18:46:02 UTC (rev 4361)
+++ trunk/libheckle-ruby/debian/patches/12_parsetree-backwards-compatibility.dpatch	2009-11-22 01:51:12 UTC (rev 4362)
@@ -1,139 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 12_parsetree-backwards-compatibility.dpatch by Tobias Grimm <etobi at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: heckle 1.4.2 requires a newer ParseTree version than the on  currently available
-## DP: in Debian. This patch reverts some of the changes in 1.4.2, so that it works
-## DP: with the older ParseTree version again.
-
- at DPATCH@
-diff -urNad libheckle-ruby-1.4.2~/lib/heckle.rb libheckle-ruby-1.4.2/lib/heckle.rb
---- libheckle-ruby-1.4.2~/lib/heckle.rb	2009-04-26 13:05:17.000000000 +0200
-+++ libheckle-ruby-1.4.2/lib/heckle.rb	2009-04-26 13:05:33.000000000 +0200
-@@ -1,5 +1,6 @@
- require 'parse_tree'
- require 'sexp_processor'
-+require 'unified_ruby'
- require 'ruby2ruby'
- require 'timeout'
- require 'tempfile'
-@@ -17,6 +18,8 @@
- 
-   class Timeout < Timeout::Error; end
- 
-+  include UnifiedRuby
-+
-   ##
-   # The version of Heckle you are using.
- 
-@@ -498,13 +501,7 @@
-   end
- 
-   def current_tree
--    ur = Unifier.new
--
--    sexp = ParseTree.translate(klass_name.to_class, method_name)
--    raise "sexp invalid for #{klass_name}##{method_name}" if sexp == [nil]
--    sexp = ur.process(sexp)
--
--    rewrite sexp
-+    rewrite Sexp.from_array(ParseTree.translate(klass_name.to_class, method_name))
-   end
- 
-   def reset
-diff -urNad libheckle-ruby-1.4.2~/test/test_heckle.rb libheckle-ruby-1.4.2/test/test_heckle.rb
---- libheckle-ruby-1.4.2~/test/test_heckle.rb	2009-04-26 13:05:13.000000000 +0200
-+++ libheckle-ruby-1.4.2/test/test_heckle.rb	2009-04-26 13:05:17.000000000 +0200
-@@ -25,10 +25,7 @@
- end
- 
- class HeckleTestCase < Test::Unit::TestCase
--  unless defined? Mini then
--    undef_method :default_test
--    alias :refute_equal :assert_not_equal
--  end
-+  undef_method :default_test unless defined? Mini
- 
-   def setup
-     @nodes ||= Heckle::MUTATABLE_NODES
-@@ -43,7 +40,7 @@
-   end
- 
-   def teardown
--    @heckler.reset if defined?(@heckler) && @heckler
-+    @heckler.reset if defined? @heckler
-   end
- end
- 
-@@ -161,8 +158,8 @@
- 
-     3.times { @heckler.process(@heckler.current_tree) }
- 
--    refute_equal original_tree, @heckler.current_tree
--    refute_equal original_mutatees, @heckler.mutatees
-+    assert_not_equal original_tree, @heckler.current_tree
-+    assert_not_equal original_mutatees, @heckler.mutatees
- 
-     @heckler.reset
-     assert_equal original_tree[2], @heckler.current_tree[2]
-@@ -173,7 +170,7 @@
-     original_tree = @heckler.current_tree.deep_clone
- 
-     @heckler.process(@heckler.current_tree)
--    refute_equal original_tree, @heckler.current_tree
-+    assert_not_equal original_tree, @heckler.current_tree
- 
-     @heckler.reset_tree
-     assert_equal original_tree, @heckler.current_tree
-@@ -184,16 +181,16 @@
-     original_mutatees = @heckler.mutatees.deep_clone
- 
-     @heckler.process(@heckler.current_tree)
--    refute_equal original_tree, @heckler.current_tree
--    refute_equal original_mutatees, @heckler.mutatees
-+    assert_not_equal original_tree, @heckler.current_tree
-+    assert_not_equal original_mutatees, @heckler.mutatees
- 
-     @heckler.reset
-     assert_equal original_tree, @heckler.current_tree
-     assert_equal original_mutatees, @heckler.mutatees
- 
-     3.times { @heckler.process(@heckler.current_tree) }
--    refute_equal original_tree, @heckler.current_tree
--    refute_equal original_mutatees, @heckler.mutatees
-+    assert_not_equal original_tree, @heckler.current_tree
-+    assert_not_equal original_mutatees, @heckler.mutatees
- 
-     @heckler.reset
-     assert_equal original_tree, @heckler.current_tree
-@@ -204,7 +201,7 @@
-     original_mutatees = @heckler.mutatees.deep_clone
- 
-     @heckler.process(@heckler.current_tree)
--    refute_equal original_mutatees, @heckler.mutatees
-+    assert_not_equal original_mutatees, @heckler.mutatees
- 
-     @heckler.reset_mutatees
-     assert_equal original_mutatees, @heckler.mutatees
-@@ -709,8 +706,8 @@
-                      s(:lasgn, :x, s(:nil)),
-                      s(:iter,
-                        s(:call, s(:lvar, :x), :each, s(:arglist)),
--                       s(:lasgn, :y),
--                       s(:lvar, :y)))))
-+                       s(:dasgn_curr, :y),
-+                       s(:dvar, :y)))))
-     
-     # This call causes the replacement of [:lasgn, :x...] above to
-     # become [:lasgn, :nil].  We then reset the tree to ensure that
-@@ -728,8 +725,8 @@
-                      s(:lasgn, :x, s(:array, s(:lit, 1), s(:lit, 2), s(:lit, 3))),
-                      s(:iter,
-                        s(:call, s(:lvar, :x), :each, s(:arglist)),
--                       s(:lasgn, :_heckle_dummy),
--                       s(:call, nil, :y, s(:arglist))))))
-+                       s(:dasgn_curr, :y),
-+                       s(:dvar, :y)))))
- 
-     @heckler.process(@heckler.current_tree)
-     assert_equal(expected, @heckler.current_tree)




More information about the Pkg-ruby-extras-commits mailing list