This is an automated email from the git hooks/post-receive script. rene pushed a commit to branch master in repository hunspell.
commit bd5e90cdbff7eadf90bfb20997325df69a1a9d7e Author: Rene Engelhard <[email protected]> Date: Wed Mar 9 17:03:11 2016 +0000 Imported Debian patch 1.3.3-4 --- debian/changelog | 15 +++++++++++ debian/control | 39 +++++------------------------ debian/patches/avoid-grep-binary-match.diff | 16 ++++++++++++ debian/patches/series | 1 + debian/rules | 24 +++++++++--------- 5 files changed, 50 insertions(+), 45 deletions(-) diff --git a/debian/changelog b/debian/changelog index 47d13df..62a30e4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,18 @@ +hunspell (1.3.3-4) unstable; urgency=medium + + * apply patch from Raúl Benencia: Fix FTBFS caused by new binary + matching behavior on grep, thanks (Closes: #814968) + + * s/character/characters/ (closes: #811221) + * apply patch from Matthias Klose: + - Bump the standards version. + - Build using dpkg-buildflags. Closes: #780626. + - Enable parallel builds. + (closes: #798614) + * migrate from -dbg to -dbgsym + + -- Rene Engelhard <[email protected]> Wed, 09 Mar 2016 17:03:11 +0000 + hunspell (1.3.3-3) unstable; urgency=medium * debian/patches/bug185.diff: backport patch from upstream bug 185 diff --git a/debian/control b/debian/control index f672e68..e77799e 100644 --- a/debian/control +++ b/debian/control @@ -3,9 +3,9 @@ Priority: optional Maintainer: Debian LibreOffice Maintainers <[email protected]> Uploaders: Rene Engelhard <[email protected]>, Chris Halls <[email protected]>, Tim Retout <[email protected]> -Build-Depends: debhelper (>= 8.1.3), libreadline-dev, libncurses5-dev, +Build-Depends: debhelper (>= 9.20151219), libreadline-dev, libncurses5-dev, libncursesw5-dev, dh-autoreconf -Standards-Version: 3.6.2 +Standards-Version: 3.9.6 Section: text Homepage: http://hunspell.sourceforge.net/ @@ -24,7 +24,7 @@ Description: spell checker and morphological analyzer (development) OpenOffice.org UNO module. . Main features: - - Unicode support (first 65535 Unicode character) + - Unicode support (first 65535 Unicode characters) - morphological analysis (in custom item and arrangement style) - Max. 65535 affix classes and twofold affix stripping (for agglutinative languages, like Azeri, Basque, Estonian, Finnish, Hungarian, Turkish, etc.) @@ -52,7 +52,7 @@ Description: spell checker and morphological analyzer (shared library) OpenOffice.org UNO module. . Main features: - - Unicode support (first 65535 Unicode character) + - Unicode support (first 65535 Unicode characters) - morphological analysis (in custom item and arrangement style) - Max. 65535 affix classes and twofold affix stripping (for agglutinative languages, like Azeri, Basque, Estonian, Finnish, Hungarian, Turkish, etc.) @@ -64,33 +64,6 @@ Description: spell checker and morphological analyzer (shared library) . This package contains the shared library. -Package: libhunspell-1.3-0-dbg -Priority: extra -Section: debug -Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends} -Recommends: hunspell-en-us | hunspell-dictionary | myspell-dictionary -Conflicts: openoffice.org-core (= 2.2.0~rc2-1) -Description: spell checker and morphological analyzer (debug symbols) - Hunspell is a spell checker and morphological analyzer library and program - designed for languages with rich morphology and complex word compounding or - character encoding. It is based on MySpell and features an Ispell-like - terminal interface using Curses library, an Ispell pipe interface and an - OpenOffice.org UNO module. - . - Main features: - - Unicode support (first 65535 Unicode character) - - morphological analysis (in custom item and arrangement style) - - Max. 65535 affix classes and twofold affix stripping (for agglutinative - languages, like Azeri, Basque, Estonian, Finnish, Hungarian, Turkish, etc.) - - Support complex compoundings (for example, Hungarian and German) - - Support language specific algorithms (for example, handling Azeri - and Turkish dotted i, or German sharp s) - - Handling conditional affixes, circumfixes, fogemorphemes, - forbidden words, pseudoroots and homonyms. - . - This package contains the debug symbols for libhunspell - Package: hunspell Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, hunspell-en-us | hunspell-dictionary | myspell-dictionary @@ -104,7 +77,7 @@ Description: spell checker and morphological analyzer (program) OpenOffice.org UNO module. . Main features: - - Unicode support (first 65535 Unicode character) + - Unicode support (first 65535 Unicode characters) - morphological analysis (in custom item and arrangement style) - Max. 65535 affix classes and twofold affix stripping (for agglutinative languages, like Azeri, Basque, Estonian, Finnish, Hungarian, Turkish, etc.) @@ -131,7 +104,7 @@ Description: tools for hunspell OpenOffice.org UNO module. . Main features: - - Unicode support (first 65535 Unicode character) + - Unicode support (first 65535 Unicode characters) - morphological analysis (in custom item and arrangement style) - Max. 65535 affix classes and twofold affix stripping (for agglutinative languages, like Azeri, Basque, Estonian, Finnish, Hungarian, Turkish, etc.) diff --git a/debian/patches/avoid-grep-binary-match.diff b/debian/patches/avoid-grep-binary-match.diff new file mode 100644 index 0000000..7f9dbac --- /dev/null +++ b/debian/patches/avoid-grep-binary-match.diff @@ -0,0 +1,16 @@ +Description: Fix FTBFS due new grep binary matching behavior +Author: Raúl Benencia <[email protected]> +Bug-Debian: https://bugs.debian.org/814968 +Index: hunspell-1.3.3/tests/test.sh +=================================================================== +--- hunspell-1.3.3.orig/tests/test.sh 2016-03-09 07:39:34.759672607 -0800 ++++ hunspell-1.3.3/tests/test.sh 2016-03-09 07:41:58.662645078 -0800 +@@ -96,7 +96,7 @@ + + # Tests suggestions + if test -f $TESTDIR/$NAME.sug; then +- hunspell $* -a -d $TESTDIR/$NAME <$TESTDIR/$NAME.wrong | grep '^&' | \ ++ hunspell $* -a -d $TESTDIR/$NAME <$TESTDIR/$NAME.wrong | grep -a '^&' | \ + sed 's/^[^:]*: //' >$TEMPDIR/$NAME.sug + if ! cmp $TEMPDIR/$NAME.sug $TESTDIR/$NAME.sug >/dev/null; then + echo "=============================================" diff --git a/debian/patches/series b/debian/patches/series index 2d1bed4..b6107eb 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -2,3 +2,4 @@ aspell_conv debian-changes-1.2.4-2 bug185.diff dont-translate-init-string.diff +avoid-grep-binary-match.diff diff --git a/debian/rules b/debian/rules index cf96bf2..433121c 100755 --- a/debian/rules +++ b/debian/rules @@ -18,12 +18,9 @@ DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) libdir = /usr/lib/$(DEB_HOST_MULTIARCH) -CFLAGS = -Wall -g - -ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) - CFLAGS += -O0 -else - CFLAGS += -O2 +COMMA = , +ifneq (,$(filter parallel=%,$(subst $(COMMA), ,$(DEB_BUILD_OPTIONS)))) + NJOBS := -j $(subst parallel=,,$(filter parallel=%,$(subst $(COMMA), ,$(DEB_BUILD_OPTIONS)))) endif # shared library versions, option 1 @@ -35,17 +32,20 @@ major=2 #major=`ls src/.libs/lib*.so.* | \ # awk '{if (match($$0,/\.so\.[0-9]+$$/)) print substr($$0,RSTART+4)}'` -config.status: configure.ac +configure-stamp: dh_testdir dh_autoreconf - CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info \ + $(shell DEB_CFLAGS_MAINT_APPEND=-Wall dpkg-buildflags --export=cmdline) \ + ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \ + --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info \ --with-ui --with-readline --disable-rpath --libdir=$(libdir) + touch configure-stamp build: build-stamp -build-stamp: config.status +build-stamp: configure-stamp dh_testdir - $(MAKE) + $(MAKE) $(NJOBS) ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS))) $(MAKE) check endif @@ -57,7 +57,7 @@ endif clean: dh_testdir dh_testroot - rm -f build-stamp + rm -f build-stamp configure-stamp [ ! -f Makefile ] || $(MAKE) distclean rm -f debian/ispellaff2myspell.1 @@ -88,7 +88,7 @@ binary-arch: build install dh_installman ln -s libhunspell-1.3.a debian/libhunspell-dev/$(libdir)/libhunspell.a ln -s libhunspell-1.3.so debian/libhunspell-dev/$(libdir)/libhunspell.so - dh_strip --dbg-package=libhunspell-1.3-0-dbg + dh_strip --ddeb-migration=libhunspell-1.3-0-dbg dh_compress dh_fixperms dh_makeshlibs -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/hunspell.git
