[DRE-commits] [SCM] ruby-gettext.git branch, master, updated. debian/2.2.1-2-32-g1612f57

[Jérémy Bobbio]

The following commit has been merged in the master branch:
commit 65a8370014854157cb94c45e1762697644244e0f
Author: Jérémy Bobbio <lunar at debian.org>
Date:   Fri Mar 22 10:51:48 2013 +0000

    Conflict with ruby-gettext-activerecord (<= 2.1.0-5~)
    
    gettext 2.3 API changes breaks gettext_activerecord. No updates has been found
    yet, though.

diff --git a/debian/control b/debian/control
index 3fd5ace..466f055 100644
--- a/debian/control
+++ b/debian/control
@@ -23,6 +23,7 @@ Depends: ruby | ruby-interpreter,
          ruby-locale,
          ${misc:Depends},
          ${shlibs:Depends}
+Conflicts: ruby-gettext-activerecord (<= 2.1.0-5~)
 Breaks: libgettext-ruby (<< ${source:Version}),
         libgettext-ruby1.8 (<< ${source:Version}),
         libgettext-ruby1.9.1 (<< ${source:Version})

-- 
ruby-gettext.git