[hyphen] 12/29: Imported Debian patch 2.4-4
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch master
in repository hyphen.
commit f3582352752afe6b5dc0e7bd5805ff974c7b4d86
Author: Rene Engelhard <rene@debian.org>
Date: Sun Oct 19 17:50:52 2008 +0200
Imported Debian patch 2.4-4
---
debian/changelog | 7 +++++++
debian/control | 1 +
debian/patches/01_hyphen_tex_from_TeXLive.dpatch | 2 +-
debian/patches/02_encds_static.dpatch | 3 ++-
4 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 1e10014..7bdc655 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+hyphen (2.4-4) unstable; urgency=high
+
+ * actually add Depends: for -hyphenation-em-us, oops (closes: #502759)
+ * lintian fixes
+
+ -- Rene Engelhard <rene@debian.org> Sun, 19 Oct 2008 17:50:52 +0200
+
hyphen (2.4-3) unstable; urgency=low
* make openoffice.org-hyphenation-en-us provide openoffice.org-hyphenation
diff --git a/debian/control b/debian/control
index 26ed115..290a1e4 100644
--- a/debian/control
+++ b/debian/control
@@ -42,6 +42,7 @@ 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
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/patches/01_hyphen_tex_from_TeXLive.dpatch b/debian/patches/01_hyphen_tex_from_TeXLive.dpatch
index 9181f03..de83823 100644
--- a/debian/patches/01_hyphen_tex_from_TeXLive.dpatch
+++ b/debian/patches/01_hyphen_tex_from_TeXLive.dpatch
@@ -2,7 +2,7 @@
## 01_hyphen_tex_from_TeXLive.dpatch by Rene Engelhard <rene@debian.org>
##
## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
+## DP: hyphen.tex comes from TeXLive so we can use it directly from there
@DPATCH@
diff -urNad hyphen-2.4~/Makefile.am hyphen-2.4/Makefile.am
diff --git a/debian/patches/02_encds_static.dpatch b/debian/patches/02_encds_static.dpatch
index 760fde0..903d4a0 100644
--- a/debian/patches/02_encds_static.dpatch
+++ b/debian/patches/02_encds_static.dpatch
@@ -2,7 +2,8 @@
## 02_encds_static.dpatch by Rene Engelhard <rene@debian.org>
##
## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
+## DP: hyphen and hunspell both have that struct, making it static fixes
+#ä DP: crashes
@DPATCH@
diff -urNad hyphen-2.3.1~/csutil.c hyphen-2.3.1/csutil.c
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/hyphen.git
Reply to: