[DRE-commits] [SCM] racc.git branch, master, updated. debian/1.4.8-4-7-g6e2635a

[Ondřej Surý]

The following commit has been merged in the master branch:
commit d61345cc4c79f0727ef50de93344881cc3ea8665
Author: Ondřej Surý <ondrej at sury.org>
Date:   Fri Jul 19 14:15:49 2013 +0200

    Update patches for new release (and remove obsolete patches)

diff --git a/debian/patches/010_disable_ext b/debian/patches/010_disable_ext
index 242d96d..26d636d 100644
--- a/debian/patches/010_disable_ext
+++ b/debian/patches/010_disable_ext
@@ -1,6 +1,6 @@
---- a/metadata.yml
-+++ b/metadata.yml
-@@ -53,8 +53,6 @@
+--- racc.orig/metadata.yml
++++ racc/metadata.yml
+@@ -68,8 +68,6 @@ executables:
  - racc
  - racc2y
  - y2racc
diff --git a/debian/patches/020_test_helper_ruby_path_fix b/debian/patches/020_test_helper_ruby_path_fix
index d131612..a21cb33 100644
--- a/debian/patches/020_test_helper_ruby_path_fix
+++ b/debian/patches/020_test_helper_ruby_path_fix
@@ -1,12 +1,12 @@
---- a/test/helper.rb
-+++ b/test/helper.rb
-@@ -79,7 +79,8 @@
-     
+--- racc.orig/test/helper.rb
++++ racc/test/helper.rb
+@@ -81,7 +81,8 @@ module Racc
      def ruby arg
        Dir.chdir(TEST_DIR) do
--        cmd = "#{ENV['_']} -I #{INC} #{arg} 2>>/tmp/out"
-+        cmd = File.symlink?("/proc/#{$$}/exe") ? File.readlink("/proc/#{$$}/exe") : ENV['_']
-+        cmd = "#{cmd} -I #{INC} #{arg} 2>>/tmp/out"
-         result = system(cmd)
-         result ? assert(result) : raise(cmd)
-       end
+         Tempfile.open 'test' do |io|
+-          cmd = "#{ENV['_']} -I #{INC} #{arg} 2>#{io.path}"
++          cmd = File.symlink?("/proc/#{$$}/exe") ? File.readlink("/proc/#{$$}/exe") : ENV['_']
++          cmd = "#{cmd} -I #{INC} #{arg} 2>#{io.path}"
+           result = system(cmd)
+           assert(result, io.read)
+         end
diff --git a/debian/patches/030_move_test_log b/debian/patches/030_move_test_log
deleted file mode 100644
index 78fce95..0000000
--- a/debian/patches/030_move_test_log
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/test/helper.rb
-+++ b/test/helper.rb
-@@ -80,7 +80,7 @@
-     def ruby arg
-       Dir.chdir(TEST_DIR) do
-         cmd = File.symlink?("/proc/#{$$}/exe") ? File.readlink("/proc/#{$$}/exe") : ENV['_']
--        cmd = "#{cmd} -I #{INC} #{arg} 2>>/tmp/out"
-+        cmd = "#{cmd} -I #{INC} #{arg} 2>>#{TEST_DIR}/out.log"
-         result = system(cmd)
-         result ? assert(result) : raise(cmd)
-       end
diff --git a/debian/patches/040_fix_deprecated b/debian/patches/040_fix_deprecated
deleted file mode 100644
index 383d468..0000000
--- a/debian/patches/040_fix_deprecated
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/lib/racc/parserfilegenerator.rb
-+++ b/lib/racc/parserfilegenerator.rb
-@@ -114,7 +114,7 @@
-       footer
-     end
- 
--    c = ::Config::CONFIG
-+    c = ::RbConfig::CONFIG
-     RUBY_PATH = "#{c['bindir']}/#{c['ruby_install_name']}#{c['EXEEXT']}"
- 
-     def shebang(path)
diff --git a/debian/patches/series b/debian/patches/series
index 6682f68..16c9cc0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,2 @@
 010_disable_ext
 020_test_helper_ruby_path_fix
-030_move_test_log
-040_fix_deprecated

-- 
racc.git