Bug#643327: please add multi-arch support for hunspell
Package: hunspell
Version: 1.3.2-2
Severity: normal
User: debian-dpkg@lists.debian.org
Usertags: multiarch
Tags: patch
Hi,
The following patch converts hunspell to multiarch directories
and adds needed Multi-Arch: stanzas to control file. For more details
ask me or see the documentation at:
http://wiki.debian.org/Multiarch/Implementation
Riku
diff -urN orig/hunspell-1.3.2//debian/changelog hunspell-1.3.2//debian/changelog
--- orig/hunspell-1.3.2//debian/changelog 2011-09-27 09:26:08.000000000 +0300
+++ hunspell-1.3.2//debian/changelog 2011-09-27 12:14:15.398608644 +0300
@@ -1,3 +1,9 @@
+hunspell (1.3.2-2.1) unstable; urgency=low
+
+ * Convert to multiarch
+
+ -- Riku Voipio <riku.voipio@linaro.org> Tue, 27 Sep 2011 12:14:01 +0300
+
hunspell (1.3.2-2) experimental; urgency=low
* change Maintainer to Debian LibreOffice Maintainers
diff -urN orig/hunspell-1.3.2//debian/control hunspell-1.3.2//debian/control
--- orig/hunspell-1.3.2//debian/control 2011-09-27 09:26:08.000000000 +0300
+++ hunspell-1.3.2//debian/control 2011-09-27 09:27:38.632808034 +0300
@@ -3,7 +3,7 @@
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 @@
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 @@
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
@@ -64,6 +67,7 @@
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 +94,7 @@
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 -urN orig/hunspell-1.3.2//debian/libhunspell-1.3-0.install hunspell-1.3.2//debian/libhunspell-1.3-0.install
--- orig/hunspell-1.3.2//debian/libhunspell-1.3-0.install 2011-09-27 09:26:08.000000000 +0300
+++ hunspell-1.3.2//debian/libhunspell-1.3-0.install 2011-09-27 11:05:11.378606734 +0300
@@ -1 +1 @@
-debian/tmp/usr/lib/*.so.*
+debian/tmp/usr/lib/*/*.so.*
diff -urN orig/hunspell-1.3.2//debian/libhunspell-dev.install hunspell-1.3.2//debian/libhunspell-dev.install
--- orig/hunspell-1.3.2//debian/libhunspell-dev.install 2011-09-27 09:26:08.000000000 +0300
+++ hunspell-1.3.2//debian/libhunspell-dev.install 2011-09-27 11:05:21.618606738 +0300
@@ -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 -urN orig/hunspell-1.3.2//debian/libhunspell-dev.links hunspell-1.3.2//debian/libhunspell-dev.links
--- orig/hunspell-1.3.2//debian/libhunspell-dev.links 2011-09-27 09:26:08.000000000 +0300
+++ hunspell-1.3.2//debian/libhunspell-dev.links 1970-01-01 02:00:00.000000000 +0200
@@ -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 -urN orig/hunspell-1.3.2//debian/rules hunspell-1.3.2//debian/rules
--- orig/hunspell-1.3.2//debian/rules 2011-09-27 09:26:08.000000000 +0300
+++ hunspell-1.3.2//debian/rules 2011-09-27 12:24:05.818608916 +0300
@@ -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 @@
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,7 +93,8 @@
dh_installexamples src/tools/example.cxx
dh_install
dh_installman
- dh_link
+ 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
dh_compress
dh_fixperms
-
Reply to: