[hyphen] 28/29: Imported Debian patch 2.8.8-1
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch master
in repository hyphen.
commit 14d52329113c81963119b3fc00450f46a1e8068d
Merge: a405034 4b5d0c8
Author: Rene Engelhard <rene@debian.org>
Date: Thu Sep 18 21:40:22 2014 +0200
Imported Debian patch 2.8.8-1
ChangeLog | 7 +
NEWS | 3 +
config.guess | 313 ++++++++++++++++-------
config.sub | 52 ++--
configure | 20 +-
configure.in | 4 +-
debian/changelog | 10 +
debian/control | 2 +-
debian/patches/01_hyphen_tex_from_TeXLive | 11 +
debian/patches/01_hyphen_tex_from_TeXLive.dpatch | 31 ---
debian/patches/02_fix_hyphen_h_for_FILE.dpatch | 29 ---
debian/patches/{00list => series} | 1 -
debian/rules | 6 +-
debian/source/format | 1 +
hyphen.h | 2 +
substrings.c | 2 +-
16 files changed, 288 insertions(+), 206 deletions(-)
diff --cc debian/changelog
index b335613,0000000..0dd1ee5
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,192 -1,0 +1,202 @@@
++hyphen (2.8.8-1) unstable; urgency=low
++
++ * New upstream release
++
++ * fix second build in a row by removing Makefile.in hunk from patch.
++ regen'ed anyway using dh-autoreconf
++ * move from dpatch to 3.0 (quilt)
++
++ -- Rene Engelhard <rene@debian.org> Thu, 18 Sep 2014 21:40:22 +0200
++
+hyphen (2.8.7-3) unstable; urgency=low
+
+ * use dh-autoreconf (closes: #753526)
+
+ -- Rene Engelhard <rene@debian.org> Tue, 08 Jul 2014 19:26:27 +0200
+
+hyphen (2.8.7-2) unstable; urgency=low
+
+ * make hyphen.h #include <stdio.h> so that FILE* is defined..
+
+ * fix .symbols
+
+ -- Rene Engelhard <rene@debian.org> Sat, 28 Jun 2014 12:24:46 +0200
+
+hyphen (2.8.7-1) unstable; urgency=low
+
+ * New upstream release
+
+ * bump .shlibs; add .symbols
+
+ -- Rene Engelhard <rene@debian.org> Fri, 27 Jun 2014 12:01:15 +0000
+
+hyphen (2.8.6-3) unstable; urgency=low
+
+ * the path of hyphen.tex changed again... (closes: #712244)
+
+ -- Rene Engelhard <rene@debian.org> Sat, 15 Jun 2013 15:10:01 +0200
+
+hyphen (2.8.6-2) unstable; urgency=low
+
+ * upload to unstable
+
+ -- Rene Engelhard <rene@debian.org> Fri, 19 Apr 2013 12:44:40 +0000
+
+hyphen (2.8.6-1) experimental; urgency=low
+
+ * New upstream release
+
+ -- Rene Engelhard <rene@debian.org> Fri, 19 Apr 2013 12:35:07 +0000
+
+hyphen (2.8.3-2) unstable; urgency=low
+
+ * update hyphen.tex path in debian/patches/01_hyphen_tex_from_TeXLive.dpatch
+ ad the path changed... (closes: #669538)
+
+ -- Rene Engelhard <rene@debian.org> Thu, 19 Apr 2012 23:56:12 +0200
+
+hyphen (2.8.3-1) unstable; urgency=low
+
+ * New upstream release
+ * get rid of installdeb-myspell call
+
+ -- Rene Engelhard <rene@debian.org> Mon, 17 Oct 2011 13:52:44 +0000
+
+hyphen (2.7.1-4) unstable; urgency=low
+
+ * remove conflicts against oo.o-thesaurus-en-us again, we now have
+ a transitional package for it
+
+ -- Rene Engelhard <rene@debian.org> Fri, 11 Mar 2011 10:40:12 +0100
+
+hyphen (2.7.1-3) unstable; urgency=low
+
+ * upload to unstable
+ * actually conflict/replarece/provide oo.o-thesaurus-en-us
+ * OpenOffice.org -> OpenOffice.org/LibreOffice
+
+ -- Rene Engelhard <rene@debian.org> Sun, 06 Feb 2011 17:49:34 +0000
+
+hyphen (2.7.1-2) experimental; urgency=low
+
+ * change Maintainer to Debian LibreOffice Maintainers
+ * rename openoffice.org-hyphenation-en-us to hyphen-en-us
+ * provide hyphen-hyphenation-pattern
+ * add ${misc:Depends}
+ * recommend libreoffice-writer | openoffice.org-writer for hyphen-en-us
+
+ -- Rene Engelhard <rene@debian.org> Wed, 19 Jan 2011 22:36:51 +0100
+
+hyphen (2.7.1-1) experimental; urgency=low
+
+ * New upstream release
+
+ -- Rene Engelhard <rene@debian.org> Sat, 01 Jan 2011 16:13:37 +0100
+
+hyphen (2.5-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Rene Engelhard <rene@debian.org> Tue, 23 Feb 2010 21:39:08 +0100
+
+hyphen (2.4-6) unstable; urgency=low
+
+ * remove bogus .shlibs bump..
+
+ -- Rene Engelhard <rene@debian.org> Wed, 12 Aug 2009 19:40:18 +0200
+
+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)
+ * 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
+ (closes: #500868)
+
+ -- Rene Engelhard <rene@debian.org> Thu, 02 Oct 2008 11:27:59 +0200
+
+hyphen (2.4-2) unstable; urgency=medium
+
+ * upload to unstable
+
+ -- Rene Engelhard <rene@debian.org> Mon, 26 May 2008 17:19:13 +0200
+
+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/control
index 6f349b4,0000000..f16cb78
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,52 -1,0 +1,52 @@@
+Source: hyphen
+Priority: optional
+Maintainer: Debian LibreOffice Maintainers <debian-openoffice@lists.debian.org>
+Uploaders: Rene Engelhard <rene@debian.org>
- Build-Depends: debhelper (>= 5), dh-autoreconf, texlive-base (>= 2013~), dpatch, gawk
++Build-Depends: debhelper (>= 5), dh-autoreconf, texlive-base (>= 2013~), gawk
+Build-Depends-Indep: dictionaries-common-dev
+Standards-Version: 3.7.2
+Section: libs
+
+Package: libhyphen-dev
+Section: libdevel
+Architecture: any
+Depends: libhyphen0 (= ${binary:Version}), ${misc:Depends}
+Conflicts: libaltlinuxhyph-dev, libhnj-dev
+Provides: libaltlinuxhyph-dev
+Replaces: libaltlinuxhyph-dev
+Description: ALTLinux hyphenation library - development files
+ ALTLinuxhyph is a modified version of libhnj which is a high quality
+ hyphenation and justification library based on the TeX
+ hyphenation algorithm. The TeX hyphenation patterns could be used after
+ a preprocessing step.
+ .
+ It is used in OpenOffice.org
+ .
+ This package contains the headers and necessary files for programming apps
+ with ALTLinuxhyph.
+
+Package: libhyphen0
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: ALTLinux hyphenation library - shared library
+ ALTLinuxhyph is a modified version of libhnj which is a high quality
+ hyphenation and justification library based on the TeX
+ hyphenation algorithm. The TeX hyphenation patterns could be used after
+ a preprocessing step.
+ .
+ It is used in OpenOffice.org
+ .
+ This package contains the shared library.
+
+Package: hyphen-en-us
+Section: text
+Architecture: all
+Depends: dictionaries-common (>= 0.10) | openoffice.org-updatedicts, ${misc:Depends}
+Recommends: libreoffice-writer | openoffice.org-writer
+Provides: openoffice.org-hyphenation, openoffice.org-hyphenation-en, openoffice.org-hyphenation-en-us, hyphen-hyphenation-pattern
+Replaces: openoffice.org-hyphenation-en-us
+Description: US English hyphenation patterns for LibreOffice/OpenOffice.org
+ This package contains the English (USA) hyphenation patterns for
+ LibreOffice/OpenOffice.org
+
diff --cc debian/patches/01_hyphen_tex_from_TeXLive
index 0000000,0000000..55d8a0a
new file mode 100755
--- /dev/null
+++ b/debian/patches/01_hyphen_tex_from_TeXLive
@@@ -1,0 -1,0 +1,11 @@@
++--- a/Makefile.am 2014-09-18 20:21:01.737896218 +0200
+++++ b/Makefile.am 2014-09-18 20:21:10.601895957 +0200
++@@ -24,7 +24,7 @@
++ ligpatch.txt
++
++ hyphen.us3:
++- cp -f $(srcdir)/hyphen.tex hyphen.us
+++ cp -f /usr/share/texlive/texmf-dist/tex/generic/hyphen/hyphen.tex hyphen.us
++ patch < $(srcdir)/hyphen.patch
++ $(srcdir)/tbhyphext.sh <$(srcdir)/tbhyphext.tex >hyphen.us2
++ cat hyphen.us hyphen.us2 | $(AWK) -f $(srcdir)/lig.awk >hyphen.us3
diff --cc debian/patches/series
index f244c46,0000000..ef553c8
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,2 -1,0 +1,1 @@@
+01_hyphen_tex_from_TeXLive
- 02_fix_hyphen_h_for_FILE
diff --cc debian/rules
index 886628f,0000000..7331700
mode 100755,000000..100755
--- a/debian/rules
+++ b/debian/rules
@@@ -1,118 -1,0 +1,116 @@@
+#!/usr/bin/make -f
+# -*- makefile -*-
+# Sample debian/rules that uses debhelper.
+# This file was originally written by Joey Hess and Craig Small.
+# As a special exception, when this file is copied by dh-make into a
+# dh-make output file, you may use that output file without restriction.
+# This special exception was added by Craig Small in version 0.37 of dh-make.
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+
+# These are used for cross-compiling and for saving the configure script
+# from having to guess our platform (since we know it already)
+DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+
- include /usr/share/dpatch/dpatch.make
-
+# shared library versions, option 1
+version=2.0.5
+major=2
+# option 2, assuming the library is created as src/.libs/libfoo.so.2.0.5 or so
+#version=`ls src/.libs/lib*.so.* | \
+# awk '{if (match($$0,/[0-9]+\.[0-9]+\.[0-9]+$$/)) print substr($$0,RSTART)}'`
+#major=`ls src/.libs/lib*.so.* | \
+# awk '{if (match($$0,/\.so\.[0-9]+$$/)) print substr($$0,RSTART+4)}'`
+
- config.status: patch-stamp configure
++config.status:
+ dh_testdir
+ # Add here commands to configure the package.
+ dh_autoreconf
+ ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs" AWK=gawk
+
+
+build: build-stamp
+build-stamp: config.status
+ dh_testdir
+
+ $(MAKE)
+ $(MAKE) check
+
+ touch $@
+
- clean: unpatch
++clean:
+ dh_testdir
+ dh_testroot
+ rm -f build-stamp
+
+ # Add here commands to clean up after the build process.
+ [ ! -f Makefile ] || $(MAKE) distclean
+
+ dh_autoreconf_clean
+ dh_clean
+
+install: build
+ dh_testdir
+ dh_testroot
+ dh_clean -k
+ dh_installdirs
+
+ $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
+ dh_install --sourcedir=debian/tmp
+
+ # compatibility for stuff expecting the old libaltlinuxhyph-dev
+ # and -lhyph. should go away sometime
+ ln -s /usr/lib/libhyphen.a \
+ debian/libhyphen-dev/usr/lib/libhyph.a
+ ln -s /usr/lib/libhyphen.so \
+ debian/libhyphen-dev/usr/lib/libhyph.so
+ ln -s /usr/lib/libhyphen.a \
+ debian/libhyphen-dev/usr/lib/libhnj.a
+ ln -s /usr/lib/libhyphen.so \
+ debian/libhyphen-dev/usr/lib/libhnj.so
+ ln -s /usr/lib/libhyphen.so \
+ debian/libhyphen-dev/usr/lib/libhnj_pic.a
+
+binary-indep: build install
+ dh_testdir
+ dh_testroot
+ dh_installchangelogs -i ChangeLog
+ dh_installdocs -i
+ dh_installexamples -i
+ dh_installman -i
+ dh_link -i
+ dh_strip -i
+ dh_compress -i
+ dh_fixperms -i
+ dh_perl -i
+ dh_makeshlibs -i
+ dh_installdeb -i
+ dh_shlibdeps -i
+ dh_gencontrol -i
+ dh_md5sums -i
+ dh_builddeb -i
+
+binary-arch: build install
+ dh_testdir
+ dh_testroot
+ dh_installchangelogs -a ChangeLog
+ dh_installdocs -a -Nlibhyphen-dev
+ dh_installdocs -plibhyphen-dev doc/tb87nemeth.pdf
+ dh_installexamples -a
+ dh_installman -a
+ dh_link -a
+ dh_strip -a
+ dh_compress -a
+ dh_fixperms -a
+ dh_perl -a
+ dh_makeshlibs -a
+ dh_installdeb -a
+ dh_shlibdeps -a
+ dh_gencontrol -a
+ dh_md5sums -a
+ dh_builddeb -a
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install
diff --cc debian/source/format
index 0000000,0000000..163aaf8
new file mode 100644
--- /dev/null
+++ b/debian/source/format
@@@ -1,0 -1,0 +1,1 @@@
++3.0 (quilt)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/hyphen.git
Reply to: