[hyphen] 02/09: Imported Upstream version 2.3.1
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch upstream
in repository hyphen.
commit 6977ae54daa95473386572a0805eb54d71b9559f
Author: Rene Engelhard <rene@debian.org>
Date: Thu Apr 21 13:51:48 2016 +0200
Imported Upstream version 2.3.1
---
ChangeLog | 10 ++++++++++
Makefile.am | 6 +++---
Makefile.in | 16 ++++++++--------
NEWS | 2 ++
configure | 2 +-
configure.in | 2 +-
doc/Makefile.in | 4 ++--
hyphen.c | 6 +++---
tests/Makefile.in | 4 ++--
9 files changed, 32 insertions(+), 20 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 42bb4ab..fb9d31c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2008-02-19 Németh László <nemeth at OOo>:
+ * hyphen.c: fix unconditional jump in the obsolete
+ hnj_hyphen_hyphenate() (it was already fixed in the
+ preferred hnj_hyphen_hyphenate2()). Possible fix for the problem
+ reported by Rene Engelhard in SourceForge Bug ID 1896207.
+
+ * Makefile.am: add missing $(srcdir)s for make dist
+
+ * NEWS: add NEWS for autoreconf
+
2007-11-22 Németh László <nemeth at OOo>:
* hyphen.c: fix a bad condition that introduced in the previous version.
Problem reported by Joan Montané under SourceForge Bug ID 1772381.
diff --git a/Makefile.am b/Makefile.am
index e3e2faf..b23769b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -23,11 +23,11 @@ EXTRA_DIST = checkme.lst hyphen.mashed hyphen.tex \
COPYING.MPL COPYING.LGPL
hyphen.us:
- cp -f hyphen.tex hyphen.us
- patch < hyphen.patch
+ cp -f $(srcdir)/hyphen.tex hyphen.us
+ patch < $(srcdir)/hyphen.patch
hyph_en_US.dic: hyphen.us
- perl substrings.pl hyphen.us hyph_en_US.dic ISO8859-1 > /dev/null
+ perl $(srcdir)/substrings.pl hyphen.us hyph_en_US.dic ISO8859-1 > /dev/null
clean-local:
rm -rf hyphen.us hyph_en_US.dic
diff --git a/Makefile.in b/Makefile.in
index d190551..273f4dd 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -43,7 +43,7 @@ host_triplet = @host@
noinst_PROGRAMS = substrings$(EXEEXT) example$(EXEEXT)
DIST_COMMON = README $(am__configure_deps) $(include_HEADERS) \
$(noinst_HEADERS) $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
- $(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL \
+ $(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \
THANKS TODO config.guess config.sub depcomp install-sh \
ltmain.sh missing
subdir = .
@@ -241,15 +241,15 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
- echo ' cd $(srcdir) && $(AUTOMAKE) --foreign '; \
- cd $(srcdir) && $(AUTOMAKE) --foreign \
+ echo ' cd $(srcdir) && $(AUTOMAKE) --gnu '; \
+ cd $(srcdir) && $(AUTOMAKE) --gnu \
&& exit 0; \
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --foreign Makefile
+ $(AUTOMAKE) --gnu Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -794,11 +794,11 @@ uninstall-info: uninstall-info-recursive
hyphen.us:
- cp -f hyphen.tex hyphen.us
- patch < hyphen.patch
+ cp -f $(srcdir)/hyphen.tex hyphen.us
+ patch < $(srcdir)/hyphen.patch
hyph_en_US.dic: hyphen.us
- perl substrings.pl hyphen.us hyph_en_US.dic ISO8859-1 > /dev/null
+ perl $(srcdir)/substrings.pl hyphen.us hyph_en_US.dic ISO8859-1 > /dev/null
clean-local:
rm -rf hyphen.us hyph_en_US.dic
diff --git a/NEWS b/NEWS
new file mode 100644
index 0000000..958d2b8
--- /dev/null
+++ b/NEWS
@@ -0,0 +1,2 @@
+2008-02-19: Hyphen 2.3.1 release:
+ - fix obsolete API function hnj_hyphen_hyphenate()
diff --git a/configure b/configure
index 305ec6b..3c32479 100755
--- a/configure
+++ b/configure
@@ -1801,7 +1801,7 @@ fi
# Define the identity of the package.
PACKAGE=hyphen
- VERSION=2.3
+ VERSION=2.3.1
cat >>confdefs.h <<_ACEOF
diff --git a/configure.in b/configure.in
index 43bf2ae..b882384 100644
--- a/configure.in
+++ b/configure.in
@@ -1,5 +1,5 @@
AC_INIT(hyphen.c)
-AM_INIT_AUTOMAKE(hyphen,2.3)
+AM_INIT_AUTOMAKE(hyphen,2.3.1)
AC_PROG_CC
AC_PROG_INSTALL
AC_PROG_LIBTOOL
diff --git a/doc/Makefile.in b/doc/Makefile.in
index 5816893..ccdb702 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -156,9 +156,9 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --foreign doc/Makefile
+ $(AUTOMAKE) --gnu doc/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
diff --git a/hyphen.c b/hyphen.c
index 2eb18c1..00b9971 100644
--- a/hyphen.c
+++ b/hyphen.c
@@ -466,13 +466,13 @@ int hnj_hyphen_hyphenate (HyphenDict *dict,
for (i = 0; i < word_size; i++)
prep_word[j++] = word[i];
+
+ prep_word[j++] = '.';
+ prep_word[j] = '\0';
for (i = 0; i < j; i++)
hyphens[i] = '0';
- prep_word[j++] = '.';
-
- prep_word[j] = '\0';
#ifdef VERBOSE
printf ("prep_word = %s\n", prep_word);
#endif
diff --git a/tests/Makefile.in b/tests/Makefile.in
index ae3e269..7021ee7 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -216,9 +216,9 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign tests/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu tests/Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --foreign tests/Makefile
+ $(AUTOMAKE) --gnu tests/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/hyphen.git
Reply to: