From 08050fbec7e27ee8d99ea9344c48680cf046a9a1 Mon Sep 17 00:00:00 2001
From: Patrick J Cherry <patrick@bytemark.co.uk>
Date: Fri, 5 Jul 2013 13:58:07 +0100
Subject: [PATCH] Updated packaging for wheezy.

---
 .hgignore                                     |  4 ++-
 debian/changelog                              |  6 ++--
 debian/control                                | 35 ++++---------------
 debian/liblinux-netlink-ruby1.9.1.examples    |  1 -
 ...8.examples => ruby-linux-netlink.examples} |  0
 debian/ruby-test-files.yaml                   |  2 ++
 debian/rules                                  | 20 ++++++++---
 7 files changed, 31 insertions(+), 37 deletions(-)
 delete mode 100644 debian/liblinux-netlink-ruby1.9.1.examples
 rename debian/{liblinux-netlink-ruby1.8.examples => ruby-linux-netlink.examples} (100%)
 create mode 100644 debian/ruby-test-files.yaml

diff --git a/.hgignore b/.hgignore
index fd97206..41f51a9 100644
--- a/.hgignore
+++ b/.hgignore
@@ -1,4 +1,6 @@
-^debian/liblinux-netlink-ruby
+^debian/ruby-linux-netlink$
 ~$
 ^.config-liblinux-netlink-ruby
 ^debian/files$
+^debian/.*\.substvars$
+^debian/.*\.debhelper.log$
diff --git a/debian/changelog b/debian/changelog
index 1516e7c..7bb8092 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-linux-netlink-ruby (0.11-1+squeeze1) oldstable; urgency=low
+linux-netlink-ruby (0.11-1+wheezy1) stable; urgency=low
 
-  * New upstream version.
+  * New upstream version, repackaged for wheezy.
 
- -- 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 13:57:06 +0100
 
 linux-netlink-ruby (0.10-6) stable; urgency=low
 
diff --git a/debian/control b/debian/control
index d7104d5..acb05ec 100644
--- a/debian/control
+++ b/debian/control
@@ -3,37 +3,16 @@ 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
-Architecture: all
-Depends: liblinux-netlink-ruby1.8 | liblinux-netlink-ruby1.9.1, ${misc:Depends}
+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}
 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.
-
diff --git a/debian/liblinux-netlink-ruby1.9.1.examples b/debian/liblinux-netlink-ruby1.9.1.examples
deleted file mode 100644
index e39721e..0000000
--- a/debian/liblinux-netlink-ruby1.9.1.examples
+++ /dev/null
@@ -1 +0,0 @@
-examples/*
diff --git a/debian/liblinux-netlink-ruby1.8.examples b/debian/ruby-linux-netlink.examples
similarity index 100%
rename from debian/liblinux-netlink-ruby1.8.examples
rename to debian/ruby-linux-netlink.examples
diff --git a/debian/ruby-test-files.yaml b/debian/ruby-test-files.yaml
new file mode 100644
index 0000000..bb88cd7
--- /dev/null
+++ b/debian/ruby-test-files.yaml
@@ -0,0 +1,2 @@
+---
+- test/t_route.rb
diff --git a/debian/rules b/debian/rules
index bf1db75..5a433f2 100755
--- a/debian/rules
+++ b/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
+