[DRE-commits] [ruby-arel] 01/01: temporarily restore Arel::Relation (Closes: 720141)

[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 4398f0ee8e21c24c5f3e59a7097bceb6cd54db04
Author: Cédric Boutillier <boutil at debian.org>
Date:   Mon Sep 23 16:27:48 2013 +0200

    temporarily restore Arel::Relation (Closes: 720141)
---
 debian/changelog                           |    8 ++++++++
 debian/patches/restore_arel_relation.patch |   18 ++++++++++++++++++
 debian/patches/series                      |    1 +
 3 files changed, 27 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 5b94fbe..42a791a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+ruby-arel (4.0.0-2) unstable; urgency=low
+
+  * Team upload
+  * Restore temporarily Arel::Relation module to ensure compatibility with
+    ruby-activerecord-3.2 (Closes: #720141)
+
+ -- Cédric Boutillier <boutil at debian.org>  Mon, 23 Sep 2013 16:15:17 +0200
+
 ruby-arel (4.0.0-1) unstable; urgency=low
 
   * New upstream release 
diff --git a/debian/patches/restore_arel_relation.patch b/debian/patches/restore_arel_relation.patch
new file mode 100644
index 0000000..8b4ce50
--- /dev/null
+++ b/debian/patches/restore_arel_relation.patch
@@ -0,0 +1,18 @@
+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
new file mode 100644
index 0000000..ba4fd14
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+restore_arel_relation.patch

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