tags 676126 patch thanks Hi Mats, I'm about to upload an NMU for #676126 (FTBFS due to some changes in Ruby 1.9).
Changelog is the following:
netsed (1.00b-2.1) unstable; urgency=low
.
* Non-maintainer upload.
* Add 05-ftbfs_ruby1.9_testsuite_require_syntax.diff to adjust to
changes in the Ruby 1.9 require syntax. (Closes: #676126)
* Build-Depend on procps - ps is used within test/tc_system.rb.
Julien, I'm not sure if my fix is 'the Ruby way' for the issue
at hand, but it at least works for now. If you can please take a look
at the attached 05-ftbfs_ruby1.9_testsuite_require_syntax.diff patch.
Cheers,
Sven
--
And I don't know much, but I do know this:
With a golden heart comes a rebel fist.
[ Streetlight Manifesto - Here's To Life ]
netsed_1.00b-2.1.debian.tar.gz
Description: Binary data
Format: 3.0 (quilt) Source: netsed Binary: netsed Architecture: any Version: 1.00b-2.1 Maintainer: Mats Erik Andersson <mats.anders...@gisladisker.se> Dm-Upload-Allowed: yes Homepage: http://silicone.homelinux.org/projects/netsed/ Standards-Version: 3.9.2 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/netsed.git Vcs-Git: git://anonscm.debian.org/collab-maint/netsed.git Build-Depends: debhelper (>= 8.0.0~), ruby, procps Package-List: netsed deb net optional Checksums-Sha1: baba55d20cceb5bcedd21eacb5650467735c3860 26545 netsed_1.00b.orig.tar.gz df5f53b6fb0f07cd09218eb6e7d850343e3854fd 7628 netsed_1.00b-2.1.debian.tar.gz Checksums-Sha256: 371433661c0cbad161d8c68080afb5e05cafe76037cb538e0b52a725838f0f8a 26545 netsed_1.00b.orig.tar.gz 046e748112a3c5023dc2ab19186f09c1cae15830ed9807d0cd74a2977d0c7628 7628 netsed_1.00b-2.1.debian.tar.gz Files: 8e42c5e944d5670b6b292524c98647c5 26545 netsed_1.00b.orig.tar.gz 1f9dc2e548e8b1bda9dc4909e913c7c6 7628 netsed_1.00b-2.1.debian.tar.gz
diff -Nru netsed-1.00b/debian/changelog netsed-1.00b/debian/changelog --- netsed-1.00b/debian/changelog 2011-08-24 20:56:14.000000000 +0200 +++ netsed-1.00b/debian/changelog 2012-07-08 16:33:48.000000000 +0200 @@ -1,3 +1,12 @@ +netsed (1.00b-2.1) unstable; urgency=low + + * Non-maintainer upload. + * Add 05-ftbfs_ruby1.9_testsuite_require_syntax.diff to adjust to + changes in the Ruby 1.9 require syntax. (Closes: #676126) + * Build-Depend on procps - ps is used within test/tc_system.rb. + + -- Sven Hoexter <hoex...@debian.org> Sun, 08 Jul 2012 14:59:24 +0200 + netsed (1.00b-2) unstable; urgency=low * debian/control: Improve description. diff -Nru netsed-1.00b/debian/control netsed-1.00b/debian/control --- netsed-1.00b/debian/control 2011-08-24 20:56:14.000000000 +0200 +++ netsed-1.00b/debian/control 2012-07-08 16:33:08.000000000 +0200 @@ -3,7 +3,7 @@ Priority: optional Maintainer: Mats Erik Andersson <mats.anders...@gisladisker.se> Standards-Version: 3.9.2 -Build-Depends: debhelper (>= 8.0.0~), ruby +Build-Depends: debhelper (>= 8.0.0~), ruby, procps Homepage: http://silicone.homelinux.org/projects/netsed/ Vcs-Git: git://anonscm.debian.org/collab-maint/netsed.git Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/netsed.git diff -Nru netsed-1.00b/debian/patches/05-ftbfs_ruby1.9_testsuite_require_syntax.diff netsed-1.00b/debian/patches/05-ftbfs_ruby1.9_testsuite_require_syntax.diff --- netsed-1.00b/debian/patches/05-ftbfs_ruby1.9_testsuite_require_syntax.diff 1970-01-01 01:00:00.000000000 +0100 +++ netsed-1.00b/debian/patches/05-ftbfs_ruby1.9_testsuite_require_syntax.diff 2012-07-08 14:58:11.000000000 +0200 @@ -0,0 +1,77 @@ +--- a/test/tc_rules.rb ++++ b/test/tc_rules.rb +@@ -5,7 +5,7 @@ + # this file implements checks for netsed rules in class TC_RuleTest + + require 'test/unit' +-require 'test_helper' ++require './test_helper' + + # Test Case for netsed rules + class TC_RuleTest < Test::Unit::TestCase +--- a/test/tc_system.rb ++++ b/test/tc_system.rb +@@ -5,7 +5,7 @@ + # this file implements checks for netsed system behaviour in class TC_SystemTest + + require 'test/unit' +-require 'test_helper' ++require './test_helper' + require 'thread' + + # Test Case for netsed system behaviour +--- a/test/tc_tcp.rb ++++ b/test/tc_tcp.rb +@@ -8,7 +8,7 @@ + # + + require 'test/unit' +-require 'test_helper' ++require './test_helper' + + # Test Case for TCP + # +--- a/test/tc_ttl.rb ++++ b/test/tc_ttl.rb +@@ -5,7 +5,7 @@ + # this file implements checks for the TTL (time-to-live) feature of netsed rules in the class TC_TTLTest. + + require 'test/unit' +-require 'test_helper' ++require './test_helper' + + # Test Case for netsed TTL (time-to-live) feature + class TC_TTLTest < Test::Unit::TestCase +--- a/test/tc_udp.rb ++++ b/test/tc_udp.rb +@@ -1,4 +1,5 @@ + #!/usr/bin/ruby ++# -*- coding: utf-8 -*- + # netsed Unit::Tests + # (c) 2010 Julien Viard de Galbert <jul...@silicone.homelinux.org> + # +@@ -8,7 +9,7 @@ + # + + require 'test/unit' +-require 'test_helper' ++require './test_helper' + + # Test Case for UDP + # +--- a/test/ts_full.rb ++++ b/test/ts_full.rb +@@ -13,11 +13,11 @@ + require 'test/unit' + + Dir.chdir(File.dirname(__FILE__)) +-require 'test_helper' ++require './test_helper' + + Dir .glob('tc_*.rb') { |f| + #puts "adding #{f}" +- require f ++ require "./" + f + } + + # vim:sw=2:sta:et: diff -Nru netsed-1.00b/debian/patches/series netsed-1.00b/debian/patches/series --- netsed-1.00b/debian/patches/series 2011-08-24 20:56:14.000000000 +0200 +++ netsed-1.00b/debian/patches/series 2012-07-08 14:55:39.000000000 +0200 @@ -2,3 +2,4 @@ 02-ftbfs_kfreebsd.diff 03-traditional_rule.diff 04-check_dual_stack.diff +05-ftbfs_ruby1.9_testsuite_require_syntax.diff
--- a/test/tc_rules.rb
+++ b/test/tc_rules.rb
@@ -5,7 +5,7 @@
# this file implements checks for netsed rules in class TC_RuleTest
require 'test/unit'
-require 'test_helper'
+require './test_helper'
# Test Case for netsed rules
class TC_RuleTest < Test::Unit::TestCase
--- a/test/tc_system.rb
+++ b/test/tc_system.rb
@@ -5,7 +5,7 @@
# this file implements checks for netsed system behaviour in class TC_SystemTest
require 'test/unit'
-require 'test_helper'
+require './test_helper'
require 'thread'
# Test Case for netsed system behaviour
--- a/test/tc_tcp.rb
+++ b/test/tc_tcp.rb
@@ -8,7 +8,7 @@
#
require 'test/unit'
-require 'test_helper'
+require './test_helper'
# Test Case for TCP
#
--- a/test/tc_ttl.rb
+++ b/test/tc_ttl.rb
@@ -5,7 +5,7 @@
# this file implements checks for the TTL (time-to-live) feature of netsed rules in the class TC_TTLTest.
require 'test/unit'
-require 'test_helper'
+require './test_helper'
# Test Case for netsed TTL (time-to-live) feature
class TC_TTLTest < Test::Unit::TestCase
--- a/test/tc_udp.rb
+++ b/test/tc_udp.rb
@@ -1,4 +1,5 @@
#!/usr/bin/ruby
+# -*- coding: utf-8 -*-
# netsed Unit::Tests
# (c) 2010 Julien Viard de Galbert <jul...@silicone.homelinux.org>
#
@@ -8,7 +9,7 @@
#
require 'test/unit'
-require 'test_helper'
+require './test_helper'
# Test Case for UDP
#
--- a/test/ts_full.rb
+++ b/test/ts_full.rb
@@ -13,11 +13,11 @@
require 'test/unit'
Dir.chdir(File.dirname(__FILE__))
-require 'test_helper'
+require './test_helper'
Dir .glob('tc_*.rb') { |f|
#puts "adding #{f}"
- require f
+ require "./" + f
}
# vim:sw=2:sta:et:
