[hyphen] 18/29: Imported Debian patch 2.7.1-3
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch master
in repository hyphen.
commit 8ee7ca710725dec773b1f9ad0586e8ff0fab835d
Author: Rene Engelhard <rene@debian.org>
Date: Sun Feb 6 17:49:34 2011 +0000
Imported Debian patch 2.7.1-3
---
debian/changelog | 11 +++++++++--
debian/control | 8 +++++---
2 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index fcf8179..bfbdc63 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,15 @@
+hyphen (2.7.1-3) unstable; urgency=low
+
+ * upload to unstable
+ * actually conflict/replarece/provide oo.o-thesaurus-en-us
+ * OpenOffice.org -> OpenOffice.org/LibreOffice
+
+ -- Rene Engelhard <rene@debian.org> Sun, 06 Feb 2011 17:49:34 +0000
+
hyphen (2.7.1-2) experimental; urgency=low
* change Maintainer to Debian LibreOffice Maintainers
- * rename openoffice.org-hyphenation-en-us to hyphen-en-us;
- transitional package
+ * rename openoffnstableice.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 9e26b52..a056a86 100644
--- a/debian/control
+++ b/debian/control
@@ -44,8 +44,10 @@ Section: text
Architecture: all
Depends: dictionaries-common (>= 0.10) | openoffice.org-updatedicts, ${misc:Depends}
Recommends: libreoffice-writer | openoffice.org-writer
-Provides: openoffice.org-hyphenation, openoffice.org-hyphenation-en, hyphen-hyphenation-pattern
-Description: US English hyphenation patterns for OpenOffice.org
+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
- OpenOffice.org
+ LibreOffice/OpenOffice.org
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/hyphen.git
Reply to: