[hyphen] 13/29: Imported Debian patch 2.4-5
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch master
in repository hyphen.
commit 958184f6ab1a091a65c16230c6c33ce906584243
Author: Rene Engelhard <rene@debian.org>
Date: Wed Aug 12 00:04:26 2009 +0200
Imported Debian patch 2.4-5
---
debian/changelog | 9 +++++++++
debian/control | 3 ++-
debian/libhyphen0.shlibs | 2 +-
debian/openoffice.org-hyphenation-en-us.install | 2 +-
debian/openoffice.org-hyphenation-en-us.links | 1 +
debian/rules | 1 +
6 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 7bdc655..7ed07ad 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+hyphen (2.4-5) unstable; urgency=low
+
+ * move hyph_en-US.dic tto /usr/share/hyphen. Create compat symlink
+ from /usr/share/myspell/dicts to it from the time being.
+ * only recommend openoffice.org (>= 1.0.3) | openoffice.org-writer
+ at openoffice.org-hyphenation-en-us (closes: #503157)
+
+ -- Rene Engelhard <rene@debian.org> Wed, 12 Aug 2009 00:04:26 +0200
+
hyphen (2.4-4) unstable; urgency=high
* actually add Depends: for -hyphenation-em-us, oops (closes: #502759)
diff --git a/debian/control b/debian/control
index 290a1e4..e1703ae 100644
--- a/debian/control
+++ b/debian/control
@@ -42,7 +42,8 @@ Description: ALTLinux hyphenation library - shared library
Package: openoffice.org-hyphenation-en-us
Section: text
Architecture: all
-Depends: dictionaries-common (>= 0.10) | openoffice.org-updatedicts, openoffice.org (>= 1.0.3) | openoffice.org-writer
+Depends: dictionaries-common (>= 0.10) | openoffice.org-updatedicts
+Recommends: openoffice.org (>= 1.0.3) | openoffice.org-writer
Provides: openoffice.org-hyphenation, openoffice.org-hyphenation-en
Description: US English hyphenation patterns for OpenOffice.org
This package contains the English (USA) hyphenation patterns for
diff --git a/debian/libhyphen0.shlibs b/debian/libhyphen0.shlibs
index 6f4bde3..c27b5ea 100644
--- a/debian/libhyphen0.shlibs
+++ b/debian/libhyphen0.shlibs
@@ -1 +1 @@
-libhyphen 0 libhyphen0 (>= 2.4)
+libhyphen 0 libhyphen0 (>= 2.4-5)
diff --git a/debian/openoffice.org-hyphenation-en-us.install b/debian/openoffice.org-hyphenation-en-us.install
index 9c88704..4577574 100644
--- a/debian/openoffice.org-hyphenation-en-us.install
+++ b/debian/openoffice.org-hyphenation-en-us.install
@@ -1 +1 @@
-../../hyph_en_US.dic usr/share/myspell/dicts
+../../hyph_en_US.dic usr/share/hyphen
diff --git a/debian/openoffice.org-hyphenation-en-us.links b/debian/openoffice.org-hyphenation-en-us.links
new file mode 100644
index 0000000..7447701
--- /dev/null
+++ b/debian/openoffice.org-hyphenation-en-us.links
@@ -0,0 +1 @@
+/usr/share/hyphen/hyph_en_US.dic /usr/share/myspell/dicts/hyph_en_US.dic
diff --git a/debian/rules b/debian/rules
index 7ce0e11..ba11c31 100755
--- a/debian/rules
+++ b/debian/rules
@@ -87,6 +87,7 @@ binary-indep: build install
dh_installdocs -i
dh_installexamples -i
dh_installman -i
+ dh_link -i
installdeb-myspell -popenoffice.org-hyphenation-en-us
dh_strip -i
dh_compress -i
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/hyphen.git
Reply to: