[DRE-commits] [ruby-hashie] 01/03: Conflicts: ruby-rash (see #792548)

[Antonio Terceiro]

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

terceiro pushed a commit to branch master
in repository ruby-hashie.

commit 1b88de49a69fb5bb4e19c6aab5409dd22fd5d889
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Wed Aug 5 09:36:40 2015 -0300

    Conflicts: ruby-rash (see #792548)
---
 debian/changelog | 6 ++++++
 debian/control   | 1 +
 2 files changed, 7 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index bbe6024..9bf2ae9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ruby-hashie (3.4.2-2) unstable; urgency=medium
+
+  * Conflicts: ruby-rash (see #792548)
+
+ -- Antonio Terceiro <terceiro at debian.org>  Wed, 05 Aug 2015 09:36:31 -0300
+
 ruby-hashie (3.4.2-1) unstable; urgency=medium
 
   * Team upload
diff --git a/debian/control b/debian/control
index 61c9cb3..7374aee 100644
--- a/debian/control
+++ b/debian/control
@@ -22,6 +22,7 @@ XB-Ruby-Versions: ${ruby:Versions}
 Depends: ruby | ruby-interpreter,
          ${misc:Depends},
          ${shlibs:Depends}
+Conflicts: ruby-rash
 Description: small collection of tools that make hashes more powerful
  Hashie is a growing collection of tools that extend Hashes and make
  them more useful.

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