[hyphen] 09/29: Imported Debian patch 2.4-1
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch master
in repository hyphen.
commit a5d4ec37df25c7ebe1d4f4af893f0bd81dfcec4a
Merge: 259d8f4 ce8c916
Author: Rene Engelhard <rene@debian.org>
Date: Wed May 7 20:37:30 2008 +0200
Imported Debian patch 2.4-1
AUTHORS | 5 +-
ChangeLog | 75 +-
Makefile.am | 26 +-
Makefile.in | 34 +-
NEWS | 34 +
README | 94 +-
README.compound | 57 +
README.nonstandard | 9 +-
TODO | 5 +-
configure | 102 +-
configure.in | 4 +-
debian/changelog | 8 +
debian/libhyphen0.shlibs | 1 +
debian/patches/01_hyphen_tex_from_TeXLive.dpatch | 26 +-
example.c | 16 +-
hyph_en_US.dic | 9784 ++++++++++++++++++++++
hyphen.c | 335 +-
hyphen.h | 27 +-
hyphen.mashed | 5536 ------------
substrings.pl | 6 +-
tbhyphext.sh | 7 +
tbhyphext.tex | 1047 +++
tests/Makefile.am | 44 +-
tests/Makefile.in | 44 +-
tests/alt.pat | 2 +-
tests/alt2.pat | 2 +
tests/alt3.pat | 3 +
tests/alt4.pat | 4 +-
tests/base.hyph | 1426 ++--
tests/base.pat | 2 +
tests/compound.hyph | 1 +
tests/compound.pat | 11 +
tests/compound.test | 4 +
tests/compound.word | 1 +
tests/compound2.hyph | 2 +
tests/compound2.pat | 8 +
tests/compound2.test | 4 +
tests/compound2.word | 2 +
tests/compound3.hyph | 1 +
tests/compound3.pat | 11 +
tests/compound3.test | 4 +
tests/compound3.word | 1 +
tests/compound4.hyph | 1 +
tests/compound4.pat | 11 +
tests/compound4.test | 4 +
tests/compound4.word | 1 +
tests/conv.pat | 3 +
tests/settings.hyph | 2 +
tests/settings.pat | 5 +
tests/settings.test | 4 +
tests/settings.word | 2 +
tests/settings2.hyph | 1 +
tests/settings2.pat | 4 +
tests/settings2.test | 4 +
tests/settings2.word | 1 +
tests/settings3.hyph | 1 +
tests/settings3.pat | 4 +
tests/settings3.test | 4 +
tests/settings3.word | 1 +
tests/settings4.hyph | 1 +
tests/settings4.pat | 4 +
tests/settings4.test | 4 +
tests/settings4.word | 1 +
tests/test.sh | 56 +-
64 files changed, 12491 insertions(+), 6443 deletions(-)
diff --cc debian/changelog
index 23f330f,0000000..d99755a
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,58 -1,0 +1,66 @@@
++hyphen (2.4-1) experimental; urgency=low
++
++ * New upstream release
++ * upload to experimental first because we would cause openoffice.org to
++ FTBFS without a change there.
++
++ -- Rene Engelhard <rene@debian.org> Wed, 07 May 2008 20:37:30 +0200
++
+hyphen (2.3.1-3) unstable; urgency=low
+
+ * make encds[] struct static. According to #debian-devel it should
+ suffice to make it here for now until the next OOo upload which will also
+ do it (closes: #474581)
+
+ -- Rene Engelhard <rene@debian.org> Sun, 06 Apr 2008 23:44:05 +0200
+
+hyphen (2.3.1-2) unstable; urgency=low
+
+ * fix typo in openoffice.org-hyphenation-en-us' description
+ (closes: #470610)
+
+ -- Rene Engelhard <rene@debian.org> Wed, 12 Mar 2008 14:18:53 +0100
+
+hyphen (2.3.1-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Rene Engelhard <rene@debian.org> Tue, 19 Feb 2008 12:02:58 +0100
+
+hyphen (2.3-5) unstable; urgency=low
+
+ * run make check
+
+ -- Rene Engelhard <rene@debian.org> Mon, 03 Dec 2007 18:19:45 +0100
+
+hyphen (2.3-4) unstable; urgency=low
+
+ * OOo is the only user of this (yet), so it probably should be maintained
+ by debian-openoffice@l.d.o...
+
+ -- Rene Engelhard <rene@debian.org> Fri, 30 Nov 2007 14:16:23 +0100
+
+hyphen (2.3-3) unstable; urgency=low
+
+ * also add -lhnj compatibility links. Make libhnj_pic.a point to
+ libhyphen.so. Needed to not break OOo builds until OOo hasn't
+ -lhnj/-lhnj_pic in their makefiles anymore and to make it a real
+ drop-in replacement for libaltlinuxhyph-dev (which libhyphen-dev
+ conflicts/provides/replaces). Conflict against libhnj-dev
+
+ -- Rene Engelhard <rene@debian.org> Fri, 30 Nov 2007 13:35:13 +0100
+
+hyphen (2.3-2) unstable; urgency=low
+
+ * fix hyph_en_US.dics installation...
+ * fix typo in debian/copyright
+
+ -- Rene Engelhard <rene@debian.org> Mon, 26 Nov 2007 01:08:53 +0100
+
+hyphen (2.3-1) unstable; urgency=low
+
+ * Initial release
+ * use hyphen.tex directly from texlive-base and build
+ openoffice.org-hyphenation-en-us from here (closes: #342710)
+
+ -- Rene Engelhard <rene@debian.org> Sun, 25 Nov 2007 23:55:16 +0100
diff --cc debian/libhyphen0.shlibs
index 0000000,0000000..6f4bde3
new file mode 100644
--- /dev/null
+++ b/debian/libhyphen0.shlibs
@@@ -1,0 -1,0 +1,1 @@@
++libhyphen 0 libhyphen0 (>= 2.4)
diff --cc debian/patches/01_hyphen_tex_from_TeXLive.dpatch
index 8ba62ff,0000000..9181f03
mode 100644,000000..100644
--- a/debian/patches/01_hyphen_tex_from_TeXLive.dpatch
+++ b/debian/patches/01_hyphen_tex_from_TeXLive.dpatch
@@@ -1,31 -1,0 +1,31 @@@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 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.
+
+@DPATCH@
- diff -urNad hyphen-2.3~/Makefile.am hyphen-2.3/Makefile.am
- --- hyphen-2.3~/Makefile.am 2007-11-26 00:08:52.000000000 +0100
- +++ hyphen-2.3/Makefile.am 2007-11-26 00:09:02.000000000 +0100
++diff -urNad hyphen-2.4~/Makefile.am hyphen-2.4/Makefile.am
++--- hyphen-2.4~/Makefile.am 2008-05-07 20:45:18.000000000 +0200
+++++ hyphen-2.4/Makefile.am 2008-05-07 20:46:42.000000000 +0200
+@@ -23,7 +23,7 @@
- COPYING.MPL COPYING.LGPL
++ COPYING.MPL COPYING.LGPL hyph_en_US.dic
+
- hyphen.us:
++ hyphen.us3:
+- cp -f $(srcdir)/hyphen.tex hyphen.us
++ cp -f /usr/share/texmf-texlive/tex/generic/hyphen/hyphen.tex hyphen.us
+ patch < $(srcdir)/hyphen.patch
-
- hyph_en_US.dic: hyphen.us
- diff -urNad hyphen-2.3~/Makefile.in hyphen-2.3/Makefile.in
- --- hyphen-2.3~/Makefile.in 2007-11-26 00:08:44.000000000 +0100
- +++ hyphen-2.3/Makefile.in 2007-11-26 00:09:21.000000000 +0100
++ $(srcdir)/tbhyphext.sh <$(srcdir)/tbhyphext.tex >hyphen.us2
++ cat hyphen.us hyphen.us2 >hyphen.us3
++diff -urNad hyphen-2.4~/Makefile.in hyphen-2.4/Makefile.in
++--- hyphen-2.4~/Makefile.in 2008-05-07 20:45:18.000000000 +0200
+++++ hyphen-2.4/Makefile.in 2008-05-07 20:46:26.000000000 +0200
+@@ -794,7 +794,7 @@
+
+
- hyphen.us:
++ hyphen.us3:
+- cp -f $(srcdir)/hyphen.tex hyphen.us
++ cp -f /usr/share/texmf-texlive/tex/generic/hyphen/hyphen.tex hyphen.us
+ patch < $(srcdir)/hyphen.patch
-
- hyph_en_US.dic: hyphen.us
++ $(srcdir)/tbhyphext.sh <$(srcdir)/tbhyphext.tex >hyphen.us2
++ cat hyphen.us hyphen.us2 >hyphen.us3
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/hyphen.git
Reply to: