On Thu, Sep 11, 2014 at 01:01:05PM +0200, Agustin Martin wrote:
> The good news are that things seem to be working, so unless something weird
> happens, I'd expect this to be fixed in time for jessie by means of an NMU,
Hi, Brian,
Seems things are working. I have a package ready for upload to experimental,
including changes in attached diff.
Please let me know your opinion. Since this can potentially break things,
I'd prefer to go through experimental first. If you do not object or prefer
to do it yourself, I will upload my changes to experimental to have them
properly tested.
Regards,
--
Agustin
diff -Nru aspell-0.60.7~20110707/debian/aspell.compat aspell-0.60.7~20110707/debian/aspell.compat
--- aspell-0.60.7~20110707/debian/aspell.compat 2011-07-29 05:27:36.000000000 +0200
+++ aspell-0.60.7~20110707/debian/aspell.compat 2014-09-11 15:55:07.000000000 +0200
@@ -1 +1 @@
-0.60_c1
+0.60_c1+32bit
diff -Nru aspell-0.60.7~20110707/debian/changelog aspell-0.60.7~20110707/debian/changelog
--- aspell-0.60.7~20110707/debian/changelog 2014-08-07 21:54:10.000000000 +0200
+++ aspell-0.60.7~20110707/debian/changelog 2014-09-11 18:37:52.000000000 +0200
@@ -1,3 +1,22 @@
+aspell (0.60.7~20110707-1.2~exp1) experimental; urgency=low
+
+ * Non-maintainer upload.
+ * Implement multiarch (Closes: #667592), (LP:#1324525, LP:#960160).
+ * Some independent changes needed for multiarch:
+ - 08_filters-info-installdir.diff: Make sure all filters related stuff
+ is installed together. This should make possible to have different
+ values for "pkgdatadir" and "pkglibdir" selections, thus really
+ fixing (Closes: #612051).
+ - Force aspell hash function to use a 32-bit integer to allow
+ hashes being shared between 32 and 64 bit architectures.
+ - Modify to use "/usr/share/aspell" for arch indep stuff, except
+ filters and dict description files. Change aspell compat level.
+ - 09_debian-dictdir.diff: Implement a new debian specific
+ "--debian-dict-dir" configure option to allow explicitly setting an
+ independent path for dictionaries.
+
+ -- Agustin Martin Domingo <agmar...@debian.org> Thu, 11 Sep 2014 18:37:51 +0200
+
aspell (0.60.7~20110707-1.1) unstable; urgency=medium
* Non-maintainer upload.
@@ -470,7 +489,7 @@
* Corrected an erroneous example in the aspell.1 that incorrectly
documented use of the "lang" option. This caused confusion on how to
use this option. Also, noted the correct usage in README.Debian.
- (Closes: #182077)
+ (Closes: #182077)
* Added a copy of the FDL to reference from the aspell.1 manpage.
* Added a debian/aspell-doc.copyright that notes the true license (FDL)
of the aspell documentation.
@@ -570,7 +589,7 @@
* Wrote a new manpage for aspell-import
* aspell-en is now distributed in a separate package
* Remove the .aux temporary files from aspell-doc (Closes: #156686)
-
+
-- Brian Nelson <nel...@bignachos.com> Mon, 9 Dec 2002 22:22:47 -0800
aspell (0.33.7.1-12) unstable; urgency=low
@@ -578,7 +597,7 @@
* New maintainer
* Changed Architecture fields to "any" now that the libtool bug causing
the FTBFS on hppa has hopefully been fixed (Closes: #139515)
- * Add the correct copyright file to aspell-en
+ * Add the correct copyright file to aspell-en
-- Brian Nelson <nel...@bignachos.com> Tue, 26 Nov 2002 23:52:53 -0800
@@ -669,7 +688,7 @@
aspell (0.33.7.1-1) unstable; urgency=low
- * New upstream version.
+ * New upstream version.
* Reworked package relationships:
- added libstdc++-dev to Build-Depends
- added aspell-da to aspell's Suggests
diff -Nru aspell-0.60.7~20110707/debian/compat aspell-0.60.7~20110707/debian/compat
--- aspell-0.60.7~20110707/debian/compat 2011-07-29 05:27:36.000000000 +0200
+++ aspell-0.60.7~20110707/debian/compat 2014-09-11 17:21:52.000000000 +0200
@@ -1 +1 @@
-7
+9
diff -Nru aspell-0.60.7~20110707/debian/control aspell-0.60.7~20110707/debian/control
--- aspell-0.60.7~20110707/debian/control 2014-08-07 21:11:55.000000000 +0200
+++ aspell-0.60.7~20110707/debian/control 2014-09-11 17:21:52.000000000 +0200
@@ -2,7 +2,13 @@
Section: text
Priority: optional
Maintainer: Brian Nelson <p...@debian.org>
-Build-Depends: debhelper (>= 7), libncursesw5-dev | libncurses-dev, cdbs (>= 0.4.0), texinfo, dh-autoreconf, autotools-dev
+Build-Depends: debhelper (>= 9),
+ libncursesw5-dev | libncurses-dev,
+ cdbs (>= 0.4.0),
+ texinfo,
+ dh-autoreconf,
+ autopoint,
+ autotools-dev
Standards-Version: 3.9.2
Vcs-Git: git://git.debian.org/git/collab-maint/aspell
Vcs-Browser: http://git.debian.org/?p=collab-maint/aspell.git
@@ -10,11 +16,17 @@
Package: aspell
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libaspell15 (= ${binary:Version}), dictionaries-common (>> 0.40)
+Depends: ${shlibs:Depends},
+ ${misc:Depends},
+ libaspell15 (= ${binary:Version}),
+ dictionaries-common (>> 0.40)
Recommends: aspell-en | aspell-dictionary | aspell6a-dictionary
-Suggests: aspell-doc, spellutils
+Suggests: aspell-doc,
+ spellutils
Breaks: aspell-bin (<< 0.60.3-2)
-Replaces: aspell-bin (<< 0.60.3-2), aspell-hi (<= 0.01-1), aspell-mr (<= 0.10-1)
+Replaces: aspell-bin (<< 0.60.3-2),
+ aspell-hi (<= 0.01-1),
+ aspell-mr (<= 0.10-1)
Provides: aspell-bin
Description: GNU Aspell spell-checker
GNU Aspell is a spell-checker which can be used either as a standalone
@@ -41,8 +53,11 @@
Package: libaspell15
Architecture: any
+Multi-Arch: same
Section: libs
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Pre-Depends: ${misc:Pre-Depends}
+Depends: ${shlibs:Depends},
+ ${misc:Depends}
Conflicts: aspell6-dictionary
Breaks: aspell-bin (<< 0.60.3-2)
Recommends: aspell-en | aspell-dictionary | aspell6a-dictionary
@@ -55,8 +70,11 @@
Package: libaspell-dev
Architecture: any
+Multi-Arch: same
Section: libdevel
-Depends: ${misc:Depends}, libaspell15 (= ${binary:Version})
+Pre-Depends: ${misc:Pre-Depends}
+Depends: ${misc:Depends},
+ libaspell15 (= ${binary:Version})
Suggests: aspell-doc
Description: Development files for applications with GNU Aspell support
This package contains the headers and static libraries for developing
@@ -69,8 +87,12 @@
Package: libpspell-dev
Architecture: any
+Multi-Arch: same
Section: libdevel
-Depends: ${misc:Depends}, libaspell15 (= ${binary:Version}), libaspell-dev
+Pre-Depends: ${misc:Pre-Depends}
+Depends: ${misc:Depends},
+ libaspell15 (= ${binary:Version}),
+ libaspell-dev
Replaces: aspell-bin (<< 0.50.3-3)
Suggests: aspell-doc
Description: Development files for applications with pspell support
diff -Nru aspell-0.60.7~20110707/debian/libaspell15.install aspell-0.60.7~20110707/debian/libaspell15.install
--- aspell-0.60.7~20110707/debian/libaspell15.install 2011-07-29 05:27:36.000000000 +0200
+++ aspell-0.60.7~20110707/debian/libaspell15.install 2014-09-11 17:21:52.000000000 +0200
@@ -1,3 +1,4 @@
-usr/lib/libaspell.so.*
-usr/lib/libpspell.so.*
+usr/lib/*/libaspell.so.*
+usr/lib/*/libpspell.so.*
usr/lib/aspell
+usr/share/aspell
diff -Nru aspell-0.60.7~20110707/debian/libaspell-dev.install aspell-0.60.7~20110707/debian/libaspell-dev.install
--- aspell-0.60.7~20110707/debian/libaspell-dev.install 2011-07-29 05:27:36.000000000 +0200
+++ aspell-0.60.7~20110707/debian/libaspell-dev.install 2014-09-11 17:21:52.000000000 +0200
@@ -1,3 +1,3 @@
-usr/lib/libaspell.la
-usr/lib/libaspell.so
+usr/lib/*/libaspell.la
+usr/lib/*/libaspell.so
usr/include/aspell.h
diff -Nru aspell-0.60.7~20110707/debian/libpspell-dev.install aspell-0.60.7~20110707/debian/libpspell-dev.install
--- aspell-0.60.7~20110707/debian/libpspell-dev.install 2011-07-29 05:27:36.000000000 +0200
+++ aspell-0.60.7~20110707/debian/libpspell-dev.install 2014-09-11 17:21:52.000000000 +0200
@@ -1,4 +1,4 @@
usr/include/pspell
-usr/lib/libpspell.so
-usr/lib/libpspell.la
+usr/lib/*/libpspell.so
+usr/lib/*/libpspell.la
usr/bin/pspell-config
diff -Nru aspell-0.60.7~20110707/debian/patches/08_filters-info-installdir.diff aspell-0.60.7~20110707/debian/patches/08_filters-info-installdir.diff
--- aspell-0.60.7~20110707/debian/patches/08_filters-info-installdir.diff 1970-01-01 01:00:00.000000000 +0100
+++ aspell-0.60.7~20110707/debian/patches/08_filters-info-installdir.diff 2014-09-11 17:18:38.000000000 +0200
@@ -0,0 +1,15 @@
+Index: aspell/Makefile.am
+===================================================================
+--- aspell.orig/Makefile.am 2014-09-09 15:04:40.659234249 +0200
++++ aspell/Makefile.am 2014-09-09 15:04:40.655234208 +0200
+@@ -258,8 +258,8 @@
+ endif # COMPILE_IN_FILTERS
+
+ noinst_DATA += $(static_optfiles) gen/filter.pot
+-opt_DATA = $(dynamic_optfiles)
+-filter_DATA = $(fltfiles)
++# opt_DATA = $(dynamic_optfiles)
++filter_DATA = $(fltfiles) $(dynamic_optfiles)
+
+ # settings.h added as a dependency so it will get recreated if
+ # the COMPILE_IN_FILTERS option changes
diff -Nru aspell-0.60.7~20110707/debian/patches/09_debian-dictdir.diff aspell-0.60.7~20110707/debian/patches/09_debian-dictdir.diff
--- aspell-0.60.7~20110707/debian/patches/09_debian-dictdir.diff 1970-01-01 01:00:00.000000000 +0100
+++ aspell-0.60.7~20110707/debian/patches/09_debian-dictdir.diff 2014-09-11 17:21:24.000000000 +0200
@@ -0,0 +1,70 @@
+Index: aspell/configure.ac
+===================================================================
+--- aspell.orig/configure.ac 2014-09-10 18:20:45.263223753 +0200
++++ aspell/configure.ac 2014-09-10 18:22:22.983302043 +0200
+@@ -47,6 +47,15 @@
+
+ AC_SUBST(pkglibdir)
+
++dnl Explicit dict dir selection for Debian
++
++AC_ARG_ENABLE(debian-dict-dir,
++ AS_HELP_STRING([--enable-debian-dict-dir=DIR],[dictionaries dir PKGLIBDIR]),
++ debdictdir=$enable_debian_dict_dir,
++ debdictdir=$pkglibdir)
++
++AC_SUBST(debdictdir)
++
+ dnl optional features
+
+ AC_ARG_ENABLE(win32-relocatable,
+Index: aspell/Makefile.am
+===================================================================
+--- aspell.orig/Makefile.am 2014-09-10 18:20:45.263223753 +0200
++++ aspell/Makefile.am 2014-09-10 18:22:22.983302043 +0200
+@@ -285,7 +285,7 @@
+ common/config.cpp: gen/dirs.h
+
+ gen/dirs.h: gen/mk-dirs_h.pl
+- cd gen; perl mk-dirs_h.pl ${prefix} ${pkgdatadir} ${pkglibdir} ${sysconfdir} > dirs.h
++ cd gen; perl mk-dirs_h.pl ${prefix} ${pkgdatadir} ${pkglibdir} ${sysconfdir} ${debdictdir} > dirs.h
+
+ EXTRA_DIST += gen/mk-dirs_h.pl
+ CLEANFILES += gen/dirs.h
+Index: aspell/gen/mk-dirs_h.pl
+===================================================================
+--- aspell.orig/gen/mk-dirs_h.pl 2014-09-10 18:20:45.263223753 +0200
++++ aspell/gen/mk-dirs_h.pl 2014-09-10 18:22:22.983302043 +0200
+@@ -1,7 +1,7 @@
+
+ foreach (@ARGV) {s|/+|/|g; s|/$||;}
+
+-($prefix, $data, $lib, $conf) = @ARGV;
++($prefix, $data, $lib, $conf,$debdictdir) = @ARGV;
+
+ sub def ( $ ) {
+ return qq|"<prefix:$1>"| if $_[0] =~ m|^$prefix/?(.+)$|;
+@@ -13,4 +13,4 @@
+ print qq|#define DICT_DIR "<data-dir>"\n| if $lib eq $data;
+ printf qq|#define DICT_DIR %s\n|, def($lib) if $lib ne $data;
+ printf qq|#define CONF_DIR %s\n|, def($conf);
+-
++printf qq|#define DEBIAN_DICT_DIR %s\n|, def($debdictdir);
+Index: aspell/common/config.cpp
+===================================================================
+--- aspell.orig/common/config.cpp 2014-09-10 18:20:45.263223753 +0200
++++ aspell/common/config.cpp 2014-09-10 18:22:22.983302043 +0200
+@@ -1365,7 +1365,7 @@
+ N_("location of language data files")}
+ , {"dict-alias", KeyInfoList, "",
+ N_("create dictionary aliases")}
+- , {"dict-dir", KeyInfoString, DICT_DIR,
++ , {"dict-dir", KeyInfoString, DEBIAN_DICT_DIR,
+ N_("location of the main word list")}
+ , {"encoding", KeyInfoString, "!encoding",
+ N_("encoding to expect data to be in"), KEYINFO_COMMON}
+@@ -1522,4 +1522,3 @@
+ }
+
+ }
+-
diff -Nru aspell-0.60.7~20110707/debian/patches/series aspell-0.60.7~20110707/debian/patches/series
--- aspell-0.60.7~20110707/debian/patches/series 2014-08-07 21:20:04.000000000 +0200
+++ aspell-0.60.7~20110707/debian/patches/series 2014-09-11 17:21:24.000000000 +0200
@@ -5,3 +5,5 @@
05_doc_fix.diff
07_filter.diff
#10_autotools.diff
+08_filters-info-installdir.diff
+09_debian-dictdir.diff
diff -Nru aspell-0.60.7~20110707/debian/rules aspell-0.60.7~20110707/debian/rules
--- aspell-0.60.7~20110707/debian/rules 2014-08-07 21:11:55.000000000 +0200
+++ aspell-0.60.7~20110707/debian/rules 2014-09-11 17:21:52.000000000 +0200
@@ -4,11 +4,21 @@
include /usr/share/cdbs/1/class/autotools.mk
include /usr/share/cdbs/1/rules/autoreconf.mk
+# 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)
+DEB_HOST_MULTIARCH = $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+
DEB_DH_MAKESHLIBS_ARGS_ALL := -V'libaspell15 (>= 0.60.7~20110707)' -Xusr/lib/aspell
-DEB_DH_INSTALL_SOURCEDIR := debian/tmp
+DEB_DH_INSTALL_SOURCEDIR := debian/tmp
DEB_INSTALL_CHANGELOGS_ALL := manual/aspell.html/ChangeLog.html
-DEB_CONFIGURE_EXTRA_FLAGS := --enable-pkgdatadir=/usr/lib/aspell --enable-pkglibdir=/usr/lib/aspell
+DEB_CONFIGURE_EXTRA_FLAGS := --enable-pkgdatadir=/usr/share/aspell \
+ --enable-pkglibdir=/usr/lib/aspell/$(DEB_HOST_MULTIARCH) \
+ --enable-debian-dict-dir=/usr/lib/aspell \
+ --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \
+ --enable-32-bit-hash-fun
build/aspell-doc::
make -C manual aspell.html aspell-dev.html
@@ -24,10 +34,10 @@
binary-install/libaspell15::
# Empty the dependency_libs lines in the .la files
sed -i "s,^dependency_libs=.*,dependency_libs=''," \
- debian/libaspell15/usr/lib/aspell/*.la
+ debian/libaspell15/usr/lib/aspell/$(DEB_HOST_MULTIARCH)/*.la
binary-install/libaspell-dev::
binary-install/libpspell-dev::
sed -i "s,^dependency_libs=.*,dependency_libs=''," \
- debian/libaspell-dev/usr/lib/*.la \
- debian/libpspell-dev/usr/lib/*.la
+ debian/libaspell-dev/usr/lib/$(DEB_HOST_MULTIARCH)/*.la \
+ debian/libpspell-dev/usr/lib/$(DEB_HOST_MULTIARCH)/*.la
