[DRE-commits] [ruby-aws-sdk] 05/08: Add Conflicts: ruby-aws

[David Suárez]

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

deiv-guest pushed a commit to branch master
in repository ruby-aws-sdk.

commit ca981c4f304bce6d15c56a0217e5d5c047211f8b
Author: David Suárez <david.sephirot at gmail.com>
Date:   Tue Aug 11 17:42:29 2015 +0200

    Add Conflicts: ruby-aws
---
 debian/control | 1 +
 1 file changed, 1 insertion(+)

diff --git a/debian/control b/debian/control
index 3602bdb..309e780 100644
--- a/debian/control
+++ b/debian/control
@@ -18,6 +18,7 @@ Depends: ruby | ruby-interpreter,
          ${misc:Depends},
          ${shlibs:Depends}
 Suggests: pry
+Conflicts: ruby-aws
 Description: Amazon Web Services SDK for Ruby
  The AWS SDK for Ruby provides a Ruby API for AWS infrastructure services.
  The SDK helps take the complexity out of coding by providing Ruby classes

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