2014-09-23 11:20 GMT+02:00 Agustin Martin <agmar...@debian.org>:
> On Sat, Sep 20, 2014 at 01:41:41PM -0400, David Sanders wrote:
>> I installed the experimental aspell on my amd64 system and it seems to work
>> fine. However, I’ve been unable to install the i386 library for testing. I
>> get the following error:
>>
>>
>> david@jessie:~$ sudo apt-get -t experimental install libaspell15:i386
>> Reading package lists... Done
>> Building dependency tree
>> Reading state information... Done
>> Suggested packages:
>> aspell:i386
>> Recommended packages:
>> aspell-en:i386 aspell-dictionary:i386 aspell6a-dictionary:i386
>> The following NEW packages will be installed:
>> libaspell15:i386
>> 0 upgraded, 1 newly installed, 0 to remove and 206 not upgraded.
>> Need to get 0 B/360 kB of archives.
>> After this operation, 2,290 kB of additional disk space will be used.
>> (Reading database ... 400234 files and directories currently installed.)
>> Preparing to unpack .../libaspell15_0.60.7~20110707-1.2~exp1_i386.deb ...
>> Unpacking libaspell15:i386 (0.60.7~20110707-1.2~exp1) ...
>> dpkg: error processing archive
>> /var/cache/apt/archives/libaspell15_0.60.7~20110707-1.2~exp1_i386.deb
>> (--unpack):
>> trying to overwrite shared '/usr/share/doc/libaspell15/changelog.html.gz',
>> which is different from other instances of package libaspell15:i386
>> Errors were encountered while processing:
>> /var/cache/apt/archives/libaspell15_0.60.7~20110707-1.2~exp1_i386.deb
>> E: Sub-process /usr/bin/dpkg returned an error code (1)
>> david@jessie:~$
>
>> It seems there is a conflict with a previously installed file.
..
>
> Seems that in my uploaded amd64 changelog.html is recreated for no good
> reason with a different makeinfo version, thus resulting in different
> changelog.html. i386 autobuilder seems to honour the original version.
Hi,
Uploaded 0.60.7~20110707-1.2~exp3 to experimental. Should work around
that recreation using the original pristine file. It has gone through
autobuilders and should already be available in experimental mirrors.
diff against exp1 experimental upload is attached for maintainer info.
After the upload I noticed a couple of minor things pending, but that
should not affect multiarch behavior. Will add them before uploading
the real NMU.
If you want to test things like aspell:i386 in an amd64 box you willl
also need last dictionaries-common version (1.23.12), already uploaded
to sid.
Thanks very much for your tests,
--
Agustin
diff -Nru aspell-0.60.7~20110707/debian/changelog
aspell-0.60.7~20110707/debian/changelog
--- aspell-0.60.7~20110707/debian/changelog 2014-09-11 18:37:52.000000000
+0200
+++ aspell-0.60.7~20110707/debian/changelog 2014-09-26 12:27:43.000000000
+0200
@@ -1,3 +1,21 @@
+aspell (0.60.7~20110707-1.2~exp3) experimental; urgency=medium
+
+ * Non-maintainer upload.
+ * debian/control: Add missing "Multi-Arch: foreign".
+
+ -- Agustin Martin Domingo <agmar...@debian.org> Fri, 26 Sep 2014 12:27:43
+0200
+
+aspell (0.60.7~20110707-1.2~exp2) experimental; urgency=low
+
+ * Non-maintainer upload.
+ * debian/control: Canonicalize Vcs-* headers.
+ * Add DEP3 headers to "0.60.7~20110707-1.2~exp1" patches.
+ * debian/rules: Make sure original Changelog.html is installed. It gets
+ rebuilt later and may lead to problems with multiarch if different
+ makeinfo versions are used in different architectures.
+
+ -- Agustin Martin Domingo <agmar...@debian.org> Wed, 24 Sep 2014 13:29:33
+0200
+
aspell (0.60.7~20110707-1.2~exp1) experimental; urgency=low
* Non-maintainer upload.
diff -Nru aspell-0.60.7~20110707/debian/control
aspell-0.60.7~20110707/debian/control
--- aspell-0.60.7~20110707/debian/control 2014-09-11 17:21:52.000000000
+0200
+++ aspell-0.60.7~20110707/debian/control 2014-09-26 12:26:59.000000000
+0200
@@ -10,12 +10,13 @@
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
+Vcs-Git: git://anonscm.debian.org/collab-maint/aspell
+Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/aspell.git
Homepage: http://aspell.net/
Package: aspell
Architecture: any
+Multi-Arch: foreign
Depends: ${shlibs:Depends},
${misc:Depends},
libaspell15 (= ${binary:Version}),
@@ -42,6 +43,7 @@
Package: aspell-doc
Architecture: all
+Multi-Arch: foreign
Depends: ${misc:Depends}
Section: doc
Suggests: aspell (>> 0.60)
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
2014-09-11 17:18:38.000000000 +0200
+++ aspell-0.60.7~20110707/debian/patches/08_filters-info-installdir.diff
2014-09-24 14:48:53.000000000 +0200
@@ -1,3 +1,8 @@
+Author: Agustin Martin Domingo <agmar...@debian.org>
+Description: Make sure all filters stuff is installed together, allowing
separate datadir and libdir.
+Bug-Debian: http://bugs.debian.org/612051
+Applied-Upstream: Reported
+
Index: aspell/Makefile.am
===================================================================
--- aspell.orig/Makefile.am 2014-09-09 15:04:40.659234249 +0200
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
2014-09-11 17:21:24.000000000 +0200
+++ aspell-0.60.7~20110707/debian/patches/09_debian-dictdir.diff
2014-09-24 14:48:53.000000000 +0200
@@ -1,3 +1,8 @@
+Author: Agustin Martin Domingo <agmar...@debian.org>
+Description: Allow setting of dictionary path independently from libdir and
datadir.
+
+This is needed for multiarch, see http://bugs.debian.org/667592
+
Index: aspell/configure.ac
===================================================================
--- aspell.orig/configure.ac 2014-09-10 18:20:45.263223753 +0200
diff -Nru aspell-0.60.7~20110707/debian/rules
aspell-0.60.7~20110707/debian/rules
--- aspell-0.60.7~20110707/debian/rules 2014-09-11 17:21:52.000000000 +0200
+++ aspell-0.60.7~20110707/debian/rules 2014-09-24 14:48:53.000000000 +0200
@@ -12,14 +12,23 @@
DEB_DH_MAKESHLIBS_ARGS_ALL := -V'libaspell15 (>= 0.60.7~20110707)'
-Xusr/lib/aspell
+#
+DEB_COMPRESS_EXCLUDE_DEFAULT := .html
+
DEB_DH_INSTALL_SOURCEDIR := debian/tmp
-DEB_INSTALL_CHANGELOGS_ALL := manual/aspell.html/ChangeLog.html
+DEB_INSTALL_CHANGELOGS_ALL := ChangeLog.html
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
+# Save a pristine copy of original changelog. It will be rebuild later
+# and copied again, thus -c to keep the original file. Needed for
+# multiarch in case rebuild happens with different makeinfo versions.
+makebuilddir::
+ cp -n manual/aspell.html/ChangeLog.html .
+
build/aspell-doc::
make -C manual aspell.html aspell-dev.html
@@ -41,3 +50,6 @@
sed -i "s,^dependency_libs=.*,dependency_libs=''," \
debian/libaspell-dev/usr/lib/$(DEB_HOST_MULTIARCH)/*.la \
debian/libpspell-dev/usr/lib/$(DEB_HOST_MULTIARCH)/*.la
+
+clean::
+ rm -f ChangeLog.html
