[DRE-commits] [ruby-activerecord-nulldb-adapter] 03/06: Removing patches already on new upstream version

Lucas Moura lucasmoura-guest at moszumanska.debian.org
Sat Mar 5 21:23:45 UTC 2016


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

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

commit e931a318f71f0a9115785df3a1a655fbb5f62eb0
Author: Lucas Albuquerque Medeiros de Moura <lucas.moura128 at gmail.com>
Date:   Sat Mar 5 16:38:03 2016 -0300

    Removing patches already on new upstream version
---
 debian/changelog                                    |  1 +
 debian/patches/0001_fix-ftbfs-wrong-arguments.patch | 20 --------------------
 debian/patches/series                               |  1 -
 3 files changed, 1 insertion(+), 21 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5993357..90aad5e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,7 @@ ruby-activerecord-nulldb-adapter (0.3.2-1) UNRELEASED; urgency=medium
 
   [ Lucas Albuquerque Medeiros de Moura ]
   * New upstream release. 
+  * Removing patches already applied on new upstream version.
 
  -- Sebastien Badia <seb at sebian.fr>  Fri, 10 Apr 2015 10:35:35 +0200
 
diff --git a/debian/patches/0001_fix-ftbfs-wrong-arguments.patch b/debian/patches/0001_fix-ftbfs-wrong-arguments.patch
deleted file mode 100644
index cf62910..0000000
--- a/debian/patches/0001_fix-ftbfs-wrong-arguments.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-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
deleted file mode 100644
index 2f8c84b..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-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



More information about the Pkg-ruby-extras-commits mailing list