[DRE-commits] [ruby-arel] 03/04: remove compatibility patch with ruby-activerecord-3.2

[Cédric Boutillier]

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

boutil pushed a commit to branch master
in repository ruby-arel.

commit 23e1cd8454d2d4a9dcf699a412b9721990299a6f
Author: Cédric Boutillier <boutil at debian.org>
Date:   Sun Jul 27 22:15:41 2014 +0200

    remove compatibility patch with ruby-activerecord-3.2
---
 debian/control                             |  1 +
 debian/patches/restore_arel_relation.patch | 18 ------------------
 debian/patches/series                      |  1 -
 3 files changed, 1 insertion(+), 19 deletions(-)

diff --git a/debian/control b/debian/control
index 515d39a..fa5e54f 100644
--- a/debian/control
+++ b/debian/control
@@ -19,6 +19,7 @@ XB-Ruby-Versions: ${ruby:Versions}
 Depends: ${shlibs:Depends},
 	 ${misc:Depends},
 	 ruby | ruby-interpreter
+Breaks: ruby-activerecord-3.2
 Description: SQL AST manager for Ruby
  Arel is a SQL AST manager for Ruby. It simplifies the generation of
  complex SQL queries and adapts to various RDBMS systems.
diff --git a/debian/patches/restore_arel_relation.patch b/debian/patches/restore_arel_relation.patch
deleted file mode 100644
index 8b4ce50..0000000
--- a/debian/patches/restore_arel_relation.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Description: restore temporarily Arel::Relation module for ruby-activerecord-3.2
- This empty module has been removed from arel 0.4, but is still used in activerecord.
-Author: Cédric Boutillier <boutil at debian.org>
-Forwarded: not-needed
-Bug-Debian: http://bugs.debian.org/720141
-Last-Update: 2013-09-23
-
---- a/lib/arel.rb
-+++ b/lib/arel.rb
-@@ -43,4 +43,8 @@
-   end
-   ## Convenience Alias
-   Node = Arel::Nodes::Node
-+
-+  ## Debian temporary fix: restore dummy Arel::Relations for Rails 3
-+  module Relation
-+  end
- end
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index ba4fd14..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-restore_arel_relation.patch

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