[hyphen] 06/29: Imported Debian patch 2.3.1-1
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch master
in repository hyphen.
commit 91abb5d24058fcc748bc656ac163ffa7d57e81d7
Merge: 64b73aa 6977ae5
Author: Rene Engelhard <rene@debian.org>
Date: Tue Feb 19 12:02:58 2008 +0100
Imported Debian patch 2.3.1-1
ChangeLog | 10 ++++++++++
Makefile.am | 6 +++---
Makefile.in | 16 ++++++++--------
NEWS | 2 ++
configure | 2 +-
configure.in | 2 +-
debian/changelog | 6 ++++++
debian/patches/01_hyphen_tex_from_TeXLive.dpatch | 8 ++++----
doc/Makefile.in | 4 ++--
hyphen.c | 6 +++---
tests/Makefile.in | 4 ++--
11 files changed, 42 insertions(+), 24 deletions(-)
diff --cc debian/changelog
index 3d0a5a3,0000000..2cb4969
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,37 -1,0 +1,43 @@@
++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/patches/01_hyphen_tex_from_TeXLive.dpatch
index 1170bf8,0000000..8ba62ff
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
+@@ -23,7 +23,7 @@
+ COPYING.MPL COPYING.LGPL
+
+ hyphen.us:
- - cp -f hyphen.tex hyphen.us
++- cp -f $(srcdir)/hyphen.tex hyphen.us
++ cp -f /usr/share/texmf-texlive/tex/generic/hyphen/hyphen.tex hyphen.us
- patch < hyphen.patch
++ 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
+@@ -794,7 +794,7 @@
+
+
+ hyphen.us:
- - cp -f hyphen.tex hyphen.us
++- cp -f $(srcdir)/hyphen.tex hyphen.us
++ cp -f /usr/share/texmf-texlive/tex/generic/hyphen/hyphen.tex hyphen.us
- patch < hyphen.patch
++ patch < $(srcdir)/hyphen.patch
+
+ hyph_en_US.dic: hyphen.us
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/hyphen.git
Reply to: