New upstream release

.hgignore

@@ -1,7 +1,6 @@
-^debian/ruby-linux-netlink$
+^debian/liblinux-netlink-ruby(1.8|1.9.1)?$
 ~$
 ^.config-liblinux-netlink-ruby
-^.pc/
 ^debian/files$
 ^debian/.*\.substvars$
 ^debian/.*\.debhelper.log$

debian/changelog

@@ -1,52 +1,38 @@
-ruby-linux-netlink (0.17-1+wheezy1) stable; urgency=medium
-
-  * New upstream release
-
- -- Patrick J Cherry <patrick@bytemark.co.uk>  Wed, 01 Apr 2015 22:44:51 +0100
-
-ruby-linux-netlink (0.16-1+wheezy1) stable; urgency=medium
+linux-netlink-ruby (0.16-1+squeeze1) oldstable; urgency=low
 
   * New upstream release.
 
- -- Patrick J Cherry <patch@dynamo>  Tue, 26 Aug 2014 16:33:48 +0100
+ -- Patrick J Cherry <patch@dynamo>  Tue, 26 Aug 2014 16:32:44 +0100
 
-ruby-linux-netlink (0.15-1+wheezy1) stable; urgency=low
+linux-netlink-ruby (0.15-1+squeeze1) oldstable; urgency=low
 
   * New upstream release.
 
- -- Patrick J Cherry <patrick@bytemark.co.uk>  Tue, 21 Jan 2014 10:01:20 +0000
+ -- Patrick J Cherry <patrick@bytemark.co.uk>  Tue, 21 Jan 2014 10:02:54 +0000
 
-ruby-linux-netlink (0.14-1+wheezy1) stable; urgency=low
+linux-netlink-ruby (0.14-1+squeeze1) oldstable; urgency=low
 
   * New upstream release.
 
- -- Patrick J Cherry <patrick@bytemark.co.uk>  Thu, 14 Nov 2013 13:37:28 +0000
+ -- Patrick J Cherry <patrick@bytemark.co.uk>  Thu, 14 Nov 2013 11:59:05 +0000
 
-ruby-linux-netlink (0.13-1+wheezy1) stable; urgency=low
+linux-netlink-ruby (0.13-1+squeeze1) oldstable; urgency=low
 
   * New upstream release.
 
- -- Patrick J Cherry <patrick@bytemark.co.uk>  Wed, 13 Nov 2013 16:16:36 +0000
+ -- Patrick J Cherry <patrick@bytemark.co.uk>  Wed, 13 Nov 2013 16:15:43 +0000
 
-ruby-linux-netlink (0.12-1+wheezy1) stable; urgency=low
+linux-netlink-ruby (0.12-1+squeeze1) oldstable; urgency=low
 
   * New upstream release.
 
- -- Patrick J Cherry <patrick@bytemark.co.uk>  Thu, 12 Sep 2013 14:26:41 +0100
+ -- Patrick J Cherry <patrick@bytemark.co.uk>  Thu, 12 Sep 2013 14:28:10 +0100
 
-ruby-linux-netlink (0.11-1+wheezy2) stable; urgency=low
+linux-netlink-ruby (0.11-1+squeeze1) oldstable; urgency=low
 
-  * Switch to dpkg-source 3.0 (quilt) format.
-  * Added patch to remove rubygems requires.
-  * Renamed source package to fit in with the new guidelines.
+  * New upstream version.
 
- -- Patrick J Cherry <patrick@bytemark.co.uk>  Fri, 05 Jul 2013 14:16:30 +0100
-
-linux-netlink-ruby (0.11-1+wheezy1) stable; urgency=low
-
-  * New upstream version, repackaged for wheezy.
-
- -- Patrick J Cherry <patrick@bytemark.co.uk>  Fri, 05 Jul 2013 14:16:05 +0100
+ -- Patrick J Cherry <patrick@bytemark.co.uk>  Fri, 05 Jul 2013 13:52:09 +0100
 
 linux-netlink-ruby (0.10-6) stable; urgency=low
 

debian/control

@@ -1,18 +1,39 @@
-Source: ruby-linux-netlink
+Source: linux-netlink-ruby
 Maintainer: Matthew Bloch <matthew@bytemark.co.uk>
 Uploaders: Patrick J Cherry <patrick@bytemark.co.uk>
 Section: ruby
 Priority: optional
-Build-Depends:  debhelper (>= 7), gem2deb, rake, ruby-ffi
+Build-Depends:  debhelper (>= 7), cdbs, ruby1.8, ruby1.9.1, ruby-pkg-tools, rake
 Standards-Version: 3.8.0
-XS-Ruby-Versions: all 
 
-Package: ruby-linux-netlink
-Architecture: any
-Depends: ruby | ruby-interpreter, ruby-ffi, ${misc:Depends}
-Provides: liblinux-netlink-ruby1.8, liblinux-netlink-ruby1.9.1
-XB-Ruby-Versions: ${ruby:Versions}
+Package: liblinux-netlink-ruby
+Architecture: all
+Depends: liblinux-netlink-ruby1.8 | liblinux-netlink-ruby1.9.1, ${misc:Depends}
 Description: Netlink socket library for Ruby
  This library provides an API for using a Linux Netlink socket, for doing
  things like manipulating IP interfaces and routes programmatically, and
  capturing packets from ULOG.
