[hyphen] 19/29: Imported Debian patch 2.7.1-4
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch master
in repository hyphen.
commit 0e163b696b981c55ea587fdcff8fc8ae5b46b588
Author: Rene Engelhard <rene@debian.org>
Date: Fri Mar 11 10:40:12 2011 +0100
Imported Debian patch 2.7.1-4
---
debian/changelog | 9 ++++++++-
debian/control | 1 -
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index bfbdc63..37068c4 100644
--- a/debian/changelog
+++ b/debian/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
@@ -9,7 +16,7 @@ hyphen (2.7.1-3) unstable; urgency=low
hyphen (2.7.1-2) experimental; urgency=low
* change Maintainer to Debian LibreOffice Maintainers
- * rename openoffnstableice.org-hyphenation-en-us to hyphen-en-us
+ * rename openoffice.org-hyphenation-en-us to hyphen-en-us
* provide hyphen-hyphenation-pattern
* add ${misc:Depends}
* recommend libreoffice-writer | openoffice.org-writer for hyphen-en-us
diff --git a/debian/control b/debian/control
index a056a86..8dffdc5 100644
--- a/debian/control
+++ b/debian/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
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/hyphen.git
Reply to: