This is an automated email from the git hooks/post-receive script. rene pushed a commit to branch master in repository hunspell.
commit 430a75f0e5dc420976e72149b2cd803e4c6d24db Author: Rene Engelhard <[email protected]> Date: Mon Mar 10 11:08:03 2014 +0100 Imported Debian patch 1.3.2-7 --- debian/changelog | 10 ++++++ debian/control | 2 +- debian/copyright | 2 +- debian/patches/00list | 3 -- debian/patches/99_build_stuff.dpatch | 40 ---------------------- .../patches/{14_aspell_conv.dpatch => aspell_conv} | 13 ++----- .../{16_1.2.4-2.dpatch => debian-changes-1.2.4-2} | 11 ------ debian/patches/series | 2 ++ debian/rules | 8 ++--- debian/source/format | 1 + 10 files changed, 21 insertions(+), 71 deletions(-) diff --git a/debian/changelog b/debian/changelog index ca2a6de..82550bb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +hunspell (1.3.2-7) unstable; urgency=medium + + * migrate from dpatch to 3.0 (quilt) + * remove unused 99_build_stuff.dpatch (closes: #724391) + * fix character errors in upstream's full name, thanks Luca Capello + (closes: #659278) + * Honour DEB_BUILD_OPTIONS=nocheck (closes: #695146= + + -- Rene Engelhard <[email protected]> Mon, 10 Mar 2014 11:08:03 +0100 + hunspell (1.3.2-6) unstable; urgency=low * apply new upstream version of ispellaff2myspell from Agustin Martin diff --git a/debian/control b/debian/control index 8085b0e..5769b82 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ 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, - libncursesw5-dev, dpatch, autotools-dev, autoconf, libtool, automake1.9 + libncursesw5-dev, autotools-dev Standards-Version: 3.6.2 Section: text Homepage: http://hunspell.sourceforge.net/ diff --git a/debian/copyright b/debian/copyright index 620cf5f..3507a57 100644 --- a/debian/copyright +++ b/debian/copyright @@ -3,7 +3,7 @@ Tue, 26 Jul 2005 12:11:52 +0200. It was downloaded from http://hunspell.sf.net -Copyright Holder: L�zl�N�eth <[email protected]> +Copyright Holder: László Németh <[email protected]> License: diff --git a/debian/patches/00list b/debian/patches/00list deleted file mode 100644 index 6d7ea0e..0000000 --- a/debian/patches/00list +++ /dev/null @@ -1,3 +0,0 @@ -14_aspell_conv -16_1.2.4-2 -#99_build_stuff diff --git a/debian/patches/99_build_stuff.dpatch b/debian/patches/99_build_stuff.dpatch deleted file mode 100644 index e265b03..0000000 --- a/debian/patches/99_build_stuff.dpatch +++ /dev/null @@ -1,40 +0,0 @@ -#!/bin/sh -##! /bin/sh /usr/share/dpatch/dpatch-run -## 99-unnamed.dpatch by <[email protected]> -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: build stuff - -case "$1" in - -patch) - for i in configure config.guess config.sub \ - INSTALL depcomp install-sh missing \ - mkinstalldirs config.h.in ltmain.sh \ - aclocal.m4; do - cp -a $i $i.bak.dpatch; - done - for i in `find . -name Makefile.in`; do - cp -a $i $i.bak.dpatch; - done - libtoolize --force --copy - aclocal-1.9 -I m4 - cp -a /usr/share/misc/config.sub config.sub - cp -a /usr/share/misc/config.guess config.guess - autoconf - automake-1.9 --gnu --copy --force-missing --add-missing - rm -rf autom4te.cache - ;; - -unpatch) - for i in configure config.guess config.sub \ - INSTALL depcomp install-sh missing \ - mkinstalldirs config.h.in ltmain.sh \ - aclocal.m4; do - mv $i.bak.dpatch $i; - done - for i in `find . -name Makefile.in`; do - mv $i.bak.dpatch $i; - done - ;; -esac -exit 0 - diff --git a/debian/patches/14_aspell_conv.dpatch b/debian/patches/aspell_conv similarity index 72% rename from debian/patches/14_aspell_conv.dpatch rename to debian/patches/aspell_conv index 3bb1312..e2f13d7 100644 --- a/debian/patches/14_aspell_conv.dpatch +++ b/debian/patches/aspell_conv @@ -1,16 +1,9 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 14_aspell_conv.dpatch by <[email protected]> -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: add info on how to convert aspell dicts to hunspell - -@DPATCH@ diff -urNad hunspell-1.1.5~/man/hunspell.4 hunspell-1.1.5/man/hunspell.4 --- hunspell-1.1.5~/man/hunspell.4 2007-03-14 14:37:31.000000000 +0100 +++ hunspell-1.1.5/man/hunspell.4 2007-04-11 14:36:27.000000000 +0200 -@@ -1023,6 +1023,38 @@ - Hunspell has supported only the first 65536 characters (Basic Multilingual Plane) - of Unicode Standard, yet. +@@ -1356,6 +1356,38 @@ + echo "TRY qwertzuiopasdfghjklyxcvbnmQWERTZUIOPASDFGHJKLYXCVBNM" >>xx.aff + .fi +.SH "Conversion of aspell dictionaries" +Aspell dictionaries can be easily converted into hunspell. Conversion steps: diff --git a/debian/patches/16_1.2.4-2.dpatch b/debian/patches/debian-changes-1.2.4-2 similarity index 67% rename from debian/patches/16_1.2.4-2.dpatch rename to debian/patches/debian-changes-1.2.4-2 index b82cd20..c59e785 100644 --- a/debian/patches/16_1.2.4-2.dpatch +++ b/debian/patches/debian-changes-1.2.4-2 @@ -1,14 +1,3 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 16_2.4.1-2.dpatch by <rene@frodo> -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: get 1.2.4-2 changes. ChangeLog says (not patched here): -## DP 2008-06-18 Németh László <nemeth at OOo>: -## DP * src/hunspell/affixmgr.cxx: fix GCC compiler warnings -## DP (comparisons with string literal results in unspecified behaviour). -## DP The problem reported by Ladislav Michnovič. - -@DPATCH@ --- hunspell-1.2.6.orig/src/hunspell/affixmgr.cxx +++ hunspell-1.2.6/src/hunspell/affixmgr.cxx @@ -148,11 +148,11 @@ diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..d9cfb82 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1,2 @@ +aspell_conv +debian-changes-1.2.4-2 diff --git a/debian/rules b/debian/rules index e2c7077..862095e 100755 --- a/debian/rules +++ b/debian/rules @@ -18,8 +18,6 @@ DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) libdir = /usr/lib/$(DEB_HOST_MULTIARCH) -include /usr/share/dpatch/dpatch.make - CFLAGS = -Wall -g ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) @@ -37,7 +35,7 @@ major=2 #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: configure dh_testdir cp config.sub config.sub.old cp config.guess config.guess.old @@ -51,7 +49,9 @@ build-stamp: config.status dh_testdir $(MAKE) +ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS))) $(MAKE) check +endif pod2man --utf8 debian/ispellaff2myspell \ > debian/ispellaff2myspell.1 @@ -63,11 +63,9 @@ clean: rm -f build-stamp [ ! -f Makefile ] || $(MAKE) distclean - ./debian/rules unpatch rm -f debian/ispellaff2myspell.1 rm -f config.log - rm -f libtool -mv config.sub.old config.sub -mv config.guess.old config.guess diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 0000000..163aaf8 --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/hunspell.git
