[DRE-commits] [ruby-rails-assets-jquery] 01/04: add conflicts with jquery-rails

[Praveen Arimbrathodiyil]

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

praveen pushed a commit to branch master
in repository ruby-rails-assets-jquery.

commit 2c0b900880060ed005aa0f4a7bbc689cccf73e9d
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Fri Sep 18 19:25:37 2015 +0530

    add conflicts with jquery-rails
---
 debian/control | 1 +
 1 file changed, 1 insertion(+)

diff --git a/debian/control b/debian/control
index b4ea06a..e229ccd 100644
--- a/debian/control
+++ b/debian/control
@@ -16,6 +16,7 @@ Package: ruby-rails-assets-jquery
 Architecture: all
 XB-Ruby-Versions: ${ruby:Versions}
 Depends: ruby | ruby-interpreter, libjs-jquery, ${shlibs:Depends}, ${misc:Depends}
+Conflicts: ruby-jquery-rails (<< 4.0.4-3)
 Description: This package provides jQuery, jQuery UI and the jQuery-ujs driver for Rails 3
  and 4 applications, and integrates these libraries into the Rails 3+ asset
  pipeline.

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