Bug#680783: unblock: netsed/1.00b-2.1
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
Please unblock package netsed
1.00b-2.1 contains a fix for #676126 (FTBFS and thus RC), changelog is:
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
unblock netsed/1.00b-2.1
TIA,
Sven
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 <hoexter@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.andersson@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 16:55:06.000000000 +0200
@@ -0,0 +1,85 @@
+Description: Add ./ prefix to all local require statements
+ In Ruby 1.9 the syntax to include local files
+ via require changed. We now have to use a ./
+ prefix when local files should be included.
+Bug: http://bugs.debian.org/676126
+Author: Sven Hoexter <sven@timegate.de>
+Forwarded: yes
+Last-Updated: 2012-07-08
+--- 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 <julien@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
Reply to: