From bd5fd985f806a76c9b80e45dc9d747759109b01d Mon Sep 17 00:00:00 2001
From: Adam Vandenberg
Date: Tue, 12 Nov 2013 20:50:13 -0800
Subject: pdftohtml/poppler conflict

---
 Library/Formula/pdftohtml.rb | 2 ++
 Library/Formula/poppler.rb   | 2 ++
 2 files changed, 4 insertions(+)

(limited to 'Library/Formula')

diff --git a/Library/Formula/pdftohtml.rb b/Library/Formula/pdftohtml.rb
index 863f17b69..d10285257 100644
--- a/Library/Formula/pdftohtml.rb
+++ b/Library/Formula/pdftohtml.rb
@@ -5,6 +5,8 @@ class Pdftohtml < Formula
   url 'http://downloads.sourceforge.net/project/pdftohtml/Experimental%20Versions/pdftohtml%200.40/pdftohtml-0.40a.tar.gz'
   sha1 '409572da65cf5234d026a5b199a81a26e75ca4d8'
 
+  conflicts_with 'poppler', :beacuse => 'both install `pdftohtml` binaries'
+
   def install
     system "make"
     bin.install "src/pdftohtml"
diff --git a/Library/Formula/poppler.rb b/Library/Formula/poppler.rb
index e97980794..4992522be 100644
--- a/Library/Formula/poppler.rb
+++ b/Library/Formula/poppler.rb
@@ -18,6 +18,8 @@ class Poppler < Formula
   depends_on 'glib' => :optional
   depends_on 'cairo' if build.with? 'glib' # Needs a newer Cairo build than OS X 10.6.7 provides
 
+  conflicts_with 'pdftohtml', :beacuse => 'both install `pdftohtml` binaries'
+
   conflicts_with 'pdf2image', 'xpdf',
     :because => 'poppler, pdf2image, and xpdf install conflicting executables'
 
-- 
cgit v1.2.3