From 10f11d9bc16ffbf455a4b1d8bceb97811b6c8181 Mon Sep 17 00:00:00 2001
From: Patrick J Cherry <patrick@bytemark.co.uk>
Date: Fri, 5 Jul 2013 14:23:49 +0100
Subject: [PATCH] Updated package name to match ruby-packaging standards. Added
 patch to remove rubygems requirements.

---
 .hgignore                                   |  1 +
 debian/changelog                            | 10 ++++++-
 debian/control                              |  2 +-
 debian/patches/remove-rubygems-requirements | 32 +++++++++++++++++++++
 debian/patches/series                       |  1 +
 debian/source/format                        |  1 +
 6 files changed, 45 insertions(+), 2 deletions(-)
 create mode 100644 debian/patches/remove-rubygems-requirements
 create mode 100644 debian/patches/series
 create mode 100644 debian/source/format

diff --git a/.hgignore b/.hgignore
index 41f51a9..8dced2d 100644
--- a/.hgignore
+++ b/.hgignore
@@ -1,6 +1,7 @@
 ^debian/ruby-linux-netlink$
 ~$
 ^.config-liblinux-netlink-ruby
+^.pc/
 ^debian/files$
 ^debian/.*\.substvars$
 ^debian/.*\.debhelper.log$
diff --git a/debian/changelog b/debian/changelog
index 7bb8092..3073728 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,16 @@
+ruby-linux-netlink (0.11-1+wheezy2) stable; 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.
+
+ -- 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 13:57:06 +0100
+ -- Patrick J Cherry <patrick@bytemark.co.uk>  Fri, 05 Jul 2013 14:16:05 +0100
 
 linux-netlink-ruby (0.10-6) stable; urgency=low
 
diff --git a/debian/control b/debian/control
index acb05ec..7f03e6f 100644
--- a/debian/control
+++ b/debian/control
@@ -1,4 +1,4 @@
-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
diff --git a/debian/patches/remove-rubygems-requirements b/debian/patches/remove-rubygems-requirements
new file mode 100644
index 0000000..a76ed02
--- /dev/null
+++ b/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
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..342717e
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+remove-rubygems-requirements
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)