merged heads

Added patch to remove rubygems requirements.

.hgignore

@@ -1,4 +1,7 @@
-^debian/liblinux-netlink-ruby
+^debian/ruby-linux-netlink$
 ~$
 ^.config-liblinux-netlink-ruby
+^.pc/
 ^debian/files$
+^debian/.*\.substvars$
+^debian/.*\.debhelper.log$

debian/changelog

@@ -1,8 +1,16 @@
-linux-netlink-ruby (0.11-1+squeeze1) oldstable; urgency=low
+ruby-linux-netlink (0.11-1+wheezy2) stable; urgency=low
 
-  * New upstream version.
+  * Switch to dpkg-source 3.0 (quilt) format.
+  * Added patch to remove rubygems requires.
+  * Renamed source package to fit in with the new guidelines.
 
- -- Patrick J Cherry <patrick@bytemark.co.uk>  Fri, 05 Jul 2013 13:52:09 +0100
+ -- 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
 
 linux-netlink-ruby (0.10-6) stable; urgency=low
 

debian/control

@@ -1,39 +1,18 @@
-Source: linux-netlink-ruby
+Source: ruby-linux-netlink
 Maintainer: Matthew Bloch <matthew@bytemark.co.uk>
 Uploaders: Patrick J Cherry <patrick@bytemark.co.uk>
 Section: ruby
 Priority: optional
-Build-Depends:  debhelper (>= 7), cdbs, ruby1.8, ruby1.9.1, ruby-pkg-tools, rake
+Build-Depends:  debhelper (>= 7), gem2deb, rake, ruby-ffi
 Standards-Version: 3.8.0
+XS-Ruby-Versions: all 
 
-Package: liblinux-netlink-ruby
+Package: ruby-linux-netlink
-Architecture: all
+Architecture: any
-Depends: liblinux-netlink-ruby1.8 | liblinux-netlink-ruby1.9.1, ${misc:Depends}
+Depends: ruby | ruby-interpreter, ruby-ffi, ${misc:Depends}
+Provides: liblinux-netlink-ruby1.8, liblinux-netlink-ruby1.9.1
+XB-Ruby-Versions: ${ruby:Versions}
 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

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

debian/patches/remove-rubygems-requirements

@@ -0,0 +1,32 @@
+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

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

debian/ruby-test-files.yaml

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

debian/rules

@@ -1,11 +1,23 @@
 #!/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
 
-include /usr/share/cdbs/1/rules/debhelper.mk
+%:
-include /usr/share/ruby-pkg-tools/1/class/ruby-setup-rb.mk
+	dh $@ --buildsystem=ruby --with ruby
 
-makebuilddir::
+override_dh_auto_build-arch:
 	rake lib/linux/c_struct_sizeof_size_t.rb
 
-clean::
+override_dh_auto_clean:
 	rake clean
+

debian/source/format

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