[DRE-commits] [ruby-sprockets-rails] 03/04: Conflict with ruby-actionpack-3.2

[Christian Hofstaedtler]

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

zeha pushed a commit to branch master
in repository ruby-sprockets-rails.

commit a3598d21fbfe079f202141b8da5705180f3f90c6
Author: Christian Hofstaedtler <zeha at debian.org>
Date:   Thu Jan 16 11:34:59 2014 +0100

    Conflict with ruby-actionpack-3.2
    
    actionpack 3.2 ships files that have been moved to this package. As long
    as Rails 3.2 stays in the archive, we need to Conflict with it.
    
    Git-Dch: Full
    Closes: #732992
---
 debian/control | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/debian/control b/debian/control
index bbeca04..ffba67f 100644
--- a/debian/control
+++ b/debian/control
@@ -18,7 +18,8 @@ Depends: ${shlibs:Depends},
 	 ${misc:Depends},
 	 ruby | ruby-interpreter,
 	 ruby-sprockets (>= 2.8),
-	 ruby-actionpack-3.2 | ruby-actionpack-4.0
+	 ruby-actionpack-4.0
+Conflicts: ruby-actionpack-3.2
 Description: Sprockets Rails integration (part of Rails)
  This package provides Sprockets implementation for Rails 4.x (and
  beyond) Asset Pipeline.

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