[hunspell] 86/98: Imported Debian patch 1.3.2-3
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch master
in repository hunspell.
commit ea9608cfba1f3627ab6a22cbd31eb64ae2e1a4f2
Author: Rene Engelhard <rene@debian.org>
Date: Tue Sep 27 21:16:52 2011 +0200
Imported Debian patch 1.3.2-3
---
debian/changelog | 7 +++++++
debian/control | 34 +++++++++++++++++++++++++++++++++-
debian/libhunspell-1.3-0.install | 2 +-
debian/libhunspell-dev.install | 6 +++---
debian/libhunspell-dev.links | 2 --
debian/rules | 10 +++++++---
6 files changed, 51 insertions(+), 10 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 2bea0cd..5367bee 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+hunspell (1.3.2-3) experimental; urgency=low
+
+ * build -dbg package (closes: #638615)
+ * add patch from Riku Voipio to convert to multiarch (closes: #643327)
+
+ -- Rene Engelhard <rene@debian.org> Tue, 27 Sep 2011 21:16:52 +0200
+
hunspell (1.3.2-2) experimental; urgency=low
* change Maintainer to Debian LibreOffice Maintainers
diff --git a/debian/control b/debian/control
index 1b1585f..8085b0e 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Priority: optional
Maintainer: Debian LibreOffice Maintainers <debian-openoffice@lists.debian.org>
Uploaders: Rene Engelhard <rene@debian.org>, Chris Halls <halls@debian.org>,
Tim Retout <diocles@debian.org>
-Build-Depends: debhelper (>= 7), libreadline-dev, libncurses5-dev,
+Build-Depends: debhelper (>= 8.1.3), libreadline-dev, libncurses5-dev,
libncursesw5-dev, dpatch, autotools-dev, autoconf, libtool, automake1.9
Standards-Version: 3.6.2
Section: text
@@ -15,6 +15,7 @@ Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends},
libhunspell-1.3-0 (= ${binary:Version})
Replaces: hunspell (<< 1.2.7-2)
+Multi-Arch: same
Description: spell checker and morphological analyzer (development)
Hunspell is a spell checker and morphological analyzer library and program
designed for languages with rich morphology and complex word compounding or
@@ -41,6 +42,8 @@ Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Recommends: hunspell-en-us | hunspell-dictionary | myspell-dictionary
Conflicts: openoffice.org-core (= 2.2.0~rc2-1)
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Description: spell checker and morphological analyzer (shared library)
Hunspell is a spell checker and morphological analyzer library and program
designed for languages with rich morphology and complex word compounding or
@@ -61,9 +64,37 @@ 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
+Multi-Arch: foreign
Description: spell checker and morphological analyzer (program)
Hunspell is a spell checker and morphological analyzer library and program
designed for languages with rich morphology and complex word compounding or
@@ -90,6 +121,7 @@ Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}
Conflicts: libmyspell-dev
Replaces: libmyspell-dev, hunspell (<< 1.2.7-2)
+Multi-Arch: foreign
Description: tools for hunspell
Hunspell is a spell checker and morphological analyzer library and program
designed for languages with rich morphology and complex word compounding or
diff --git a/debian/libhunspell-1.3-0.install b/debian/libhunspell-1.3-0.install
index 79bbe2f..9503874 100644
--- a/debian/libhunspell-1.3-0.install
+++ b/debian/libhunspell-1.3-0.install
@@ -1 +1 @@
-debian/tmp/usr/lib/*.so.*
+debian/tmp/usr/lib/*/*.so.*
diff --git a/debian/libhunspell-dev.install b/debian/libhunspell-dev.install
index da8da23..011cd7b 100644
--- a/debian/libhunspell-dev.install
+++ b/debian/libhunspell-dev.install
@@ -1,7 +1,7 @@
-debian/tmp/usr/lib/*.so
-debian/tmp/usr/lib/*.a
+debian/tmp/usr/lib/*/*.so
+debian/tmp/usr/lib/*/*.a
debian/tmp/usr/include
-debian/tmp/usr/lib/pkgconfig
+debian/tmp/usr/lib/*/pkgconfig
debian/tmp/usr/share/man/man3/hunspell.3
debian/tmp/usr/share/man/man4/hunspell.4
debian/tmp/usr/share/man/hu/man4/hunspell.4
diff --git a/debian/libhunspell-dev.links b/debian/libhunspell-dev.links
deleted file mode 100644
index 50f948d..0000000
--- a/debian/libhunspell-dev.links
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib/libhunspell-1.3.a usr/lib/libhunspell.a
-usr/lib/libhunspell-1.3.so usr/lib/libhunspell.so
diff --git a/debian/rules b/debian/rules
index d4de3f0..5ac62d9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,6 +14,9 @@
# 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)
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+libdir = /usr/lib/$(DEB_HOST_MULTIARCH)
+
include /usr/share/dpatch/dpatch.make
@@ -41,7 +44,7 @@ config.status: patch-stamp configure
cp /usr/share/misc/config.sub .
cp /usr/share/misc/config.guess .
CFLAGS="$(CFLAGS)" ./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
+ --with-ui --with-readline --disable-rpath --libdir=$(libdir)
build: build-stamp
build-stamp: config.status
@@ -90,8 +93,9 @@ binary-arch: build install
dh_installexamples src/tools/example.cxx
dh_install
dh_installman
- dh_link
- dh_strip
+ 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_compress
dh_fixperms
dh_makeshlibs
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/hunspell.git
Reply to: