From 05d43c516d81708533efea8b3dbf89c77d6a22e1 Mon Sep 17 00:00:00 2001
From: Adam Vandenberg
Date: Tue, 5 Nov 2013 22:11:41 -0800
Subject: add trash/osxutils conflict

---
 Library/Formula/osxutils.rb | 4 ++--
 Library/Formula/trash.rb    | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'Library')

diff --git a/Library/Formula/osxutils.rb b/Library/Formula/osxutils.rb
index 88cf15a53..b53581059 100644
--- a/Library/Formula/osxutils.rb
+++ b/Library/Formula/osxutils.rb
@@ -2,11 +2,11 @@ require 'formula'
 
 class Osxutils < Formula
   homepage 'https://github.com/vasi/osxutils'
+  head 'https://github.com/vasi/osxutils.git'
   url 'https://github.com/vasi/osxutils/archive/v1.8.tar.gz'
   sha1 'c3d20da36ecfae3abff07f482a572b3680a12b6d'
 
-  head 'https://github.com/vasi/osxutils.git'
-
+  conflicts_with 'trash', :because => 'both install a trash binary'
   conflicts_with 'leptonica',
     :because => "both leptonica and osxutils ship a `fileinfo` executable."
 
diff --git a/Library/Formula/trash.rb b/Library/Formula/trash.rb
index 51cea16ab..4ecee481d 100644
--- a/Library/Formula/trash.rb
+++ b/Library/Formula/trash.rb
@@ -5,6 +5,8 @@ class Trash < Formula
   url 'http://github.com/hasseg/trash/archive/v0.8.3.zip'
   sha1 'de3489f7dbfe03dc490a3c7da22dba90998af3d1'
 
+  conflicts_with 'osxutils', :because => 'both install a trash binary'
+
   def install
     system "make"
     system "make docs"
-- 
cgit v1.2.3