+ .
+ This is the metapackage for all versions of Ruby.
+
+Package: liblinux-netlink-ruby1.8
+Architecture: any
+Depends: ruby1.8 (>= 1.8.7), libffi-ruby1.8, ${misc:Depends}
+Description: Netlink socket library for Ruby 1.8
+ This library provides an API for using a Linux Netlink socket, for doing
+ things like manipulating IP interfaces and routes programmatically, and
+ capturing packets from ULOG.
+ .
+ This is the version for Ruby 1.8.7.
+ 
+
+Package: liblinux-netlink-ruby1.9.1
+Architecture: any
+Depends: ruby1.9.1, libffi-ruby1.9.1, ${misc:Depends}
+Description: Netlink socket library for Ruby 1.9.1
+ This library provides an API for using a Linux Netlink socket, for doing
+ things like manipulating IP interfaces and routes programmatically, and
+ capturing packets from ULOG.
+ .
+ This is the version for Ruby 1.9.1.
+

debian/liblinux-netlink-ruby1.9.1.examples

@@ -0,0 +1 @@
+examples/*

debian/patches/remove-rubygems-requirements

@@ -1,32 +0,0 @@
-Removed "require rubygems" from everywhere.
---- a/lib/linux/iptables.rb
-+++ b/lib/linux/iptables.rb
-@@ -1,11 +1,6 @@
- require 'socket'
- require 'linux/constants'
--
--begin
--  require 'ffi'
--rescue LoadError
--  require('rubygems') ? retry : raise
--end
-+require 'ffi'
- 
- 
- # Good things about FFI::Struct:
---- a/lib/linux/sendmsg.rb
-+++ b/lib/linux/sendmsg.rb
-@@ -1,12 +1,7 @@
- # Patchup to add Socket#sendmsg and Socket#recvmsg for ruby 1.8
- 
- if BasicSocket.instance_methods.grep(/^sendmsg$/).empty?
--  begin
--    require 'ffi'
--  rescue LoadError
--    require('rubygems') ? retry : raise
--  end
--
-+  require 'ffi'
-     
-   class BasicSocket
-     module FFIExt

debian/patches/series

@@ -1 +0,0 @@
-remove-rubygems-requirements

debian/ruby-test-files.yaml

@@ -1,2 +0,0 @@
----
-- test/t_route.rb

debian/rules

@@ -1,23 +1,11 @@
 #!/usr/bin/make -f
 #
-# export DH_VERBOSE=1
-#
-# Uncomment to ignore all test failures (but the tests will run anyway)
-# export DH_RUBY_IGNORE_TESTS=all
-#
-# Uncomment to ignore some test failures (but the tests will run anyway).
-# Valid values:
-# export DH_RUBY_IGNORE_TESTS=ruby1.8 ruby1.9.1 require-rubygems
-#
-# If you need to specify the .gemspec (eg there is more than one)
-# export DH_RUBY_GEMSPEC=gem.gemspec
 
-%:
-	dh $@ --buildsystem=ruby --with ruby
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/ruby-pkg-tools/1/class/ruby-setup-rb.mk
 
-override_dh_auto_build-arch:
+makebuilddir::
 	rake lib/linux/c_struct_sizeof_size_t.rb
 
-override_dh_auto_clean:
+clean::
 	rake clean
-

debian/source/format

@@ -1 +0,0 @@
-3.0 (quilt)

netlinkrb.gemspec

@@ -5,9 +5,9 @@ $:.unshift lib unless $:.include? lib
 
 Gem::Specification.new do |s|
   s.name = "netlinkrb"
-  s.version = "0.17"
+  s.version = "0.12"
   s.platform = Gem::Platform::RUBY
-  s.authors = ["Brian Candler", "Matthew Bloch", "Patrick Cherry", "Alex Young", "Nicholas Thomas"]
+  s.authors = ["Brian Candler", "Matthew Bloch", "Patrick Cherry", "Alex Young"]
   s.email = ["matthew@bytemark.co.uk"]
   s.summary = "Interface to Linux' Netlink API"
   s.description = "Ruby native interface to the Netlink API which avoids shelling out to command-line tools as much as possible."

test/t_route.rb

@@ -40,28 +40,6 @@ class TestAddr < Test::Unit::TestCase
       end
     end
 
-    test "massively parallel IP address addition" do
-      @ifname = create_test_interface
-
-      ips = (10..20).map {|y| (1..254).map {|z| "10.100.#{y}.#{z}" } }.flatten.compact
-
-      threads = ips.map {|ip|
-        Thread.new {
-          Linux::Netlink::Route::Socket.new.addr.add(
-            :index => @ifname,
-            :local => ip,
-            :prefixlen => 8
-          )
-        }
-      }
-
-      threads.map(&:join)
-      created = @ip.addr.list(:index => @ifname, :family => Socket::AF_INET).
-        map {|ifaddr| ifaddr.address.to_s }
-
-      ips.each {|ip| assert created.include?( ip ), "#{ip} was not created" }
-    end
-
     def create_test_interface(ifname = "test_#{$$}")
       begin
         @ip.link.add(