[SCM] hyphen Packaging Repository branch, master, updated. 67bbce912b94cb4d9c20a225de59645a077bd4db

["Rene Engelhard" <rene@debian.org>]

The following commit has been merged in the master branch:
commit 67bbce912b94cb4d9c20a225de59645a077bd4db
Author: Rene Engelhard <rene@debian.org>
Date:   Fri Mar 11 18:29:50 2011 +0100

    remove conflicts against oo.o-thesaurus-en-us again, we now have a transitional package for it

diff --git a/changelog b/changelog
index ce6f5f8..37068c4 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,10 @@
+hyphen (2.7.1-4) unstable; urgency=low
+
+  * remove conflicts against oo.o-thesaurus-en-us again, we now have
+    a transitional package for it 
+
+ -- Rene Engelhard <rene@debian.org>  Fri, 11 Mar 2011 10:40:12 +0100
+
 hyphen (2.7.1-3) unstable; urgency=low
 
   * upload to unstable 
diff --git a/control b/control
index a056a86..8dffdc5 100644
--- a/control
+++ b/control
@@ -46,7 +46,6 @@ Depends: dictionaries-common (>= 0.10) | openoffice.org-updatedicts, ${misc:Depe
 Recommends: libreoffice-writer | openoffice.org-writer
 Provides: openoffice.org-hyphenation, openoffice.org-hyphenation-en, openoffice.org-hyphenation-en-us, hyphen-hyphenation-pattern
 Replaces: openoffice.org-hyphenation-en-us
-Conflicts: openoffice.org-hyphenation-en-us
 Description: US English hyphenation patterns for LibreOffice/OpenOffice.org
  This package contains the English (USA) hyphenation patterns for
  LibreOffice/OpenOffice.org

-- 
hyphen Packaging Repository