[DRE-commits] [ruby-activerecord-nulldb-adapter] 01/03: Fix FTBFS bug with a upstream patch (Closes: #759918)

[Sebastien Badia]

This is an automated email from the git hooks/post-receive script.

sbadia-guest pushed a commit to branch master
in repository ruby-activerecord-nulldb-adapter.

commit ae577fe32535973a6df6c96da35884fd41087a0a
Author: Sebastien Badia <seb at sebian.fr>
Date:   Fri Apr 10 10:36:45 2015 +0200

    Fix FTBFS bug with a upstream patch (Closes: #759918)
---
 debian/changelog                                    |  7 +++++++
 debian/patches/0001_fix-ftbfs-wrong-arguments.patch | 20 ++++++++++++++++++++
 debian/patches/series                               |  1 +
 3 files changed, 28 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index e6954bc..22f5f1b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ruby-activerecord-nulldb-adapter (0.3.1-2) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * Fix FTBFS bug with a upstream patch (Closes: #759918)
+
+ -- Sebastien Badia <seb at sebian.fr>  Fri, 10 Apr 2015 10:35:35 +0200
+
 ruby-activerecord-nulldb-adapter (0.3.1-1) unstable; urgency=medium
 
   * Initial release (Closes: #752371)
diff --git a/debian/patches/0001_fix-ftbfs-wrong-arguments.patch b/debian/patches/0001_fix-ftbfs-wrong-arguments.patch
new file mode 100644
index 0000000..cf62910
--- /dev/null
+++ b/debian/patches/0001_fix-ftbfs-wrong-arguments.patch
@@ -0,0 +1,20 @@
+Description: #select_rows accepts an optional third argument
+ Fix FTBFS during sid rebuid
+Author: Bram de Vries <dev at blaet.net>
+Origin: upstream, https://github.com/nulldb/nulldb/commit/ed90a8c4aad65026ecab347f2224a8ad4ae2062e.patch
+Bug-Debian: https://bugs.debian.org/759918
+Forwarded: not-needed
+Reviewed-By: Sebastien Badia <seb at sebian.fr>
+Last-Update: 2015-04-09
+
+--- ruby-activerecord-nulldb-adapter-0.3.1.orig/lib/active_record/connection_adapters/nulldb_adapter/core.rb
++++ ruby-activerecord-nulldb-adapter-0.3.1/lib/active_record/connection_adapters/nulldb_adapter/core.rb
+@@ -158,7 +158,7 @@ class ActiveRecord::ConnectionAdapters::
+     EmptyResult.new
+   end
+ 
+-  def select_rows(statement, name = nil)
++  def select_rows(statement, name = nil, binds = [])
+     [].tap do
+       self.execution_log << Statement.new(entry_point, statement)
+     end
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..2f8c84b
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001_fix-ftbfs-wrong-arguments.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-activerecord-nulldb-adapter.git